Modified interfaces to getting smb password entries from

get_smbpwd_entry (now an internal function to smbpass.c)
to a more UNIX-like :

getsmbpwnam() - get entry by name.
getsmbpwuid() - get entry by uid.

Changed the type returned by the smbpasswd enumeration
functions to be a void * so that people don't come to
depend on it being a FILE *.

These abstractions should make it much easier to
replace the smbpasswd file with a better backend
in future.

Other files changed are to match the above changes.

Jeremy.

1 files changed, 5 insertions, 5 deletions

diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index ae1fd1a6752..7494d0162da 100644
--- a/source/smbd/chgpasswd.c
+++ b/source/smbd/chgpasswd.c
@@ -452,12 +452,12 @@ BOOL check_lanman_password(char *user, unsigned char *pass1,
   *psmbpw = NULL;
 
   become_root(0);
-  smbpw = get_smbpwd_entry(user, 0);
+  smbpw = getsmbpwnam(user);
   unbecome_root(0);
 
   if(smbpw == NULL)
   {
-    DEBUG(0,("check_lanman_password: get_smbpwd_entry returned NULL\n"));
+    DEBUG(0,("check_lanman_password: getsmbpwnam returned NULL\n"));
     return False;
   }
 
@@ -509,7 +509,7 @@ BOOL change_lanman_password(struct smb_passwd *smbpw, unsigned char *pass1, unsi
 
   if(smbpw == NULL)
   { 
-    DEBUG(0,("change_lanman_password: get_smbpwd_entry returned NULL\n"));
+    DEBUG(0,("change_lanman_password: no smb password entry.\n"));
     return False;
   }
 
@@ -560,12 +560,12 @@ BOOL check_oem_password(char *user, unsigned char *data,
   unsigned char null_pw[16];
 
   become_root(0);
-  *psmbpw = smbpw = get_smbpwd_entry(user, 0);
+  *psmbpw = smbpw = getsmbpwnam(user);
   unbecome_root(0);
 
   if(smbpw == NULL)
   {
-    DEBUG(0,("check_oem_password: get_smbpwd_entry returned NULL\n"));
+    DEBUG(0,("check_oem_password: getsmbpwnam returned NULL\n"));
     return False;
   }