diff options
author | Michael Adam <obnox@samba.org> | 2007-06-14 11:29:35 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:21 -0500 |
commit | 6090601c8b6abde1642906351d1dd9bb41e576b6 (patch) | |
tree | f610144465f0c402b7ee2f56e2319d0bf41697d7 /source3/auth | |
parent | 0b86e4030604bfbaca66df9f699a68bbf6db0824 (diff) | |
download | samba-6090601c8b6abde1642906351d1dd9bb41e576b6.tar.gz samba-6090601c8b6abde1642906351d1dd9bb41e576b6.tar.bz2 samba-6090601c8b6abde1642906351d1dd9bb41e576b6.zip |
r23485: This checkin consists mostly of refactorings in preparation of the
activation of global registry options in loadparm.c, mainly to
extract functionality from net_conf.c to be made availabel elsewhere
and to minimize linker dependencies.
In detail:
* move functions registry_push/pull_value from lib/util_reg.c to new file
lib/util_reg_api.c
* create a fake user token consisting of builtin administrators sid and
se_disk_operators privilege by hand instead of using get_root_nt_token()
to minimize linker deps for bin/net.
+ new function registry_create_admin_token() in new lib/util_reg_smbconf.c
+ move dup_nt_token from auth/token_util.c to new file lib/util_nttoken.c
+ adapt net_conf.c and Makefile.in accordingly.
* split lib/profiles.c into two parts: new file lib/profiles_basic.c
takes all the low level mask manipulation and format conversion functions
(se_priv, privset, luid). the privs array is completely hidden from
profiles.c by adding some access-functions. some mask-functions are not
static anymore.
Generally, SID- and LUID-related stuff that has more dependencies
is kept in lib/profiles.c
* Move initialization of regdb from net_conf.c into a function
registry_init_regdb() in lib/util_reg_smbconf.c.
Michael
(This used to be commit efd3e2bfb756ac5c4df7984791c67e7ae20a582e)
Diffstat (limited to 'source3/auth')
-rw-r--r-- | source3/auth/token_util.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index d68f44cbf1..57db0d193f 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -28,47 +28,6 @@ #include "includes.h" /**************************************************************************** - Duplicate a SID token. -****************************************************************************/ - -NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, const NT_USER_TOKEN *ptoken) -{ - NT_USER_TOKEN *token; - - if (!ptoken) - return NULL; - - token = TALLOC_P(mem_ctx, NT_USER_TOKEN); - if (token == NULL) { - DEBUG(0, ("talloc failed\n")); - return NULL; - } - - ZERO_STRUCTP(token); - - if (ptoken->user_sids && ptoken->num_sids) { - token->user_sids = (DOM_SID *)talloc_memdup( - token, ptoken->user_sids, sizeof(DOM_SID) * ptoken->num_sids ); - - if (token->user_sids == NULL) { - DEBUG(0, ("talloc_memdup failed\n")); - TALLOC_FREE(token); - return NULL; - } - token->num_sids = ptoken->num_sids; - } - - /* copy the privileges; don't consider failure to be critical here */ - - if ( !se_priv_copy( &token->privileges, &ptoken->privileges ) ) { - DEBUG(0,("dup_nt_token: Failure to copy SE_PRIV!. " - "Continuing with 0 privileges assigned.\n")); - } - - return token; -} - -/**************************************************************************** Check for a SID in an NT_USER_TOKEN ****************************************************************************/ |