From f18076cb32526735d6a79f341bb5e5522b480400 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Wed, 30 Jul 2008 09:35:13 -0700 Subject: 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. (This used to be commit ca153139b1dced07c196aac93dbc9d9428d98124) --- source3/auth/token_util.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'source3/auth') diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index e5b9e1b531..d6cd2ea3a8 100644 --- a/source3/auth/token_util.c +++ b/source3/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; } -- cgit