[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c83a40d s3: Quieten a bogus error message
      from  5f37473 s3: Package autorid module

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c83a40ddbfe0710b9206f98f811bbf9056870ebe
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 9 20:29:17 2010 +0100

    s3: Quieten a bogus error message
    
    This happens if you set "auth methods = winbind" without a fallback method.
    
    The return NT_STATUS_LOGON_FAILURE; is not strictly require here, because we
    fall through to the equivalent statement a few lines down, but it makes the
    code a bit clearer IMO.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue Nov  9 20:15:59 UTC 2010 on sn-devel-104

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

Summary of changes:
 source3/auth/auth_winbind.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index dcf7e41..603ec9b 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -98,9 +98,7 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
 		if ( auth_method )
 			return auth_method->auth(auth_context, auth_method->private_data, 
 				mem_ctx, user_info, server_info);
-		else
-			/* log an error since this should not happen */
-			DEBUG(0,("check_winbind_security: ERROR!  my_private_data == NULL!\n"));
+		return NT_STATUS_LOGON_FAILURE;
 	}
 
 	if (wbc_status == WBC_ERR_AUTH_ERROR) {


-- 
Samba Shared Repository