svn commit: samba r17673 - in branches: SAMBA_3_0/source/passdb SAMBA_3_0_23/source/passdb

[jerry at samba.org]

Author: jerry
Date: 2006-08-21 21:53:02 +0000 (Mon, 21 Aug 2006)
New Revision: 17673

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17673

Log:
volker's patch for re-adding Getpwnam() lookups to smbpasswd backend (I hate username level)
Modified:
   branches/SAMBA_3_0/source/passdb/pdb_smbpasswd.c
   branches/SAMBA_3_0_23/source/passdb/pdb_smbpasswd.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_smbpasswd.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_smbpasswd.c	2006-08-21 21:25:17 UTC (rev 17672)
+++ branches/SAMBA_3_0/source/passdb/pdb_smbpasswd.c	2006-08-21 21:53:02 UTC (rev 17673)
@@ -1238,7 +1238,6 @@
 			      struct samu *sam_pass, const struct smb_passwd *pw_buf)
 {
 	struct passwd *pwfile;
-	fstring unix_username;
 	
 	if ( !sam_pass ) {
 		DEBUG(5,("build_sam_account: struct samu is NULL\n"));
@@ -1247,10 +1246,7 @@
 
 	/* verify the user account exists */
 
-	fstrcpy( unix_username, pw_buf->smb_name );
-	strlower_m( unix_username );
-			
-	if ( !(pwfile = getpwnam_alloc(NULL, unix_username )) ) {
+	if ( !(pwfile = Get_Pwnam_alloc(NULL, pw_buf->smb_name )) ) {
 		DEBUG(0,("build_sam_account: smbpasswd database is corrupt!  username %s with uid "
 		"%u is not in unix passwd database!\n", pw_buf->smb_name, pw_buf->smb_userid));
 			return False;

Modified: branches/SAMBA_3_0_23/source/passdb/pdb_smbpasswd.c
===================================================================
--- branches/SAMBA_3_0_23/source/passdb/pdb_smbpasswd.c	2006-08-21 21:25:17 UTC (rev 17672)
+++ branches/SAMBA_3_0_23/source/passdb/pdb_smbpasswd.c	2006-08-21 21:53:02 UTC (rev 17673)
@@ -1189,7 +1189,6 @@
 			      struct samu *sam_pass, const struct smb_passwd *pw_buf)
 {
 	struct passwd *pwfile;
-	fstring unix_username;
 	
 	if ( !sam_pass ) {
 		DEBUG(5,("build_sam_account: struct samu is NULL\n"));
@@ -1198,10 +1197,7 @@
 
 	/* verify the user account exists */
 
-	fstrcpy( unix_username, pw_buf->smb_name );
-	strlower_m( unix_username );
-			
-	if ( !(pwfile = getpwnam_alloc(NULL, unix_username )) ) {
+	if ( !(pwfile = Get_Pwnam_alloc(NULL, pw_buf->smb_name )) ) {
 		DEBUG(0,("build_sam_account: smbpasswd database is corrupt!  username %s with uid "
 		"%u is not in unix passwd database!\n", pw_buf->smb_name, pw_buf->smb_userid));
 			return False;