diff options
| -rw-r--r-- | source4/auth/auth.c | 3 | ||||
| -rw-r--r-- | source4/auth/auth_util.c | 15 | ||||
| -rw-r--r-- | source4/libcli/raw/clirewrite.c | 22 | ||||
| -rw-r--r-- | source4/smbd/rewrite.c | 6 | ||||
| -rw-r--r-- | source4/torture/config.m4 | 3 |
5 files changed, 1 insertions, 48 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index 83446721e6..5016292e39 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -133,9 +133,6 @@ static BOOL check_domain_match(const char *user, const char *domain) * Check a user's password, as given in the user_info struct and return various * interesting details in the server_info struct. * - * This function does NOT need to be in a become_root()/unbecome_root() pair - * as it makes the calls itself when needed. - * * The return value takes precedence over the contents of the server_info * struct. When the return is other than NT_STATUS_OK the contents * of that structure is undefined. diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c index fda8c18fa4..e72368132a 100644 --- a/source4/auth/auth_util.c +++ b/source4/auth/auth_util.c @@ -407,21 +407,6 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token) } /**************************************************************************** - prints a UNIX 'token' to debug output. -****************************************************************************/ - -void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid, int n_groups, gid_t *groups) -{ - int i; - DEBUGC(dbg_class, dbg_lev, ("UNIX token of user %ld\n", (long int)uid)); - - DEBUGADDC(dbg_class, dbg_lev, ("Primary group is %ld and contains %i supplementary groups\n", (long int)gid, n_groups)); - for (i = 0; i < n_groups; i++) - DEBUGADDC(dbg_class, dbg_lev, ("Group[%3i]: %ld\n", i, - (long int)groups[i])); -} - -/**************************************************************************** Create the SID list for this user. ****************************************************************************/ diff --git a/source4/libcli/raw/clirewrite.c b/source4/libcli/raw/clirewrite.c deleted file mode 100644 index 2d2e2e3feb..0000000000 --- a/source4/libcli/raw/clirewrite.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "includes.h" - -/* - - this is a set of temporary stub functions used during the libsmb rewrite. - This file will need to go away before the rewrite is complete. -*/ - -void become_root(void) -{} - -void unbecome_root(void) -{} - -BOOL become_user_permanently(uid_t uid, gid_t gid) -{ return True; } - -void set_effective_uid(uid_t uid) -{} - -uid_t sec_initial_uid(void) -{ return 0; } diff --git a/source4/smbd/rewrite.c b/source4/smbd/rewrite.c index e959fd049d..6dc130d279 100644 --- a/source4/smbd/rewrite.c +++ b/source4/smbd/rewrite.c @@ -35,12 +35,6 @@ BOOL init_change_notify(void) BOOL pcap_printername_ok(const char *service, char *foo) { return True; } -void become_root(void) -{} - -void unbecome_root(void) -{} - BOOL namecache_enable(void) { return True; } diff --git a/source4/torture/config.m4 b/source4/torture/config.m4 index 587840a0f1..ce88830357 100644 --- a/source4/torture/config.m4 +++ b/source4/torture/config.m4 @@ -58,7 +58,6 @@ SMB_SUBSYSTEM(TORTURE_NBENCH,[], SMB_BINARY(smbtorture, [ALL], [BIN], [torture/torture.o - torture/torture_util.o - libcli/raw/clirewrite.o], + torture/torture_util.o], [], [TORTURE_BASIC TORTURE_RAW TORTURE_RPC TORTURE_NBENCH CONFIG LIBCMDLINE LIBBASIC]) |