Changeset 751 for trunk/server/source3/passdb/lookup_sid.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/passdb/lookup_sid.c (modified) (3 diffs)

trunk/server/source3/passdb/lookup_sid.c

@@ -1438 +1438 @@
                 if (idmap_cache_find_sid2uid(&sids[i], &ids[i].id.uid,
                                              &expired)
-                    && !expired) {
+                    && !expired && ids[i].id.uid != (uid_t)-1) {
                         ids[i].type = WBC_ID_TYPE_UID;
                         continue;
@@ -1444 +1444 @@
                 if (idmap_cache_find_sid2gid(&sids[i], &ids[i].id.gid,
                                              &expired)
-                    && !expired) {
+                    && !expired && ids[i].id.gid != (gid_t)-1) {
                         ids[i].type = WBC_ID_TYPE_GID;
                         continue;
@@ -1491 +1491 @@
                 }
         }
+
 done:
+        for (i=0; i<num_sids; i++) {
+                switch(ids[i].type) {
+                case WBC_ID_TYPE_GID:
+                        if (ids[i].id.gid == (gid_t)-1) {
+                                ids[i].type = WBC_ID_TYPE_NOT_SPECIFIED;
+                        }
+                        break;
+                case WBC_ID_TYPE_UID:
+                        if (ids[i].id.uid == (uid_t)-1) {
+                                ids[i].type = WBC_ID_TYPE_NOT_SPECIFIED;
+                        }
+                        break;
+                case WBC_ID_TYPE_NOT_SPECIFIED:
+                        break;
+                }
+        }
         ret = true;
 fail: