Changeset 335 for branches/samba-3.2.x/source/winbindd/winbindd_rpc.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_rpc.c (modified) (6 diffs)

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)) {