summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-07-07 03:34:24 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-07-07 03:34:24 +0000
commitd29d29e4a2ecee741bdb3d37be77aeeab48f185f (patch)
tree91af5074818f50ae8030f57dc420706529771344 /source3/smbd
parent48316a8c0e6b0ce6d4db966d319517a844194fce (diff)
downloadsamba-d29d29e4a2ecee741bdb3d37be77aeeab48f185f.tar.gz
samba-d29d29e4a2ecee741bdb3d37be77aeeab48f185f.tar.bz2
samba-d29d29e4a2ecee741bdb3d37be77aeeab48f185f.zip
Updates to the 'name -> sid' code:
Correct the 'none mapped' behaviour, (so that it matches Win2k) and add a function to make the SID types appear as text strings in logs/rpcclient. Also, remove a silly case that would cause 'failure' to be 'success'. (Might look at this a bit more in future). Andrew Bartlett (This used to be commit c20d057f8821d13d3de61b319de44db23773516b)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/uid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index cb4a975881..a18f62c9cc 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -465,11 +465,11 @@ BOOL lookup_name(const char *domain, const char *name, DOM_SID *psid, enum SID_N
if (ret) {
DEBUG(10,
- ("lookup_name: (local) [%s]\\[%s] -> SID %s (type %u)\n",
+ ("lookup_name: (local) [%s]\\[%s] -> SID %s (type %s: %u)\n",
domain, name, sid_to_string(sid,psid),
- (unsigned int)*name_type ));
+ sid_type_lookup(*name_type), (unsigned int)*name_type));
return True;
- } else if (winbind_lookup_name(domain, name, psid, name_type) || (*name_type != SID_NAME_USER) ) {
+ } else if (winbind_lookup_name(domain, name, psid, name_type)) {
DEBUG(10,("lookup_name (winbindd): [%s]\\[%s] -> SID %s (type %u)\n",
domain, name, sid_to_string(sid, psid),