r22740: Move debug_*_user_token to token_utils.c

(This used to be commit 4ad9f8aa61cef94be8d38c6e91aac3a5c848f81f)

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index db92c50df057acb6fcedade72a543ce00c4fb6bc..399cf3ad9e592acd13ac225e72717e3535555bd6 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -430,51 +430,6 @@ BOOL make_user_info_guest(auth_usersupplied_info **user_info)
        return NT_STATUS_IS_OK(nt_status) ? True : False;
 }
 
-/****************************************************************************
- prints a NT_USER_TOKEN to debug output.
-****************************************************************************/
-
-void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
-{
-       size_t     i;
-       
-       if (!token) {
-               DEBUGC(dbg_class, dbg_lev, ("NT user token: (NULL)\n"));
-               return;
-       }
-       
-       DEBUGC(dbg_class, dbg_lev,
-              ("NT user token of user %s\n",
-               sid_string_static(&token->user_sids[0]) ));
-       DEBUGADDC(dbg_class, dbg_lev,
-                 ("contains %lu SIDs\n", (unsigned long)token->num_sids));
-       for (i = 0; i < token->num_sids; i++)
-               DEBUGADDC(dbg_class, dbg_lev,
-                         ("SID[%3lu]: %s\n", (unsigned long)i, 
-                          sid_string_static(&token->user_sids[i])));
-
-       dump_se_priv( dbg_class, dbg_lev, &token->privileges );
-}
-
-/****************************************************************************
- 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]));
-}
-
 static int server_info_dtor(auth_serversupplied_info *server_info)
 {
        TALLOC_FREE(server_info->sam_account);

diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 1eb9d12ab5841d91386f8622f93fe9da82cd8e95..d68f44cbf1b2416fe7a76a7aef07866ed9cbfc1e 100644 (file)
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -147,8 +147,8 @@ NT_USER_TOKEN *get_root_nt_token( void )
  * Add alias SIDs from memberships within the partially created token SID list
  */
 
-static NTSTATUS add_aliases(const DOM_SID *domain_sid,
-                           struct nt_user_token *token)
+NTSTATUS add_aliases(const DOM_SID *domain_sid,
+                    struct nt_user_token *token)
 {
        uint32 *aliases;
        size_t i, num_aliases;
@@ -455,4 +455,49 @@ struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
        return result;
 }
 
+/****************************************************************************
+ prints a NT_USER_TOKEN to debug output.
+****************************************************************************/
+
+void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
+{
+       size_t     i;
+       
+       if (!token) {
+               DEBUGC(dbg_class, dbg_lev, ("NT user token: (NULL)\n"));
+               return;
+       }
+       
+       DEBUGC(dbg_class, dbg_lev,
+              ("NT user token of user %s\n",
+               sid_string_static(&token->user_sids[0]) ));
+       DEBUGADDC(dbg_class, dbg_lev,
+                 ("contains %lu SIDs\n", (unsigned long)token->num_sids));
+       for (i = 0; i < token->num_sids; i++)
+               DEBUGADDC(dbg_class, dbg_lev,
+                         ("SID[%3lu]: %s\n", (unsigned long)i, 
+                          sid_string_static(&token->user_sids[i])));
+
+       dump_se_priv( dbg_class, dbg_lev, &token->privileges );
+}
+
+/****************************************************************************
+ 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]));
+}
+
 /* END */