X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=eddad6be71fb2f5bad8f63ed6c2ab784383bfc39;hb=63a61517ff2c94c54ff4d071cbd406d135d895d0;hp=760ea5a82d2b7d2e03d16710a0ce7f5793ea03cc;hpb=f267427a9cd245b476406f82823502f4279f450b;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 760ea5a82..eddad6be7 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -394,12 +394,12 @@ void smtp_help(long offset, long Flags) {
 void smtp_get_user(long offset)
 {
 	char buf[SIZ];
-	char username[SIZ];
 	citsmtp *sSMTP = SMTP;
 
-	CtdlDecodeBase64(username, ChrPtr(sSMTP->Cmd) + offset, SIZ);
+	StrBufDecodeBase64(sSMTP->Cmd);
+
 	/* syslog(LOG_DEBUG, "Trying <%s>\n", username); */
-	if (CtdlLoginExistingUser(NULL, username) == login_ok) {
+	if (CtdlLoginExistingUser(NULL, ChrPtr(sSMTP->Cmd)) == login_ok) {
 		CtdlEncodeBase64(buf, "Password:", 9, 0);
 		cprintf("334 %s\r\n", buf);
 		sSMTP->command_state = smtp_password;
@@ -418,12 +418,11 @@ void smtp_get_pass(long offset, long Flags)
 {
 	citsmtp *sSMTP = SMTP;
 	char password[SIZ];
-	long len;
 
-	memset(password, 0, sizeof(password));	
-	len = CtdlDecodeBase64(password, ChrPtr(sSMTP->Cmd), SIZ);
+	memset(password, 0, sizeof(password));
+	StrBufDecodeBase64(sSMTP->Cmd);
 	/* syslog(LOG_DEBUG, "Trying <%s>\n", password); */
-	if (CtdlTryPassword(password, len) == pass_ok) {
+	if (CtdlTryPassword(SKEY(sSMTP->Cmd)) == pass_ok) {
 		smtp_auth_greeting(offset, Flags);
 	}
 	else {
@@ -446,7 +445,8 @@ void smtp_try_plain(long offset, long Flags)
 	int result;
 
 	long decoded_len;
-	long len;
+	long len = 0;
+	long plen = 0;
 
 	memset(pass, 0, sizeof(pass));
 	decoded_len = StrBufDecodeBase64(sSMTP->Cmd);
@@ -470,10 +470,10 @@ void smtp_try_plain(long offset, long Flags)
 
 		if (decoded_len > 0)
 		{
-			len = safestrncpy(pass, decoded_authstring, sizeof pass);
+			plen = safestrncpy(pass, decoded_authstring, sizeof pass);
 
-			if (len < 0)
-				len = sizeof(pass) - 1;
+			if (plen < 0)
+				plen = sizeof(pass) - 1;
 		}
 	}
 
@@ -487,7 +487,7 @@ void smtp_try_plain(long offset, long Flags)
 	}
 
 	if (result == login_ok) {
-		if (CtdlTryPassword(pass, len) == pass_ok) {
+		if (CtdlTryPassword(pass, plen) == pass_ok) {
 			smtp_webcit_preferences_hack();
 			smtp_auth_greeting(offset, Flags);
 			return;