X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_auth.c;h=9382072f10224a51114fd2733f959895ca5c9ac7;hb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c;hp=749981603c36296022271ec9fb0b84c82d97dc78;hpb=203e950e3d3c76795fa49895d040f732adad2049;p=apps%2Fmadmutt.git diff --git a/pop/pop_auth.c b/pop/pop_auth.c index 7499816..9382072 100644 --- a/pop/pop_auth.c +++ b/pop/pop_auth.c @@ -11,26 +11,24 @@ # include "config.h" #endif +#include + #include "mutt.h" +#include "ascii.h" #include "mx.h" #include "md5.h" #include "pop.h" #include "lib/mem.h" #include "lib/intl.h" +#include "lib/debug.h" #include #include #ifdef USE_SASL -#ifdef USE_SASL2 #include #include -#else -#include -#include -#endif - #include "mutt_sasl.h" #endif @@ -45,18 +43,14 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) char inbuf[LONG_STRING]; const char *mech; -#ifdef USE_SASL2 +#ifdef USE_SASL const char *pc = NULL; -#else - char *pc = NULL; #endif unsigned int len, olen; unsigned char client_start; if (mutt_sasl_client_new (pop_data->conn, &saslconn) < 0) { - dprint (1, - (debugfile, - "pop_auth_sasl: Error allocating SASL connection.\n")); + debug_print (1, ("Error allocating SASL connection.\n")); return POP_A_FAILURE; } @@ -64,12 +58,9 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) method = pop_data->auth_list; FOREVER { -#ifdef USE_SASL2 +#ifdef USE_SASL rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); -#else - rc = sasl_client_start (saslconn, method, NULL, - &interaction, &pc, &olen, &mech); #endif if (rc != SASL_INTERACT) break; @@ -77,9 +68,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) } if (rc != SASL_OK && rc != SASL_CONTINUE) { - dprint (1, - (debugfile, - "pop_auth_sasl: Failure starting authentication exchange. No shared mechanisms?\n")); + debug_print (1, ("Failure starting authentication exchange. No shared mechanisms?\n")); /* SASL doesn't support suggested mechanisms, so fall back */ return POP_A_UNAVAIL; @@ -105,18 +94,13 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) if (rc != SASL_CONTINUE) break; -#ifdef USE_SASL2 - if (!mutt_strncmp (inbuf, "+ ", 2) +#ifdef USE_SASL + if (!str_ncmp (inbuf, "+ ", 2) && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1, &len) != SASL_OK) -#else - if (!mutt_strncmp (inbuf, "+ ", 2) - && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK) #endif { - dprint (1, - (debugfile, - "pop_auth_sasl: error base64-decoding server response.\n")); + debug_print (1, ("error base64-decoding server response.\n")); goto bail; } @@ -136,16 +120,14 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) /* send out response, or line break if none needed */ if (pc) { if (sasl_encode64 (pc, olen, buf, sizeof (buf), &olen) != SASL_OK) { - dprint (1, - (debugfile, - "pop_auth_sasl: error base64-encoding client response.\n")); + debug_print (1, ("error base64-encoding client response.\n")); goto bail; } /* sasl_client_st(art|ep) allocate pc with malloc, expect me to * free it */ -#ifndef USE_SASL2 - FREE (&pc); +#ifndef USE_SASL + p_delete(&pc); #endif } } @@ -153,7 +135,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) if (rc != SASL_OK) goto bail; - if (!mutt_strncmp (inbuf, "+OK", 3)) { + if (!str_ncmp (inbuf, "+OK", 3)) { mutt_sasl_setup_conn (pop_data->conn, saslconn); return POP_A_SUCCESS; } @@ -162,7 +144,7 @@ bail: sasl_dispose (&saslconn); /* terminate SASL sessoin if the last responce is not +OK nor -ERR */ - if (!mutt_strncmp (inbuf, "+ ", 2)) { + if (!str_ncmp (inbuf, "+ ", 2)) { snprintf (buf, sizeof (buf), "*\r\n"); if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED) return POP_A_SOCKET; @@ -181,11 +163,11 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf) { char *p1, *p2; - FREE (&pop_data->timestamp); + p_delete(&pop_data->timestamp); if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) { p2[1] = '\0'; - pop_data->timestamp = safe_strdup (p1); + pop_data->timestamp = str_dup (p1); } } @@ -223,10 +205,13 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method) return POP_A_SUCCESS; case PQ_NOT_CONNECTED: return POP_A_SOCKET; + case PFD_FUNCT_ERROR: + case PQ_ERR: + default: + break; } - mutt_error _("APOP authentication failed."); - + mutt_error ("%s %s", _("APOP authentication failed."), pop_data->err_msg); mutt_sleep (2); return POP_A_FAILURE; @@ -250,13 +235,13 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) if (ret == PQ_OK) { pop_data->cmd_user = CMD_AVAILABLE; - dprint (1, (debugfile, "pop_auth_user: set USER capability\n")); + debug_print (1, ("set USER capability\n")); } if (ret == PQ_ERR) { pop_data->cmd_user = CMD_NOT_AVAILABLE; - dprint (1, (debugfile, "pop_auth_user: unset USER capability\n")); + debug_print (1, ("unset USER capability\n")); snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), _("Command USER is not supported by server.")); } @@ -266,10 +251,10 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) snprintf (buf, sizeof (buf), "PASS %s\r\n", pop_data->conn->account.pass); ret = pop_query_d (pop_data, buf, sizeof (buf), #ifdef DEBUG - /* don't print the password unless we're at the ungodly debugging level */ - debuglevel < M_SOCK_LOG_FULL ? "PASS *\r\n" : + /* don't print the password unless we're at the ungodly debugging level */ + DebugLevel < M_SOCK_LOG_FULL ? "PASS *\r\n" : #endif - NULL); + NULL); } switch (ret) { @@ -277,6 +262,10 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) return POP_A_SUCCESS; case PQ_NOT_CONNECTED: return POP_A_SOCKET; + case PFD_FUNCT_ERROR: + case PQ_ERR: + default: + break; } mutt_error ("%s %s", _("Login failed."), pop_data->err_msg); @@ -291,7 +280,7 @@ static pop_auth_t pop_authenticators[] = { #endif {pop_auth_apop, "apop"}, {pop_auth_user, "user"}, - {NULL} + {NULL, NULL} }; /* @@ -317,14 +306,14 @@ pop_query_status pop_authenticate (POP_DATA * pop_data) if (PopAuthenticators && *PopAuthenticators) { /* Try user-specified list of authentication methods */ - methods = safe_strdup (PopAuthenticators); + methods = str_dup (PopAuthenticators); method = methods; while (method) { comma = strchr (method, ':'); if (comma) *comma++ = '\0'; - dprint (2, (debugfile, "pop_authenticate: Trying method %s\n", method)); + debug_print (2, ("Trying method %s\n", method)); authenticator = pop_authenticators; while (authenticator->authenticate) { @@ -356,12 +345,11 @@ pop_query_status pop_authenticate (POP_DATA * pop_data) method = comma; } - FREE (&methods); + p_delete(&methods); } else { /* Fall back to default: any authenticator */ - dprint (2, - (debugfile, "pop_authenticate: Using any available method.\n")); + debug_print (2, ("Using any available method.\n")); authenticator = pop_authenticators; while (authenticator->authenticate) {