--- mod_authn_pop3-1.6.c	2006-04-06 11:55:10.279960000 +0900
+++ mod_authn_pop3.c	2006-04-06 11:57:28.228320000 +0900
@@ -28,6 +28,7 @@
 #include "apr_want.h"
 #include "apr_strings.h"
 
+#include "ap_provider.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
@@ -185,6 +186,7 @@
         return APR_EGENERAL;
     }
 
+    recvlen = RECVLEN;
     line = apr_psprintf(pool, "USER %s\r\n", user);
     rv = send_pop_command(r, sock, line, recv, &recvlen);
     if (rv != APR_SUCCESS) {
@@ -235,7 +237,7 @@
         &authn_pop3_module);
 
     pop3_ret = pop_auth(r,
-        user, password, conf->serverhostname, conf->port, conf->timeout);
+        user, password, conf->server_host, conf->server_port, conf->timeout);
     if (pop3_ret != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
             "POP user %s authentication failure for \"%s\": "