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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  d8d96fa... s3: Fix malformed require_membership_of_sid.
      from  2c6d488... s3: fix build issue on Tru64

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


- Log -----------------------------------------------------------------
commit d8d96fa8f9500d34fab1c7ffdb287a055cc209bb
Author: Bo Yang <boy...@samba.org>
Date:   Sun Feb 7 14:45:42 2010 +0800

    s3: Fix malformed require_membership_of_sid.
    
    Signed-off-by: Bo Yang <boy...@samba.org>
    (cherry picked from commit 913a9f4e420c7a4177e6a7874e8ec2703f447918)
    
    Fix bug #7106.

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

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


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 3e13517..b802036 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1137,6 +1137,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;
@@ -1192,6 +1193,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