X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_auth.c;fp=pop_auth.c;h=2583e1832f40545efcd05c38493ba6794498c66b;hp=785e1a926c45f2a97a1da4a3e8a6bfad8eb07a71;hb=36d6553c2d1a80b38e961b95ebbfe0290dd5b002;hpb=39d11f5b3feb125654d5c2a4e8f93637a12706c3

diff --git a/pop_auth.c b/pop/pop_auth.c
similarity index 97%
rename from pop_auth.c
rename to pop/pop_auth.c
index 785e1a9..2583e18 100644
--- a/pop_auth.c
+++ b/pop/pop_auth.c
@@ -87,7 +87,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
   mutt_message _("Authenticating (SASL)...");
 
   snprintf (buf, sizeof (buf), "AUTH %s", mech);
-  olen = mutt_strlen (buf);
+  olen = strlen (buf);
 
   /* looping protocol */
   FOREVER {
@@ -104,11 +104,11 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
 
 #ifdef USE_SASL2
     if (!mutt_strncmp (inbuf, "+ ", 2)
-        && sasl_decode64 (inbuf, mutt_strlen (inbuf), buf, LONG_STRING - 1,
+        && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
                           &len) != SASL_OK)
 #else
     if (!mutt_strncmp (inbuf, "+ ", 2)
-        && sasl_decode64 (inbuf, mutt_strlen (inbuf), buf, &len) != SASL_OK)
+        && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK)
 #endif
     {
       dprint (1,
@@ -203,9 +203,9 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
   /* Compute the authentication hash to send to the server */
   MD5Init (&mdContext);
   MD5Update (&mdContext, (unsigned char *) pop_data->timestamp,
-             mutt_strlen (pop_data->timestamp));
+             strlen (pop_data->timestamp));
   MD5Update (&mdContext, (unsigned char *) pop_data->conn->account.pass,
-             mutt_strlen (pop_data->conn->account.pass));
+             strlen (pop_data->conn->account.pass));
   MD5Final (digest, &mdContext);
 
   for (i = 0; i < sizeof (digest); i++)