diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-12-11 19:27:19 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-12-11 19:27:19 +0000 |
| commit | 41daca8ceb7e7597ae9804c1b7f07fb95debb51c (patch) | |
| tree | 1e50a69420d60bcd9b0da08d46653ca5863f88ae | |
| parent | 3cc7e2936a69ba864817e1636439722933d8475e (diff) | |
| download | samba-41daca8ceb7e7597ae9804c1b7f07fb95debb51c.tar.gz samba-41daca8ceb7e7597ae9804c1b7f07fb95debb51c.tar.bz2 samba-41daca8ceb7e7597ae9804c1b7f07fb95debb51c.zip | |
%U substitution should be unix user not nt user
(This used to be commit f4b8a283065a7c1ae233a0ae01ac76f32fea6b31)
| -rw-r--r-- | source3/passdb/passdb.c | 4 | ||||
| -rw-r--r-- | source3/passdb/sampass.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 4dc945ff31..b80ab625ed 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -308,6 +308,10 @@ struct smb_passwd *pwdb_smb_map_names(struct smb_passwd *smb) if (!sid_front_equal(&global_sam_sid, &gmep.sid)) { + fstring sid_str; + sid_to_string(sid_str, &gmep.sid); + DEBUG(0,("UNIX User %s Primary Group is in the wrong domain! %s\n", + smb->unix_name, sid_str)); return NULL; } diff --git a/source3/passdb/sampass.c b/source3/passdb/sampass.c index 967e0502e3..c15b20c11e 100644 --- a/source3/passdb/sampass.c +++ b/source3/passdb/sampass.c @@ -95,10 +95,11 @@ static struct sam_passwd *getsamfile21pwent(void *vp) } /* - * get all the other gubbins we need + * get all the other gubbins we need. substitute unix name for %U + * as putting the nt name in is a bit meaningless. */ - pstrcpy(samlogon_user, user->nt_name); + pstrcpy(samlogon_user, user->unix_name); if (samlogon_user[strlen(samlogon_user)-1] == '$' && user->group_rid != DOMAIN_GROUP_RID_USERS) @@ -156,9 +157,9 @@ static BOOL add_samfile21pwd_entry(struct sam_passwd *newpwd) return add_smbpwd_entry(pwdb_sam_to_smb(newpwd)); } -static struct sam_disp_info *getsamfiledispntnam(const char *name) +static struct sam_disp_info *getsamfiledispntnam(const char *ntname) { - return pwdb_sam_to_dispinfo(getsam21pwntnam(name)); + return pwdb_sam_to_dispinfo(getsam21pwntnam(ntname)); } static struct sam_disp_info *getsamfiledisprid(uint32 rid) |