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.
(This used to be commit 1161cfb7f2b0d5a6d3e2b524a14a6f325ce70efb)

3 files changed, 8 insertions, 8 deletions

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index ae1fd1a675..7494d0162d 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/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;
   }
 
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 74ebeb1617..bbd9f8b849 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1084,8 +1084,8 @@ BOOL password_ok(char *user,char *password, int pwlen, struct passwd *pwd)
 	  return(False);
 	}
 
-      /* non-null username indicates search by username not smb userid */
-      smb_pass = get_smbpwd_entry(user, 0);
+      smb_pass = getsmbpwnam(user);
+
       if (!smb_pass)
 	{
 	  DEBUG(3,("Couldn't find user %s in smb_passwd file.\n", user));
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 7807bf8369..eaf3fe9920 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -380,7 +380,7 @@ static int session_trust_account(char *inbuf, char *outbuf, char *user,
         struct smb_passwd *smb_trust_acct = NULL; /* check if trust account exists */
         if (lp_security() == SEC_USER)
         {
-                smb_trust_acct = get_smbpwd_entry(user, 0);
+                smb_trust_acct = getsmbpwnam(user);
         }
         else
         {