svn commit: samba r17917 - in
branches/SAMBA_3_0_RELEASE/source/passdb: .
jerry at samba.org
jerry at samba.org
Tue Aug 29 16:05:30 GMT 2006
Author: jerry
Date: 2006-08-29 16:05:28 +0000 (Tue, 29 Aug 2006)
New Revision: 17917
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17917
Log:
don't set primary group sid fix
Modified:
branches/SAMBA_3_0_RELEASE/source/passdb/passdb.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/passdb/passdb.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/passdb/passdb.c 2006-08-29 16:05:01 UTC (rev 17916)
+++ branches/SAMBA_3_0_RELEASE/source/passdb/passdb.c 2006-08-29 16:05:28 UTC (rev 17917)
@@ -136,7 +136,6 @@
{
const char *guest_account = lp_guestaccount();
const char *domain = global_myname();
- DOM_SID group_sid;
uint32 urid;
if ( !pwd ) {
@@ -148,8 +147,15 @@
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 */
More information about the samba-cvs
mailing list