created "passdb.c" which is an interface point to (at present) either

smbpasswd or ldap passwd, at compile-time (-DUSE_LDAP).

_none_ of the functions in ldap.c or smbpass.c should be called directly:
only those in passdb.c should be used.

-DUSE_LDAP is unlikely to compile at the moment.
(This used to be commit 57b01ad4ffb14ebd600d4e66602b54ed987f6106)

1 files changed, 6 insertions, 6 deletions

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 1056269490..82e3a024e1 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -429,21 +429,21 @@ update the encrypted smbpasswd file from the plaintext username and password
 *****************************************************************************/
 BOOL update_smbpassword_file( char *user, fstring password)
 {
-  struct smb_passwd *smbpw;
+  struct smb_passwd *sampw;
   BOOL ret;
 
   become_root(0);
-  smbpw = getsmbpwnam(user);
+  sampw = getsampwnam(user);
   unbecome_root(0);
 
-  if(smbpw == NULL)
+  if(sampw == NULL)
   {
-    DEBUG(0,("update_smbpassword_file: getsmbpwnam returned NULL\n"));
+    DEBUG(0,("update_smbpassword_file: getsampwnam returned NULL\n"));
     return False;
   }
  
   /* Here, the flag is one, because we want to ignore the XXXXXXX'd out password */
-  ret = change_oem_password( smbpw, password, True);
+  ret = change_oem_password( sampw, password, True);
   if (ret == False)
     DEBUG(3,("update_smbpasswd_file: change_oem_password returned False\n"));
 
@@ -1124,7 +1124,7 @@ BOOL password_ok(char *user,char *password, int pwlen, struct passwd *pwd)
 	  return(False);
 	}
 
-      smb_pass = getsmbpwnam(user);
+      smb_pass = getsampwnam(user);
 
       if (!smb_pass)
 	{