summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-14 07:49:15 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-14 07:49:15 +0000
commit61b65aad1361e221828c7eabfdd16b42b1643eb3 (patch)
tree76475e963572886a95548b45b6aed6519addaf2b
parent212077afa275b7111e2a28798affa9689dede2ba (diff)
downloadsamba-61b65aad1361e221828c7eabfdd16b42b1643eb3.tar.gz
samba-61b65aad1361e221828c7eabfdd16b42b1643eb3.tar.bz2
samba-61b65aad1361e221828c7eabfdd16b42b1643eb3.zip
Merge from HEAD - eliminated unused arguments.
Andrew Bartlett (This used to be commit 6dd474d8451d39e580834089d7c3614059558354)
-rw-r--r--source3/smbd/chgpasswd.c3
-rw-r--r--source3/smbd/lanman.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index cc130d16c2..cf5a0fc142 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..b1dfa68fec 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -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);
}