Changeset 39 for trunk/samba/source/nsswitch/winbindd_cache.c

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/nsswitch/winbindd_cache.c (modified) (3 diffs)

trunk/samba/source/nsswitch/winbindd_cache.c

@@ -1777 +1777 @@
         *alias_rids = NULL;
 
-        (*alias_rids) = TALLOC_ARRAY(mem_ctx, uint32, *num_aliases);
-
-        if ((*num_aliases != 0) && ((*alias_rids) == NULL)) {
-                centry_free(centry);
-                return NT_STATUS_NO_MEMORY;
+        if (*num_aliases) {
+                (*alias_rids) = TALLOC_ARRAY(mem_ctx, uint32, *num_aliases);
+
+                if ((*alias_rids) == NULL) {
+                        centry_free(centry);
+                        return NT_STATUS_NO_MEMORY;
+                }
+        } else {
+                (*alias_rids) = NULL;
         }
 
@@ -1943 +1947 @@
         *num_domains = centry_uint32(centry);
         
-        (*names)        = TALLOC_ARRAY(mem_ctx, char *, *num_domains);
-        (*alt_names)    = TALLOC_ARRAY(mem_ctx, char *, *num_domains);
-        (*dom_sids)     = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_domains);
+        if (*num_domains) {
+                (*names)        = TALLOC_ARRAY(mem_ctx, char *, *num_domains);
+                (*alt_names)    = TALLOC_ARRAY(mem_ctx, char *, *num_domains);
+                (*dom_sids)     = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_domains);
  
-        if (! (*dom_sids) || ! (*names) || ! (*alt_names)) {
-                smb_panic("trusted_domains out of memory");
-        }
+                if (! (*dom_sids) || ! (*names) || ! (*alt_names)) {
+                        smb_panic("trusted_domains out of memory");
+                }
+        } else {
+                (*names) = NULL;
+                (*alt_names) = NULL;
+                (*dom_sids) = NULL;
+        }
  
         for (i=0; i<(*num_domains); i++) {
@@ -2131 +2141 @@
 {
         struct winbind_cache *cache;
-        
+
+        /* dont clear cached U/SID and UG/SID entries when we want to logon
+         * offline - gd */
+
+        if (lp_winbind_offline_logon()) {
+                return;
+        }
+
         if (!domain)
                 return;