From 1a6e78fda30518827b2ec64729a2914c7d761de3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 11 Jan 2003 12:13:03 +0000 Subject: Remove an unused paramter for our old LM-only password change code, and fix a (harmless) fstring/pstring mixup. Andrew Bartlett (This used to be commit 5ff5f540ccc2ee2c9859213b84598baa400f57a5) --- source3/smbd/chgpasswd.c | 3 +-- source3/smbd/lanman.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source3') diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index fb06ad3ab8..1c31d9757a 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/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/source3/smbd/lanman.c b/source3/smbd/lanman.c index 61288e0167..25f390be55 100644 --- a/source3/smbd/lanman.c +++ b/source3/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); } -- cgit