Skip to content

Commit 70a1fad

Browse files
robnbehlendorf
authored andcommitted
libspl: move SID implementation from libzpool
Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes #17861
1 parent faa295b commit 70a1fad

File tree

3 files changed

+48
-17
lines changed

3 files changed

+48
-17
lines changed

lib/libspl/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ libspl_la_SOURCES = \
2929
%D%/procfs_list.c \
3030
%D%/random.c \
3131
%D%/rwlock.c \
32+
%D%/sid.c \
3233
%D%/strlcat.c \
3334
%D%/strlcpy.c \
3435
%D%/taskq.c \

lib/libspl/sid.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// SPDX-License-Identifier: CDDL-1.0
2+
/*
3+
* CDDL HEADER START
4+
*
5+
* The contents of this file are subject to the terms of the
6+
* Common Development and Distribution License (the "License").
7+
* You may not use this file except in compliance with the License.
8+
*
9+
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10+
* or https://opensource.org/licenses/CDDL-1.0.
11+
* See the License for the specific language governing permissions
12+
* and limitations under the License.
13+
*
14+
* When distributing Covered Code, include this CDDL HEADER in each
15+
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16+
* If applicable, add the following below this CDDL HEADER, with the
17+
* fields enclosed by brackets "[]" replaced with your own identifying
18+
* information: Portions Copyright [yyyy] [name of copyright owner]
19+
*
20+
* CDDL HEADER END
21+
*/
22+
/*
23+
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24+
* Copyright (c) 2012, 2018 by Delphix. All rights reserved.
25+
* Copyright (c) 2016 Actifio, Inc. All rights reserved.
26+
* Copyright (c) 2025, Klara, Inc.
27+
*/
28+
29+
#include <sys/sid.h>
30+
#include <umem.h>
31+
32+
ksiddomain_t *
33+
ksid_lookupdomain(const char *dom)
34+
{
35+
ksiddomain_t *kd;
36+
37+
kd = umem_zalloc(sizeof (ksiddomain_t), UMEM_NOFAIL);
38+
kd->kd_name = strdup(dom);
39+
return (kd);
40+
}
41+
42+
void
43+
ksiddomain_rele(ksiddomain_t *ksid)
44+
{
45+
free(ksid->kd_name);
46+
umem_free(ksid, sizeof (ksiddomain_t));
47+
}

lib/libzpool/kernel.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -510,23 +510,6 @@ secpolicy_zfs(const cred_t *cr)
510510
return (0);
511511
}
512512

513-
ksiddomain_t *
514-
ksid_lookupdomain(const char *dom)
515-
{
516-
ksiddomain_t *kd;
517-
518-
kd = umem_zalloc(sizeof (ksiddomain_t), UMEM_NOFAIL);
519-
kd->kd_name = spa_strdup(dom);
520-
return (kd);
521-
}
522-
523-
void
524-
ksiddomain_rele(ksiddomain_t *ksid)
525-
{
526-
spa_strfree(ksid->kd_name);
527-
umem_free(ksid, sizeof (ksiddomain_t));
528-
}
529-
530513
zfs_file_t *
531514
zfs_onexit_fd_hold(int fd, minor_t *minorp)
532515
{

0 commit comments

Comments
 (0)