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)

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index bfa0430af47c9c05e5495b77111369024f27f1c8..cb1160bb2511019ff3c8c12bb895e9c389f887b7 100644 (file)
--- 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 */