Remove an unused paramter for our old LM-only password change code, and fix a

(harmless) fstring/pstring mixup.

Andrew Bartlett

diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index fb06ad3ab89e45f7c21e0098f3a41fff931e33a8..1c31d9757a1f75e033c6c51721012a2e38756093 100644 (file)
--- a/source/smbd/chgpasswd.c
+++ b/source/smbd/chgpasswd.c
@@ -672,8 +672,7 @@ BOOL check_lanman_password(char *user, uchar * pass1,
  no longer be valid.
 ************************************************************/
 
-BOOL change_lanman_password(SAM_ACCOUNT *sampass, uchar * pass1,
-                           uchar * pass2)
+BOOL change_lanman_password(SAM_ACCOUNT *sampass, uchar *pass2)
 {
        static uchar null_pw[16];
        uchar unenc_new_pw[16];

diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
index 61288e01671facffd08ec75401565fed3bc8fa5d..25f390be55e7f0ac15ad93f9d8eecf408d6516db 100644 (file)
--- a/source/smbd/lanman.c
+++ b/source/smbd/lanman.c
@@ -1008,7 +1008,7 @@ static int get_server_info(uint32 servertype,
     if (!next_token(&ptr,s->comment, NULL, sizeof(s->comment))) continue;
     if (!next_token(&ptr,s->domain , NULL, sizeof(s->domain))) {
       /* this allows us to cope with an old nmbd */
-      pstrcpy(s->domain,lp_workgroup()); 
+      fstrcpy(s->domain,lp_workgroup()); 
     }
     
     if (sscanf(stype,"%X",&s->type) != 1) { 
@@ -1955,7 +1955,7 @@ static BOOL api_SetUserPassword(connection_struct *conn,uint16 vuid, char *param
     SAM_ACCOUNT *hnd = NULL;
 
     if (check_lanman_password(user,(unsigned char *)pass1,(unsigned char *)pass2, &hnd) && 
-       change_lanman_password(hnd,(unsigned char *)pass1,(unsigned char *)pass2))
+       change_lanman_password(hnd,pass2))
     {
       SSVAL(*rparam,0,NERR_Success);
     }