* Use syslog-compatible logging levels in lprintf(); the loglevel chosen

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index c72b0ff7195b6f5b3e99a3ace2360903c99958f0..78e2c46cdce6be3e8767a350f5ef32fdae3a7ceb 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <string.h>
-#include <syslog.h>
 #include <limits.h>
 #ifndef ENABLE_CHKPWD
 #include "auth.h"
@@ -58,7 +57,7 @@
  * makeuserkey() - convert a username into the format used as a database key
  *                 (it's just the username converted into lower case)
  */
-static inline void makeuserkey(char *key, char *username) {
+static INLINE void makeuserkey(char *key, char *username) {
        int i, len;
 
        len = strlen(username);
@@ -408,7 +407,7 @@ void cmd_user(char *cmdbuf)
        a = CtdlLoginExistingUser(username);
        switch (a) {
        case login_already_logged_in:
-               cprintf("%d Already logged in.\n", ERROR);
+               cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN);
                return;
        case login_too_many_users:
                cprintf("%d %s: "
@@ -422,9 +421,9 @@ void cmd_user(char *cmdbuf)
                        MORE_DATA, CC->curr_user);
                return;
        case login_not_found:
-               cprintf("%d %s not found.\n", ERROR, username);
+               cprintf("%d %s not found.\n", ERROR + NO_SUCH_USER, username);
                return;
-               cprintf("%d Internal error\n", ERROR);
+               cprintf("%d Internal error\n", ERROR + INTERNAL_ERROR);
        }
 }
 
@@ -437,8 +436,7 @@ void session_startup(void)
 {
        int i;
 
-       syslog(LOG_NOTICE, "Session %d: %s logged in",
-              CC->cs_pid, CC->curr_user);
+       lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
 
        lgetuser(&CC->user, CC->curr_user);
        ++(CC->user.timescalled);
@@ -551,13 +549,13 @@ static int validpw(uid_t uid, const char *pass)
        char buf[24];
 
        if (pipe(pipev)) {
-               lprintf(1, "pipe failed (%s): denying autologin access for "
+               lprintf(CTDL_ERROR, "pipe failed (%s): denying autologin access for "
                        "uid %ld\n", strerror(errno), (long)uid);
                return 0;
        }
        switch (pid = fork()) {
        case -1:
-               lprintf(1, "fork failed (%s): denying autologin access for "
+               lprintf(CTDL_ERROR, "fork failed (%s): denying autologin access for "
                        "uid %ld\n", strerror(errno), (long)uid);
                close(pipev[0]);
                close(pipev[1]);
@@ -585,7 +583,7 @@ static int validpw(uid_t uid, const char *pass)
 
        while (waitpid(pid, &status, 0) == -1)
                if (errno != EINTR) {
-                       lprintf(1, "waitpid failed (%s): denying autologin "
+                       lprintf(CTDL_ERROR, "waitpid failed (%s): denying autologin "
                                "access for uid %ld\n",
                                strerror(errno), (long)uid);
                        return 0;
@@ -609,19 +607,19 @@ int CtdlTryPassword(char *password)
        int code;
 
        if ((CC->logged_in)) {
-               lprintf(5, "CtdlTryPassword: already logged in\n");
+               lprintf(CTDL_WARNING, "CtdlTryPassword: already logged in\n");
                return pass_already_logged_in;
        }
        if (!strcmp(CC->curr_user, NLI)) {
-               lprintf(5, "CtdlTryPassword: no user selected\n");
+               lprintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n");
                return pass_no_user;
        }
        if (getuser(&CC->user, CC->curr_user)) {
-               lprintf(5, "CtdlTryPassword: internal error\n");
+               lprintf(CTDL_ERR, "CtdlTryPassword: internal error\n");
                return pass_internal_error;
        }
        if (password == NULL) {
-               lprintf(5, "CtdlTryPassword: NULL password string supplied\n");
+               lprintf(CTDL_INFO, "CtdlTryPassword: NULL password string supplied\n");
                return pass_wrong_password;
        }
        code = (-1);
@@ -658,7 +656,7 @@ int CtdlTryPassword(char *password)
                do_login();
                return pass_ok;
        } else {
-               lprintf(3, "Bad password specified for <%s>\n", CC->curr_user);
+               lprintf(CTDL_WARNING, "Bad password specified for <%s>\n", CC->curr_user);
                return pass_wrong_password;
        }
 }
@@ -674,14 +672,14 @@ void cmd_pass(char *buf)
 
        switch (a) {
        case pass_already_logged_in:
-               cprintf("%d Already logged in.\n", ERROR);
+               cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN);
                return;
        case pass_no_user:
                cprintf("%d You must send a name with USER first.\n",
-                       ERROR);
+                       ERROR + USERNAME_REQUIRED);
                return;
        case pass_wrong_password:
-               cprintf("%d Wrong password.\n", ERROR);
+               cprintf("%d Wrong password.\n", ERROR + PASSWORD_REQUIRED);
                return;
        case pass_ok:
                logged_in_response();
@@ -707,7 +705,7 @@ int purge_user(char pname[])
        makeuserkey(usernamekey, pname);
 
        if (getuser(&usbuf, pname) != 0) {
-               lprintf(5, "Cannot purge user <%s> - not found\n", pname);
+               lprintf(CTDL_ERR, "Cannot purge user <%s> - not found\n", pname);
                return (ERROR + NO_SUCH_USER);
        }
        /* Don't delete a user who is currently logged in.  Instead, just
@@ -723,12 +721,12 @@ int purge_user(char pname[])
        }
        end_critical_section(S_SESSION_TABLE);
        if (user_is_logged_in == 1) {
-               lprintf(5, "User <%s> is logged in; not deleting.\n", pname);
+               lprintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
                usbuf.axlevel = 0;
                putuser(&usbuf);
                return (1);
        }
-       lprintf(5, "Deleting user <%s>\n", pname);
+       lprintf(CTDL_NOTICE, "Deleting user <%s>\n", pname);
 
        /* Perform any purge functions registered by server extensions */
        PerformUserHooks(usbuf.fullname, usbuf.usernum, EVT_PURGEUSER);
@@ -843,7 +841,7 @@ int create_user(char *newusername, int become_user)
                }
        }
 
-       lprintf(3, "New user <%s> created\n", username);
+       lprintf(CTDL_NOTICE, "New user <%s> created\n", username);
        return (0);
 }
 
@@ -860,12 +858,12 @@ void cmd_newu(char *cmdbuf)
 
        if (config.c_disable_newu) {
                cprintf("%d Self-service user account creation "
-                       "is disabled on this system.\n", ERROR);
+                       "is disabled on this system.\n", ERROR + NOT_HERE);
                return;
        }
 
        if (CC->logged_in) {
-               cprintf("%d Already logged in.\n", ERROR);
+               cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN);
                return;
        }
        if (CC->nologin) {
@@ -878,14 +876,14 @@ void cmd_newu(char *cmdbuf)
        strproc(username);
 
        if (strlen(username) == 0) {
-               cprintf("%d You must supply a user name.\n", ERROR);
+               cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED);
                return;
        }
 
        if ((!strcasecmp(username, "bbs")) ||
            (!strcasecmp(username, "new")) ||
            (!strcasecmp(username, "."))) {
-               cprintf("%d '%s' is an invalid login name.\n", ERROR, username);
+               cprintf("%d '%s' is an invalid login name.\n", ERROR + ILLEGAL_VALUE, username);
                return;
        }
 
