X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_auth.c;h=194f33b26752a9d1d969cda5d60d8b25cae2b049;hp=840f9e808fd5d46c64cb45a023d097fe7f73e924;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 840f9e8..194f33b 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -103,11 +103,11 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
       break;
 
 #ifdef USE_SASL2
-    if (!safe_strncmp (inbuf, "+ ", 2)
+    if (!str_ncmp (inbuf, "+ ", 2)
         && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
                           &len) != SASL_OK)
 #else
-    if (!safe_strncmp (inbuf, "+ ", 2)
+    if (!str_ncmp (inbuf, "+ ", 2)
         && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK)
 #endif
     {
@@ -146,7 +146,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   if (rc != SASL_OK)
     goto bail;
 
-  if (!safe_strncmp (inbuf, "+OK", 3)) {
+  if (!str_ncmp (inbuf, "+OK", 3)) {
     mutt_sasl_setup_conn (pop_data->conn, saslconn);
     return POP_A_SUCCESS;
   }
@@ -155,7 +155,7 @@ bail:
   sasl_dispose (&saslconn);
 
   /* terminate SASL sessoin if the last responce is not +OK nor -ERR */
-  if (!safe_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;
@@ -178,7 +178,7 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
 
   if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
     p2[1] = '\0';
-    pop_data->timestamp = safe_strdup (p1);
+    pop_data->timestamp = str_dup (p1);
   }
 }
 
@@ -310,7 +310,7 @@ 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) {