diff options
author | Gerald Carter <jerry@samba.org> | 2006-08-29 16:05:28 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2006-08-29 16:05:28 +0000 |
commit | c60dbeb1c90b45a6affd1de1661ab001fc6ca4bb (patch) | |
tree | 84014bad9496a670d2c48b3ede6d6b870f8bbc9b /source | |
parent | 8f38a34ca7082426e02a9c6be7b9672e7841622d (diff) | |
download | samba-c60dbeb1c90b45a6affd1de1661ab001fc6ca4bb.tar.gz samba-c60dbeb1c90b45a6affd1de1661ab001fc6ca4bb.tar.xz samba-c60dbeb1c90b45a6affd1de1661ab001fc6ca4bb.zip |
r17917: don't set primary group sid fix
Diffstat (limited to 'source')
-rw-r--r-- | source/passdb/passdb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index 27176b751e6..47b6b958000 100644 --- a/source/passdb/passdb.c +++ b/source/passdb/passdb.c @@ -136,7 +136,6 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p { const char *guest_account = lp_guestaccount(); const char *domain = global_myname(); - DOM_SID group_sid; uint32 urid; if ( !pwd ) { @@ -148,8 +147,15 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p pdb_set_username(user, pwd->pw_name, PDB_SET); pdb_set_fullname(user, pwd->pw_gecos, PDB_SET); pdb_set_domain (user, get_global_sam_name(), PDB_DEFAULT); +#if 0 + /* This can lead to a primary group of S-1-22-2-XX which + will be rejected by other parts of the Samba code. + Rely on pdb_get_group_sid() to "Do The Right Thing" (TM) + --jerry */ + gid_to_sid(&group_sid, pwd->pw_gid); pdb_set_group_sid(user, &group_sid, PDB_SET); +#endif /* save the password structure for later use */ |