@@ -903,7 +901,7 @@ void cmd_newu(char *cmdbuf)
                        ERROR + INTERNAL_ERROR);
                return;
        } else {
-               cprintf("%d unknown error\n", ERROR);
+               cprintf("%d unknown error\n", ERROR + INTERNAL_ERROR);
        }
 }
 
@@ -918,7 +916,7 @@ void cmd_setp(char *new_pw)
                return;
        }
        if ( (CC->user.uid != BBSUID) && (CC->user.uid != (-1)) ) {
-               cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR);
+               cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR + NOT_HERE);
                return;
        }
        strproc(new_pw);
@@ -930,7 +928,7 @@ void cmd_setp(char *new_pw)
        safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password));
        lputuser(&CC->user);
        cprintf("%d Password changed.\n", CIT_OK);
-       lprintf(3, "Password changed for user <%s>\n", CC->curr_user);
+       lprintf(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user);
        PerformSessionHooks(EVT_SETPASS);
 }
 
@@ -957,7 +955,7 @@ void cmd_creu(char *cmdbuf)
        strproc(password);
 
        if (strlen(username) == 0) {
-               cprintf("%d You must supply a user name.\n", ERROR);
+               cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED);
                return;
        }
 
@@ -978,7 +976,7 @@ void cmd_creu(char *cmdbuf)
                        ERROR + ALREADY_EXISTS, username);
                return;
        } else {
-               cprintf("%d An error occured creating the user account.\n", ERROR);
+               cprintf("%d An error occured creating the user account.\n", ERROR + INTERNAL_ERROR);
        }
 }
 
@@ -1011,7 +1009,7 @@ void cmd_setu(char *new_parms)
                return;
 
        if (num_parms(new_parms) < 3) {
-               cprintf("%d Usage error.\n", ERROR);
+               cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE);
                return;
        }
        lgetuser(&CC->user, CC->curr_user);
@@ -1071,7 +1069,7 @@ void cmd_seen(char *argbuf) {
        }
 
        if (num_parms(argbuf) != 2) {
-               cprintf("%d Invalid parameters\n", ERROR);
+               cprintf("%d Invalid parameters\n", ERROR + ILLEGAL_VALUE);
                return;
        }
 
@@ -1128,7 +1126,7 @@ void cmd_invt_kick(char *iuser, int op)
        }
 
        if (lgetuser(&USscratch, iuser) != 0) {
-               cprintf("%d No such user.\n", ERROR);
+               cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
                return;
        }
        CtdlGetRelationship(&vbuf, &USscratch, &CC->room);
@@ -1204,7 +1202,7 @@ void cmd_forg(void)
                cprintf("%d Ok\n", CIT_OK);
        }
        else {
-               cprintf("%d You may not forget this room.\n", ERROR);
+               cprintf("%d You may not forget this room.\n", ERROR + NOT_HERE);
        }
 }