Changeset 272 for branches/samba-3.2.x/source/winbindd

Timestamp:

Jun 16, 2009, 5:52:30 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.12

Location:

branches/samba-3.2.x/source/winbindd

Files:

• idmap.c (modified) (1 diff)
• winbindd.c (modified) (1 diff)

branches/samba-3.2.x/source/winbindd/idmap.c

@@ -556 +556 @@
                 talloc_set_destructor(dom, close_domain_destructor);
 
-                dom->params = talloc_strdup(dom, compat_params);
-                IDMAP_CHECK_ALLOC(dom->params);
+                if (compat_params) {
+                        dom->params = talloc_strdup(dom, compat_params);
+                        IDMAP_CHECK_ALLOC(dom->params);
+                } else {
+                        dom->params = NULL;
+                }
 
                 /* Finally instance a backend copy for this domain */

branches/samba-3.2.x/source/winbindd/winbindd.c

@@ -799 +799 @@
         for (state = winbindd_client_list(); state; state = state->next) {
                 if (state->response.result != WINBINDD_PENDING &&
+                    state->fd_event.flags == EVENT_FD_READ &&
                     !state->getpwent_state && !state->getgrent_state) {
                         nidle++;