Changeset 222 for branches/samba-3.3.x/source/passdb

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

File:

• branches/samba-3.3.x/source/passdb/lookup_sid.c (modified) (2 diffs)

branches/samba-3.3.x/source/passdb/lookup_sid.c

@@ -1309 +1309 @@
                 /* Not in cache. Ask winbindd. */
                 if (!winbind_uid_to_sid(psid, uid)) {
-                        if (!winbind_ping()) {
-                                legacy_uid_to_sid(psid, uid);
-                                return;
-                        }
-
-                        DEBUG(5, ("uid_to_sid: winbind failed to find a sid for uid %u\n",
-                                uid));
+                        /*
+                         * We shouldn't return the NULL SID
+                         * here if winbind was running and
+                         * couldn't map, as winbind will have
+                         * added a negative entry that will
+                         * cause us to go though the
+                         * legacy_uid_to_sid()
+                         * function anyway in the case above
+                         * the next time we ask.
+                         */
+                        DEBUG(5, ("uid_to_sid: winbind failed to find a sid "
+                                  "for uid %u\n", uid));
+
+                        legacy_uid_to_sid(psid, uid);
                         return;
                 }
@@ -1355 +1362 @@
                 /* Not in cache. Ask winbindd. */
                 if (!winbind_gid_to_sid(psid, gid)) {
-                        if (!winbind_ping()) {
-                                legacy_gid_to_sid(psid, gid);
-                                return;
-                        }
-
-                        DEBUG(5, ("gid_to_sid: winbind failed to find a sid for gid %u\n",
-                                gid));
+                        /*
+                         * We shouldn't return the NULL SID
+                         * here if winbind was running and
+                         * couldn't map, as winbind will have
+                         * added a negative entry that will
+                         * cause us to go though the
+                         * legacy_gid_to_sid()
+                         * function anyway in the case above
+                         * the next time we ask.
+                         */
+                        DEBUG(5, ("gid_to_sid: winbind failed to find a sid "
+                                  "for gid %u\n", gid));
+
+                        legacy_gid_to_sid(psid, gid);
                         return;
                 }