Changeset 370 for branches/samba-3.3.x/source/nsswitch/pam_winbind.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/nsswitch/pam_winbind.c (modified) (8 diffs)

branches/samba-3.3.x/source/nsswitch/pam_winbind.c

@@ -977 +977 @@
                                        int sid_list_buffer_size)
 {
-        const char* sid_string;
+        const char* sid_string = NULL;
+        char *sid_str = NULL;
 
         /* lookup name? */
@@ -986 +987 @@
                 struct wbcDomainSid sid;
                 enum wbcSidType type;
-                char *sid_str;
 
                 _pam_log_debug(ctx, LOG_DEBUG,
@@ -1003 +1003 @@
                 }
 
-                wbcFreeMemory(sid_str);
                 sid_string = sid_str;
         }
@@ -1009 +1008 @@
         if (!safe_append_string(sid_list_buffer, sid_string,
                                 sid_list_buffer_size)) {
+                wbcFreeMemory(sid_str);
                 return false;
         }
 
+        wbcFreeMemory(sid_str);
         return true;
 }
@@ -1053 +1054 @@
                                                 sid_list_buffer,
                                                 sid_list_buffer_size)) {
-                        goto out;
+                        /*
+                         * If one group name failed, we must not fail
+                         * the authentication totally, continue with
+                         * the following group names. If user belongs to
+                         * one of the valid groups, we must allow it
+                         * login. -- BoYang
+                         */
+
+                        _pam_log(ctx, LOG_INFO, "cannot convert group %s to sid, "
+                                 "check if group %s is valid group.", current_name,
+                                 current_name);
+                        _make_remark_format(ctx, PAM_TEXT_INFO, _("Cannot convert group %s "
+                                        "to sid, please contact your administrator to see "
+                                        "if group %s is valid."), current_name, current_name);
+                        SAFE_FREE(current_name);
+                        search_location = comma + 1;
+                        continue;
                 }
 
@@ -1069 +1086 @@
                                         sid_list_buffer,
                                         sid_list_buffer_size)) {
-                goto out;
+                _pam_log(ctx, LOG_INFO, "cannot convert group %s to sid, "
+                         "check if group %s is valid group.", search_location,
+                         search_location);
+                _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);
         }
 
@@ -1763 +1785 @@
                 wbcFreeMemory(logon.blobs);
         }
-        if (info && info->blobs) {
+        if (info && info->blobs && !p_info) {
                 wbcFreeMemory(info->blobs);
         }
@@ -3117 +3139 @@
                                 }
 
-                                wbcFreeMemory(info);
-                                wbcFreeMemory(policy);
                         }
+
+                        if (info && info->blobs) {
+                                wbcFreeMemory(info->blobs);
+                        }
+                        wbcFreeMemory(info);
+                        wbcFreeMemory(policy);
 
                         goto out;