Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Support imap passwords with strange characters (sf.net #3402448)

Browse Source 
conky now sends the password using the length + string format, which should not need any quoting
of special characters. Hopefully, we won't find a server which does not support this encoding.

This also fixes a bug which prevented the password from being entered from the console.

bug reported by Brent
This commit is contained in:
Pavel Labath 2011-09-16 21:56:05 +02:00
parent 71e220eaa6
commit 542e0c085e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mail.cc
View File

@ -55,6 +55,7 @@
#include <cmath>
#include <mutex>
#include <sstream>
#include "update-cb.hh"
@ -536,7 +537,7 @@ std::unique_ptr<mail_param_ex> parse_mail_args(mail_type type, const char *arg)
term.c_lflag &= ~ECHO;
tcsetattr(fp, TCSANOW, &term);
printf("Enter mailbox password (%s@%s): ", user, host);
if (scanf("%128s", pass))
if (scanf("%128s", pass) != 1)
pass[0] = 0;
printf("\n");
term.c_lflag |= ECHO;
@ -775,8 +776,11 @@ void imap_cb::work()
if (strstr(recvbuf, " IDLE ") != NULL)
has_idle = true;
command(sockfd, "a1 login " + get<MP_USER>() + " " + get<MP_PASS>() + "\r\n",
recvbuf, "a1 OK");
std::ostringstream str;
str << "a1 login " << get<MP_USER>() << " {" << get<MP_PASS>().length() << "}\r\n";
command(sockfd, str.str(), recvbuf, "+ OK");
command(sockfd, get<MP_PASS>() + "\r\n", recvbuf, "a1 OK");
command(sockfd, "a2 STATUS \"" + get<MP_FOLDER>() + "\" (MESSAGES UNSEEN)\r\n",
recvbuf, "a2 OK");