[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3464-gca15313

[jra@xxxxxxxxx (Jeremy Allison)]

The branch, v3-3-test has been updated
       via  ca153139b1dced07c196aac93dbc9d9428d98124 (commit)
      from  e92faf5996cadac480deb60a4f6232eea90b00f6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit ca153139b1dced07c196aac93dbc9d9428d98124
Author: Tim Prouty <tim.prouty@xxxxxxxxxx>
Date:   Wed Jul 30 09:35:13 2008 -0700

    Removed redundant logging from create_builtin_users and 
create_builtin_administrators
    
    The Debug messages in create_builtin_users and create_builtin_users have now
    been encapsulated in add_sid_to_builtin.

-----------------------------------------------------------------------

Summary of changes:
 source/auth/token_util.c |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/token_util.c b/source/auth/token_util.c
index e5b9e1b..d6cd2ea 100644
--- a/source/auth/token_util.c
+++ b/source/auth/token_util.c
@@ -252,7 +252,7 @@ static NTSTATUS add_sid_to_builtin(const DOM_SID 
*builtin_sid,
        }
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(3, ("add_sid_to_builtin %s could not be added to %s: "
+               DEBUG(4, ("add_sid_to_builtin %s could not be added to %s: "
                          "%s\n", sid_string_dbg(dom_sid),
                          sid_string_dbg(builtin_sid), nt_errstr(status)));
        }
@@ -279,14 +279,9 @@ NTSTATUS create_builtin_users(const DOM_SID *dom_sid)
        {
                status = add_sid_to_builtin(&global_sid_Builtin_Users,
                                            &dom_users);
-               if ( !NT_STATUS_IS_OK(status) ) {
-                       DEBUG(4,("create_builtin_administrators: Failed to add 
Domain Users to"
-                               " Users\n"));
-                       return status;
-               }
        }
 
-       return NT_STATUS_OK;
+       return status;
 }
 
 /*******************************************************************
@@ -313,9 +308,7 @@ NTSTATUS create_builtin_administrators(const DOM_SID 
*dom_sid)
        {
                status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
                                            &dom_admins);
-               if ( !NT_STATUS_IS_OK(status) ) {
-                       DEBUG(4,("create_builtin_administrators: Failed to add 
Domain Admins"
-                               " Administrators\n"));
+               if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
        }
@@ -332,14 +325,9 @@ NTSTATUS create_builtin_administrators(const DOM_SID 
*dom_sid)
        if ( ret ) {
                status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
                                            &root_sid);
-               if ( !NT_STATUS_IS_OK(status) ) {
-                       DEBUG(4,("create_builtin_administrators: Failed to add 
root"
-                               " Administrators\n"));
-                       return status;
-               }
        }
 
-       return NT_STATUS_OK;
+       return status;
 }
 
 


-- 
Samba Shared Repository