summaryrefslogtreecommitdiff
path: root/source3/lib/sids.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-11-30 22:42:13 +0000
committerLuke Leighton <lkcl@samba.org>1998-11-30 22:42:13 +0000
commitc6ad04b8fb4ee5cbf862a35b4c143a6f75555718 (patch)
tree1440c27af960d14067e46535959a0906deeed333 /source3/lib/sids.c
parent279923efd357059c463544fb469851ecbc0d1133 (diff)
downloadsamba-c6ad04b8fb4ee5cbf862a35b4c143a6f75555718.tar.gz
samba-c6ad04b8fb4ee5cbf862a35b4c143a6f75555718.tar.bz2
samba-c6ad04b8fb4ee5cbf862a35b4c143a6f75555718.zip
attempting to fix "domain user map" up, but it's a bit complicated.
i may simply go for a response in the NetSamLogon returning the unix username, forcing the NT user to appear to be a unix user, however even that is fraught with implications. might just have to go the whole hog and do this tuple thing, "unix_name + nt_name" always associated together... issue with api_net_sam_logon, getsam21pwent() being called twice, the second time overwriting static buffer data (argh) so had to make a copy. noticed a nested "become_root()"/"unbecome_root()" which will have to be tracked down... (This used to be commit 474f94f419a531e33b475249da7efb99ac22f454)
Diffstat (limited to 'source3/lib/sids.c')
-rw-r--r--source3/lib/sids.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/lib/sids.c b/source3/lib/sids.c
index 854e9d5786..f5fed0f656 100644
--- a/source3/lib/sids.c
+++ b/source3/lib/sids.c
@@ -283,6 +283,13 @@ BOOL generate_sam_sid(char *domain_name)
uchar raw_sid_data[12];
pstrcpy(sid_file, lp_smb_passwd_file());
+
+ if (sid_file[0] == 0)
+ {
+ DEBUG(0,("cannot find smb passwd file\n"));
+ return False;
+ }
+
p = strrchr(sid_file, '/');
if (p != NULL)
{
@@ -456,10 +463,10 @@ BOOL map_domain_name_to_sid(DOM_SID *sid, char **nt_domain)
if ((*nt_domain)[0] == 0)
{
- DEBUG(5,("map_domain_name_to_sid: overriding blank name to %s\n",
- global_sam_name));
free(*nt_domain);
(*nt_domain) = strdup(global_sam_name);
+ DEBUG(5,("map_domain_name_to_sid: overriding blank name to %s\n",
+ (*nt_domain)));
sid_copy(sid, &global_sam_sid);
return True;
}