Changeset 30 for trunk/samba/source/nsswitch/idmap_util.c

Timestamp:

Apr 25, 2007, 9:44:55 AM (14 years ago)

Author:

Paul Smedley

Message:

Code updated to Samba 3.0.25rc2 level

File:

• trunk/samba/source/nsswitch/idmap_util.c (modified) (4 diffs)

trunk/samba/source/nsswitch/idmap_util.c

@@ -106 +106 @@
 
         map.sid = sid;
+        map.xid.type = ID_TYPE_UID;     
         
         maps[0] = ↦
@@ -112 +113 @@
         ret = idmap_sids_to_unixids(maps);
         if ( ! NT_STATUS_IS_OK(ret)) {
-                DEBUG(10, ("error mapping sid [%s] to uid\n", sid_string_static(sid)));
+                DEBUG(10, ("error mapping sid [%s] to uid\n", 
+                           sid_string_static(sid)));
                 return ret;
         }
 
         if ((map.status != ID_MAPPED) || (map.xid.type != ID_TYPE_UID)) {
-                DEBUG(10, ("sid [%s] not mapped to an uid [%u,%u,%u]\n", sid_string_static(sid), map.status, map.xid.type, map.xid.id));
+                DEBUG(10, ("sid [%s] not mapped to an uid [%u,%u,%u]\n", 
+                           sid_string_static(sid), 
+                           map.status, 
+                           map.xid.type, 
+                           map.xid.id));
                 return NT_STATUS_NONE_MAPPED;
         }
@@ -140 +146 @@
 
         map.sid = sid;
+        map.xid.type = ID_TYPE_GID;
         
         maps[0] = ↦
@@ -146 +153 @@
         ret = idmap_sids_to_unixids(maps);
         if ( ! NT_STATUS_IS_OK(ret)) {
-                DEBUG(10, ("error mapping sid [%s] to gid\n", sid_string_static(sid)));
+                DEBUG(10, ("error mapping sid [%s] to gid\n", 
+                           sid_string_static(sid)));
                 return ret;
         }
 
         if ((map.status != ID_MAPPED) || (map.xid.type != ID_TYPE_GID)) {
-                DEBUG(10, ("sid [%s] not mapped to an gid [%u,%u,%u]\n", sid_string_static(sid), map.status, map.xid.type, map.xid.id));
+                DEBUG(10, ("sid [%s] not mapped to an gid [%u,%u,%u]\n", 
+                           sid_string_static(sid), 
+                           map.status, 
+                           map.xid.type, 
+                           map.xid.id));
                 return NT_STATUS_NONE_MAPPED;
         }