Moved check_plaintext_password() into smbd/chgpasswd.c from smbd/ipc.c.

configure configure.in include/config.h.in: Added <sys/un.h> autoconf
code for Luke's UNIX domain sockets code.
Jeremy.
(This used to be commit 210d61db08136122f51a93428607fccd582c9e7d)

2 files changed, 43 insertions, 43 deletions

diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index b86091e773..406f4604b1 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -789,3 +789,46 @@ BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL overri
 
   return ret;
 }
+
+/***********************************************************
+ Code to check a plaintext password against smbpasswd entries.
+***********************************************************/
+
+BOOL check_plaintext_password(char *user,char *old_passwd,
+                              int old_passwd_size, struct smb_passwd **psmbpw)
+{
+  struct smb_passwd *smbpw = NULL;
+  uchar old_pw[16],old_ntpw[16];
+
+  become_root(False);
+  *psmbpw = smbpw = getsmbpwnam(user);
+  unbecome_root(False);
+
+  if (smbpw == NULL) {
+    DEBUG(0,("check_plaintext_password: getsmbpwnam returned NULL\n"));
+    return False;
+  }
+
+  if (smbpw->acct_ctrl & ACB_DISABLED) {
+    DEBUG(0,("check_plaintext_password: account %s disabled.\n", user));
+    return(False);
+  }
+
+  nt_lm_owf_gen(old_passwd,old_ntpw,old_pw);
+
+#ifdef DEBUG_PASSWORD
+  DEBUG(100,("check_plaintext_password: smbpw->smb_nt_passwd \n"));
+  dump_data(100,smbpw->smb_nt_passwd,16);
+  DEBUG(100,("check_plaintext_password: old_ntpw \n"));
+  dump_data(100,old_ntpw,16);
+  DEBUG(100,("check_plaintext_password: smbpw->smb_passwd \n"));
+  dump_data(100,smbpw->smb_passwd,16);
+  DEBUG(100,("check_plaintext_password: old_pw\n"));
+  dump_data(100,old_pw,16);
+#endif
+
+  if(memcmp(smbpw->smb_nt_passwd,old_ntpw,16) && memcmp(smbpw->smb_passwd,old_pw,16))
+    return(False);
+  else
+    return(True);
+}
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 086a4bfa0b..737b364c6b 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -1660,49 +1660,6 @@ static BOOL api_NetRemoteTOD(connection_struct *conn,uint16 vuid, char *param,ch
   return(True);
 }
 
-/***********************************************************
- Code to check a plaintext password against smbpasswd entries.
-***********************************************************/
-
-static BOOL check_plaintext_password(char *user,char *old_passwd,
-                                     int old_passwd_size, struct smb_passwd **psmbpw)
-{
-  struct smb_passwd *smbpw = NULL;
-  uchar old_pw[16],old_ntpw[16];
-
-  become_root(False);
-  *psmbpw = smbpw = getsmbpwnam(user);
-  unbecome_root(False);
-
-  if (smbpw == NULL) {
-    DEBUG(0,("check_plaintext_password: getsmbpwnam returned NULL\n"));
-    return False;
-  }
-
-  if (smbpw->acct_ctrl & ACB_DISABLED) {
-    DEBUG(0,("check_plaintext_password: account %s disabled.\n", user));
-    return(False);
-  }
-
-  nt_lm_owf_gen(old_passwd,old_ntpw,old_pw);
-
-#ifdef DEBUG_PASSWORD
-  DEBUG(100,("check_plaintext_password: smbpw->smb_nt_passwd \n"));
-  dump_data(100,smbpw->smb_nt_passwd,16);
-  DEBUG(100,("check_plaintext_password: old_ntpw \n"));
-  dump_data(100,old_ntpw,16);
-  DEBUG(100,("check_plaintext_password: smbpw->smb_passwd \n"));
-  dump_data(100,smbpw->smb_passwd,16);
-  DEBUG(100,("check_plaintext_password: old_pw\n"));
-  dump_data(100,old_pw,16);
-#endif
-
-  if(memcmp(smbpw->smb_nt_passwd,old_ntpw,16) && memcmp(smbpw->smb_passwd,old_pw,16))
-    return(False);
-  else
-    return(True);
-}
-
 /****************************************************************************
  Set the user password.
 *****************************************************************************/