diff options
| author | Gerald Carter <jerry@samba.org> | 2006-08-24 22:05:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:51 -0500 |
| commit | 40b1bd30915e1d0580aeacb438f16b001c55439a (patch) | |
| tree | d89ac606ace3d6d1a196eaff239de98be1d47419 | |
| parent | b3773240504f12788908ca4755602d55842dded0 (diff) | |
| download | samba-40b1bd30915e1d0580aeacb438f16b001c55439a.tar.gz samba-40b1bd30915e1d0580aeacb438f16b001c55439a.tar.bz2 samba-40b1bd30915e1d0580aeacb438f16b001c55439a.zip | |
r17813: Remove another instance of manually setting the group SID.
The would have been primaryly used when adding a user to
an smbpasswd file, but could have been introduce to other
backends by using pdbedit -i -e.
The symptom was
[2006/08/09 13:07:43, 0] rpc_parse/parse_samr.c:init_sam_user_info21A(6276)
init_sam_user_info_21A: User nobody has Primary Group SID S-1-22-2-99,
which conflicts with the domain sid S-1-5-21-1825997848-4107600307-1754506280.
Failing operation.
(This used to be commit 0a3aa8b43ace8c635423c2df10827e81d145b58f)
| -rw-r--r-- | source3/passdb/passdb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index bfa0430af4..cb1160bb25 100644 --- a/source3/passdb/passdb.c +++ b/source3/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 */ |