Merge pull request #3 from sagredo-dev/pwd-too-long-issue

bug fix: pwd with length>8 denied when sha-512 disabled
sagredo-dev · Oct 18, 2024 · 9616e67 · 9616e67
2 parents e4efd6d + 7252133
commit 9616e67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vpopmail.c b/vpopmail.c
@@ -761,8 +761,10 @@ int vadduser(char *username, char *domain, char *password, char *gecos,
   if (strlen(domain) > MAX_PW_DOMAIN) return (VA_DOMAIN_NAME_TOO_LONG);
   if (strlen(domain) < 3) return (VA_INVALID_DOMAIN_NAME);
 
+#ifdef CLEAR_PASS
   if (strlen(password) > MAX_PW_CLEAR_PASSWD) return (VA_PASSWD_TOO_LONG);
   if (strlen(password) < MIN_PW_CLEAR_PASSWD) return (VA_PASSWD_TOO_SHORT);
+#endif
   if (strlen(gecos) > MAX_PW_GECOS) return (VA_GECOS_TOO_LONG);
 
   umask(VPOPMAIL_UMASK);

diff --git a/vpopmail.h b/vpopmail.h
@@ -47,7 +47,7 @@
 #define MAX_PW_CLEAR_PASSWD 128
 /* #define MIN_PW_CLEAR_PASSWD 12 */
 #else
-#define MAX_PW_CLEAR_PASSWD 8
+#define MAX_PW_CLEAR_PASSWD 50
 /* #define MIN_PW_CLEAR_PASSWD 8 */
 #endif
 #define MAX_PW_DIR 160