summaryrefslogtreecommitdiff
path: root/src/core/ns_saset.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/ns_saset.c')
-rw-r--r--src/core/ns_saset.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index ce790d6b2..937ccd42b 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -235,12 +235,9 @@ int do_saset_password(User * u, NickCore * nc, char *param)
|| (StrictPasswords && len < 5)) {
notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
return MOD_CONT;
- }
-
- if (len > PASSMAX) {
- len = PASSMAX;
- param[len] = 0;
- notice_lang(s_NickServ, u, PASSWORD_TRUNCATED, PASSMAX);
+ } else if (enc_encrypt_check_len(len ,PASSMAX)) {
+ notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
+ return MOD_CONT;
}
if (nc->pass)
@@ -261,7 +258,7 @@ int do_saset_password(User * u, NickCore * nc, char *param)
if(enc_decrypt(nc->pass,tmp_pass,PASSMAX)==1) {
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display,
- nc->pass);
+ tmp_pass);
} else {
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display);
}