stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / pop3 / serv_pop3.c

diff --git a/citadel/modules/pop3/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c
index 0b20e005956689fafa95a4ea72515a18bfc7edfe..b18d4b685e55281de69055f19eaa64dc3e8ccc46 100644 (file)
--- a/citadel/modules/pop3/serv_pop3.c
+++ b/citadel/modules/pop3/serv_pop3.c
@@ -1,7 +1,7 @@
 /*
  * POP3 service for the Citadel system
  *
- * Copyright (c) 1998-2017 by the citadel.org team
+ * Copyright (c) 1998-2019 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -30,18 +30,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -57,7 +46,6 @@
 #include "msgbase.h"
 #include "internet_addressing.h"
 #include "serv_pop3.h"
-#include "md5.h"
 #include "ctdl_module.h"
 
 
@@ -133,7 +121,7 @@ void pop3_user(char *argbuf)
        strcpy(username, argbuf);
        striplt(username);
 
-       if (CtdlLoginExistingUser(NULL, username) == login_ok) {
+       if (CtdlLoginExistingUser(username) == login_ok) {
                cprintf("+OK Password required for %s\r\n", username);
        }
        else {