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

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/winbindd

Files:

• idmap_ldap.c (modified) (2 diffs)
• winbindd_cm.c (modified) (1 diff)
• winbindd_pam.c (modified) (1 diff)
• winbindd_proto.h (modified) (2 diffs)
• winbindd_rpc.c (modified) (1 diff)

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

@@ -945 +945 @@
         }
 
+        for (i = 0; ids[i]; i++) {
+                ids[i]->status = ID_UNKNOWN;
+        }
+
 again:
         if (multi) {
@@ -1174 +1178 @@
         }
 
+        for (i = 0; ids[i]; i++) {
+                ids[i]->status = ID_UNKNOWN;
+        }
+
 again:
         if (multi) {

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

@@ -1748 +1748 @@
         WERROR werr;
         TALLOC_CTX              *mem_ctx = NULL;
-        struct rpc_pipe_client  *cli;
+        struct rpc_pipe_client  *cli = NULL;
         POLICY_HND pol;
         union dssetup_DsRoleInfo info;

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

@@ -1833 +1833 @@
         if (state->request.data.auth_crap.lm_resp_len > sizeof(state->request.data.auth_crap.lm_resp)
                 || state->request.data.auth_crap.nt_resp_len > sizeof(state->request.data.auth_crap.nt_resp)) {
-                if (!state->request.flags & WBFLAG_BIG_NTLMV2_BLOB ||
+                if (!(state->request.flags & WBFLAG_BIG_NTLMV2_BLOB) ||
                      state->request.extra_len != state->request.data.auth_crap.nt_resp_len) {
                         DEBUG(0, ("winbindd_pam_auth_crap: invalid password length %u/%u\n",

branches/samba-3.2.x/source/winbindd/winbindd_proto.h

@@ -202 +202 @@
 /* The following definitions come from winbindd/winbindd_cred_cache.c  */
 
+void ccache_remove_all_after_fork(void);
+void ccache_regain_all_now(void);
 bool ccache_entry_exists(const char *username);
 bool ccache_entry_identical(const char *username,
@@ -311 +313 @@
                                   struct server_id server_id,
                                   DATA_BLOB *data);
+bool winbindd_reinit_after_fork(const char *logfilename);
 
 /* The following definitions come from winbindd/winbindd_group.c  */

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

@@ -822 +822 @@
 
                 for (r=0; r<tmp_names.count; r++) {
-                        (*names)[i+r] = fill_domain_username_talloc(mem_ctx,
-                                                domain->name,
-                                                tmp_names.names[r].string,
-                                                true);
-                        (*name_types)[i+r] = tmp_types.ids[r];
-                }
-
-                total_names += tmp_names.count;
+                        if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
+                                continue;
+                        }
+                        (*names)[total_names] = fill_domain_username_talloc(
+                                mem_ctx, domain->name,
+                                tmp_names.names[r].string, true);
+                        (*name_types)[total_names] = tmp_types.ids[r];
+                        total_names += 1;
+                }
         }