Changeset 862 for trunk/server/source3/winbindd/winbindd_cache.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd_cache.c (modified) (4 diffs)

trunk/server/source3/winbindd/winbindd_cache.c

@@ -946 +946 @@
         if (!centry)
                 return;
+
+        if ((domain_name == NULL) || (domain_name[0] == '\0')) {
+                struct winbindd_domain *mydomain =
+                        find_domain_from_sid_noinit(sid);
+                if (mydomain != NULL) {
+                        domain_name = mydomain->name;
+                }
+        }
+
         centry_put_uint32(centry, type);
         centry_put_sid(centry, sid);
@@ -965 +974 @@
         if (!centry)
                 return;
+
+        if ((domain_name == NULL) || (domain_name[0] == '\0')) {
+                struct winbindd_domain *mydomain =
+                        find_domain_from_sid_noinit(sid);
+                if (mydomain != NULL) {
+                        domain_name = mydomain->name;
+                }
+        }
 
         if (NT_STATUS_IS_OK(status)) {
@@ -1782 +1799 @@
         }
 
+        if ((domain_name == NULL) || (domain_name[0] == '\0')) {
+                domain_name = domain->name;
+        }
+
         centry = wcache_fetch(cache, domain, "NS/%s/%s", domain_name, uname);
         TALLOC_FREE(uname);
@@ -2131 +2152 @@
                                         /* something's definitely wrong */
                                         result = centry->status;
+                                        centry_free(centry);
                                         goto error;
                                 }