Changeset 429 for trunk/server/source3/winbindd/winbindd_reconnect.c

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd_reconnect.c (modified) (15 diffs)

trunk/server/source3/winbindd/winbindd_reconnect.c

@@ -28 +28 @@
 extern struct winbindd_methods msrpc_methods;
 
+static bool reconnect_need_retry(NTSTATUS status)
+{
+        if (NT_STATUS_IS_OK(status)) {
+                return false;
+        }
+
+        if (!NT_STATUS_IS_ERR(status)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_GROUP)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_ALIAS)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_MEMBER)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_DOMAIN)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_PRIVILEGE)) {
+                return false;
+        }
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MEMORY)) {
+                return false;
+        }
+
+        return true;
+}
+
 /* List all users */
 static NTSTATUS query_user_list(struct winbindd_domain *domain,
@@ -39 +84 @@
                                                num_entries, info);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.query_user_list(domain, mem_ctx,
                                                        num_entries, info);
@@ -56 +101 @@
                                                num_entries, info);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.enum_dom_groups(domain, mem_ctx,
                                                        num_entries, info);
@@ -74 +119 @@
                                                  num_entries, info);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.enum_local_groups(domain, mem_ctx,
                                                          num_entries, info);
@@ -95 +140 @@
                                            flags, sid, type);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.name_to_sid(domain, mem_ctx,
                                                    domain_name, name, flags,
@@ -118 +163 @@
                                            domain_name, name, type);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.sid_to_name(domain, mem_ctx, sid,
                                                    domain_name, name, type);
@@ -139 +184 @@
                                              rids, num_rids,
                                              domain_name, names, types);
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL)) {
+        if (reconnect_need_retry(result)) {
                 result = msrpc_methods.rids_to_names(domain, mem_ctx, sid,
                                                      rids, num_rids,
@@ -160 +205 @@
                                           user_info);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.query_user(domain, mem_ctx, user_sid,
                                                   user_info);
@@ -179 +224 @@
                                                  user_gids);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.lookup_usergroups(domain, mem_ctx,
                                                          user_sid, num_groups,
@@ -199 +244 @@
                                                   alias_rids);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.lookup_useraliases(domain, mem_ctx,
                                                           num_sids, sids,
@@ -224 +269 @@
                                                name_types);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.lookup_groupmem(domain, mem_ctx,
                                                        group_sid, type,
@@ -241 +286 @@
         result = msrpc_methods.sequence_number(domain, seq);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.sequence_number(domain, seq);
 
@@ -256 +301 @@
         result = msrpc_methods.lockout_policy(domain, mem_ctx, policy);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.lockout_policy(domain, mem_ctx, policy);
 
@@ -271 +316 @@
         result = msrpc_methods.password_policy(domain, mem_ctx, policy);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.password_policy(domain, mem_ctx, policy);
         
@@ -286 +331 @@
         result = msrpc_methods.trusted_domains(domain, mem_ctx, trusts);
 
-        if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
+        if (reconnect_need_retry(result))
                 result = msrpc_methods.trusted_domains(domain, mem_ctx,
                                                        trusts);