diff options
| author | Jean-François Micouleau <jfm@samba.org> | 2001-12-06 13:09:15 +0000 |
|---|---|---|
| committer | Jean-François Micouleau <jfm@samba.org> | 2001-12-06 13:09:15 +0000 |
| commit | e0066d2dd4d9a657d1fbcb474e66a304a64e2a31 (patch) | |
| tree | f8b355b557e836a275cd427b967801c50b2b9ca9 /source3/passdb/nispass.c | |
| parent | 0069985ce3e37ac35b4a3ba9fb8d58ceae0be152 (diff) | |
| download | samba-e0066d2dd4d9a657d1fbcb474e66a304a64e2a31.tar.gz samba-e0066d2dd4d9a657d1fbcb474e66a304a64e2a31.tar.bz2 samba-e0066d2dd4d9a657d1fbcb474e66a304a64e2a31.zip | |
again an intrusive patch:
- removed the ugly as hell sam_logon_in_ssb variable, I changed a bit the
definition of standard_sub_basic() to cope with that.
- removed the smb.conf: 'domain admin group' and 'domain guest group'
parameters ! We're not playing anymore with the user's group RIDs !
- in get_domain_user_groups(), if the user's gid is a group, put it first
in the group RID list.
I just have to write an HOWTO now ;-)
J.F.
(This used to be commit fef52c4b96c987115fb1818c00c2352c67790e50)
Diffstat (limited to 'source3/passdb/nispass.c')
| -rw-r--r-- | source3/passdb/nispass.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c index 3b7b90307d..2b1f6b5492 100644 --- a/source3/passdb/nispass.c +++ b/source3/passdb/nispass.c @@ -46,8 +46,6 @@ #include <rpcsvc/nis.h> extern int DEBUGLEVEL; -extern pstring samlogon_user; -extern BOOL sam_logon_in_ssb; static VOLATILE sig_atomic_t gotalarm; @@ -295,12 +293,7 @@ static BOOL make_sam_from_nisp_object(struct sam_passwd *pw_buf, nis_object *obj strtol(temp, NULL, 16) : pdb_uid_to_user_rid (pw_buf->smb_userid); if (pw_buf->smb_name[strlen(pw_buf->smb_name)-1] != '$') { - - /* XXXX hack to get standard_sub_basic() to use sam logon username */ - /* possibly a better way would be to do a change_to_user() call */ - pstrcpy(samlogon_user, pw_buf->smb_name); - sam_logon_in_ssb = True; - + get_single_attribute(obj, NPF_GROUP_RID, temp, sizeof(pstring)); if (strlen(temp) > 0) @@ -332,8 +325,6 @@ static BOOL make_sam_from_nisp_object(struct sam_passwd *pw_buf, nis_object *obj #endif get_single_attribute(obj, NPF_ACCT_DESC, acct_desc, sizeof(pstring)); get_single_attribute(obj, NPF_WORKSTATIONS, workstations, sizeof(pstring)); - - sam_logon_in_ssb = False; } else { |