[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  0ee0ba8... s3: Fix malformed require_membership_of_sid.
      from  f6484f7... s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum()

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


- Log -----------------------------------------------------------------
commit 0ee0ba83dcd9726244b07c1747e0676a74e1d82f
Author: Bo Yang <boyang at samba.org>
Date:   Sun Feb 7 15:04:51 2010 +0800

    s3: Fix malformed require_membership_of_sid.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    
    Fix bug #7106.

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

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


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 7454081..5dccba1 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -1036,6 +1036,7 @@ static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx,
 	char *current_name = NULL;
 	const char *search_location;
 	const char *comma;
+	int len;
 
 	if (sid_list_buffer_size > 0) {
 		sid_list_buffer[0] = 0;
@@ -1091,6 +1092,17 @@ 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);
+		/*
+		 * The lookup of the last name failed..
+		 * It results in require_member_of_sid ends with ','
+		 * It is malformated parameter here, overwrite the last ','.
+		 */
+		len = strlen(sid_list_buffer);
+		if (len) {
+			if (sid_list_buffer[len - 1] == ',') {
+				sid_list_buffer[len - 1] = '\0';
+			}
+		}
 	}
 
 	result = true;


-- 
Samba Shared Repository