[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  f626839 fail authentication for single group name which cannot be converted to sid
      from  fb042b3 replace: fix typo in variable name

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


- Log -----------------------------------------------------------------
commit f62683956a3b182f6a61cc7a2b4ada2e74cde243
Author: Noel Power <noel.power at suse.com>
Date:   Wed Oct 16 16:30:55 2013 +0100

    fail authentication for single group name which cannot be converted to sid
    
    furthermore if more than one name is supplied and no sid is converted
    then also fail.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=8598
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Fri Nov 29 15:45:11 CET 2013 on sn-devel-104

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

Summary of changes:
 nsswitch/pam_winbind.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 9322971..cd5e7ba 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1172,6 +1172,12 @@ static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx,
 		_make_remark_format(ctx, PAM_TEXT_INFO, _("Cannot convert group %s "
 				"to sid, please contact your administrator to see "
 				"if group %s is valid."), search_location, search_location);
+
+		/* If no valid groups were converted we should fail outright */
+		if (name_list != NULL && strlen(sid_list_buffer) == 0) {
+			result = false;
+			goto out;
+		}
 		/*
 		 * The lookup of the last name failed..
 		 * It results in require_member_of_sid ends with ','


-- 
Samba Shared Repository