Removed the logging facility from citserver, use syslog instead

[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 50c2749016b7c28af44e7a9bfbff82f72a2cb07a..fe67455e1a4dc667e0a2e2ec3c2c63d4720962d2 100644 (file)
--- a/citadel/modules/pop3/serv_pop3.c
+++ b/citadel/modules/pop3/serv_pop3.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * POP3 service for the Citadel system
  *
  * Copyright (c) 1998-2009 by the citadel.org team
@@ -83,7 +81,7 @@ void pop3_cleanup_function(void) {
        /* Don't do this stuff if this is not a POP3 session! */
        if (CC->h_command_function != pop3_command_loop) return;
 
-       CtdlLogPrintf(CTDL_DEBUG, "Performing POP3 cleanup hook\n");
+       syslog(LOG_DEBUG, "Performing POP3 cleanup hook\n");
        if (POP3->msgs != NULL) free(POP3->msgs);
 
        free(POP3);
@@ -137,7 +135,7 @@ void pop3_user(char *argbuf) {
        strcpy(username, argbuf);
        striplt(username);
 
-       /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", username); */
+       /* syslog(LOG_DEBUG, "Trying <%s>\n", username); */
        if (CtdlLoginExistingUser(NULL, username) == login_ok) {
                cprintf("+OK Password required for %s\r\n", username);
        }
@@ -215,7 +213,7 @@ void pop3_login(void)
        if (msgs >= 0) {
                cprintf("+OK %s is logged in (%d messages)\r\n",
                        CC->user.fullname, msgs);
-               CtdlLogPrintf(CTDL_NOTICE, "POP3 authenticated %s\n", CC->user.fullname);
+               syslog(LOG_NOTICE, "POP3 authenticated %s\n", CC->user.fullname);
        }
        else {
                cprintf("-ERR Can't open your mailbox\r\n");
@@ -250,7 +248,7 @@ void pop3_apop(char *argbuf)
    strncpy(username, argbuf, sizeof(username)-1);
    username[sizeof(username)-1] = '\0';
    
-   memset(userdigest, MD5_HEXSTRING_SIZE, 0);
+   memset(userdigest, 0, MD5_HEXSTRING_SIZE);
    strncpy(userdigest, sptr, MD5_HEXSTRING_SIZE-1);
    
    if (CtdlLoginExistingUser(NULL, username) != login_ok)
@@ -287,7 +285,7 @@ void pop3_pass(char *argbuf) {
        safestrncpy(password, argbuf, sizeof password);
        striplt(password);
 
-       /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
+       /* syslog(LOG_DEBUG, "Trying <%s>\n", password); */
        if (CtdlTryPassword(password, strlen(password)) == pass_ok) {
                pop3_login();
        }
@@ -626,15 +624,15 @@ void pop3_command_loop(void) {
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
+               syslog(LOG_ERR, "Client disconnected: ending session.\r\n");
                CC->kill_me = 1;
                return;
        }
        if (!strncasecmp(cmdbuf, "PASS", 4)) {
-               CtdlLogPrintf(CTDL_INFO, "POP3: PASS...\r\n");
+               syslog(LOG_INFO, "POP3: PASS...\r\n");
        }
        else {
-               CtdlLogPrintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+               syslog(LOG_INFO, "POP3: %s\r\n", cmdbuf);
        }
        while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
@@ -745,5 +743,5 @@ CTDL_MODULE_INIT(pop3)
        }
        
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "pop3";
 }