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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.14 (final)

File:

• branches/samba-3.2.x/source/winbindd/winbindd_ads.c (modified) (5 diffs)

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);
                 }