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

Timestamp:

Sep 24, 2009, 9:15:13 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.14 (final)

Location:

branches/samba-3.2.x/source/winbindd

Files:

• idmap_ldap.c (modified) (2 diffs)
• winbindd_ads.c (modified) (5 diffs)
• winbindd_rpc.c (modified) (6 diffs)
• winbindd_sid.c (modified) (1 diff)
• winbindd_util.c (modified) (1 diff)

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

@@ -894 +894 @@
         struct idmap_ldap_context *ctx;
         LDAPMessage *result = NULL;
+        LDAPMessage *entry = NULL;
         const char *uidNumber;
         const char *gidNumber;
@@ -989 +990 @@
 
         for (i = 0; i < count; i++) {
-                LDAPMessage *entry = NULL;
                 char *sidstr = NULL;
                 char *tmp = NULL;

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

@@ -1120 +1120 @@
         /* handle sids not resolved from cache by lsa_lookup_sids */
         if (num_nocache > 0) {
+                unsigned int orig_timeout;
 
                 status = cm_connect_lsa(domain, tmp_ctx, &cli, &lsa_policy);
@@ -1126 +1127 @@
                         goto done;
                 }
+
+                /*
+                 * This call can take a long time
+                 * allow the server to time out.
+                 * 35 seconds should do it.
+                 */
+                orig_timeout = cli_set_timeout(cli->cli, 35000);
 
                 status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
@@ -1135 +1143 @@
                                                 &name_types_nocache);
 
+                /* And restore our original timeout. */
+                cli_set_timeout(cli->cli, orig_timeout);
+
                 if (!(NT_STATUS_IS_OK(status) ||
                       NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
@@ -1148 +1159 @@
                                 goto done;
                         }
+
+                        /*
+                         * This call can take a long time
+                         * allow the server to time out.
+                         * 35 seconds should do it.
+                         */
+                        orig_timeout = cli_set_timeout(cli->cli, 35000);
 
                         status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
@@ -1156 +1174 @@
                                                         &names_nocache,
                                                         &name_types_nocache);
+
+                        /* And restore our original timeout. */
+                        cli_set_timeout(cli->cli, orig_timeout);
                 }
 

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

@@ -280 +280 @@
         struct rpc_pipe_client *cli;
         POLICY_HND lsa_policy;
+        unsigned int orig_timeout;
 
         if (name == NULL || *name=='\0') {
@@ -303 +304 @@
                 return result;
 
+        /*
+         * This call can take a long time
+         * allow the server to time out.
+         * 35 seconds should do it.
+         */
+        orig_timeout = cli_set_timeout(cli->cli, 35000);
+
         result = rpccli_lsa_lookup_names(cli, mem_ctx, &lsa_policy, 1, 
                                          (const char**) &full_name, NULL, 1, &sids, &types);
-        
+
+        /* And restore our original timeout. */
+        cli_set_timeout(cli->cli, orig_timeout);
+
         if (!NT_STATUS_IS_OK(result))
                 return result;
@@ -333 +344 @@
         struct rpc_pipe_client *cli;
         POLICY_HND lsa_policy;
+        unsigned int orig_timeout;
 
         DEBUG(3,("sid_to_name [rpc] %s for domain %s\n", sid_string_dbg(sid),
@@ -345 +357 @@
         
 
+        /*
+         * This call can take a long time
+         * allow the server to time out.
+         * 35 seconds should do it.
+         */
+        orig_timeout = cli_set_timeout(cli->cli, 35000);
+
         result = rpccli_lsa_lookup_sids(cli, mem_ctx, &lsa_policy,
                                         1, sid, &domains, &names, &types);
+
+        /* And restore our original timeout. */
+        cli_set_timeout(cli->cli, orig_timeout);
+
         if (!NT_STATUS_IS_OK(result)) {         
                 DEBUG(2,("msrpc_sid_to_name: rpccli_lsa_lookup_sids()  failed (%s)\n",
@@ -379 +402 @@
         size_t i;
         char **ret_names;
+        unsigned int orig_timeout;
 
         DEBUG(3, ("rids_to_names [rpc] for domain %s\n", domain->name ));
@@ -402 +426 @@
         }
 
+        /*
+         * This call can take a long time
+         * allow the server to time out.
+         * 35 seconds should do it.
+         */
+        orig_timeout = cli_set_timeout(cli->cli, 35000);
+
         result = rpccli_lsa_lookup_sids(cli, mem_ctx, &lsa_policy,
                                         num_rids, sids, &domains,
                                         names, types);
+
+        /* And restore our original timeout. */
+        cli_set_timeout(cli->cli, orig_timeout);
+
         if (!NT_STATUS_IS_OK(result) &&
             !NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED)) {

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

@@ -94 +94 @@
                 name_domain = state->request.data.name.name;
                 name_user = p+1;
+        } else if ((p = strchr(state->request.data.name.name, '@')) != NULL) {
+                name_domain = p + 1;
+                *p = 0;
+                name_user = state->request.data.name.name;
         } else {
                 name_domain = state->request.data.name.dom_name;

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

@@ -1103 +1103 @@
                         fstrcpy(domain, lp_workgroup());
                 } else if ((p = strchr(domuser, '@')) != NULL) {
-                        fstrcpy(domain, "");                    
+                        fstrcpy(domain, p + 1);
+                        user[PTR_DIFF(p, domuser)] = 0;
                 } else {
                         return False;