* Bump internal version number to 6.08

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 1e7451f32840f08b47f325a0da79be99d0485671..a631c2cee2bb525c547206444b6089a294a036fa 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -46,7 +46,6 @@
 #include "sysdep_decls.h"
 #include "support.h"
 #include "room_ops.h"
-#include "logging.h"
 #include "file_ops.h"
 #include "control.h"
 #include "msgbase.h"
@@ -459,9 +458,6 @@ void session_startup(void)
 
        /* Enter the lobby */
        usergoto(config.c_baseroom, 0, 0, NULL, NULL);
-
-       /* Record this login in the Citadel log */
-       rec_log(CL_LOGIN, CC->curr_user);
 }
 
 
@@ -598,11 +594,15 @@ int CtdlTryPassword(char *password)
 
 
 #ifdef ENABLE_AUTOLOGIN
-       if (CC->usersupp.uid == BBSUID) {
+       /* A uid of BBSUID or -1 indicates that this user exists only in
+        * Citadel, not in the underlying operating system.
+        */
+       if ( (CC->usersupp.uid == BBSUID) || (CC->usersupp.uid == (-1)) ) {
                strproc(password);
                strproc(CC->usersupp.password);
                code = strcasecmp(CC->usersupp.password, password);
        }
+       /* Any other uid means we have to check the system password database */
        else {
                if (validpw(CC->usersupp.uid, password)) {
                        code = 0;
@@ -624,7 +624,7 @@ int CtdlTryPassword(char *password)
                do_login();
                return pass_ok;
        } else {
-               rec_log(CL_BADPW, CC->curr_user);
+               lprintf(3, "Bad password specified for <%s>\n", CC->curr_user);
                return pass_wrong_password;
        }
 }
@@ -745,10 +745,10 @@ int create_user(char *newusername, int become_user)
                extract_token(username, p->pw_gecos, 0, ',');
                uid = p->pw_uid;
        } else {
-               uid = BBSUID;
+               uid = (-1);
        }
 #else
-       uid = BBSUID;
+       uid = (-1);
 #endif
 
        if (!getuser(&usbuf, username)) {
@@ -791,7 +791,7 @@ int create_user(char *newusername, int become_user)
 
        MailboxName(mailboxname, sizeof mailboxname, &usbuf, USERCONFIGROOM);
        create_room(mailboxname, 5, "", 0, 1, 1);
-        if (lgetroom(&qrbuf, USERCONFIGROOM) == 0) {
+        if (lgetroom(&qrbuf, mailboxname) == 0) {
                 qrbuf.QRflags2 |= QR2_SYSTEM;
                 lputroom(&qrbuf);
         }
@@ -810,10 +810,9 @@ int create_user(char *newusername, int become_user)
                if (getuser(&CC->usersupp, CC->curr_user)) {
                        return (ERROR + INTERNAL_ERROR);
                }
-       
-               rec_log(CL_NEWUSER, CC->curr_user);
        }
 
+       lprintf(3, "New user <%s> created\n", username);
        return (0);
 }
 
@@ -875,7 +874,6 @@ void cmd_newu(char *cmdbuf)
        } else {
                cprintf("%d unknown error\n", ERROR);
        }
-       rec_log(CL_NEWUSER, CC->curr_user);
 }
 
 
@@ -888,8 +886,7 @@ void cmd_setp(char *new_pw)
        if (CtdlAccessCheck(ac_logged_in)) {
                return;
        }
-
-       if (CC->usersupp.uid != BBSUID) {
+       if ( (CC->usersupp.uid != BBSUID) && (CC->usersupp.uid != (-1)) ) {
                cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR);
                return;
        }
@@ -902,7 +899,7 @@ void cmd_setp(char *new_pw)
        strcpy(CC->usersupp.password, new_pw);
        lputuser(&CC->usersupp);
        cprintf("%d Password changed.\n", CIT_OK);
-       rec_log(CL_PWCHANGE, CC->curr_user);
+       lprintf(3, "Password changed for user <%s>\n", CC->curr_user);
        PerformSessionHooks(EVT_SETPASS);
 }
 
@@ -940,7 +937,6 @@ void cmd_creu(char *cmdbuf)
        } else {
                cprintf("%d An error occured creating the user account.\n", ERROR);
        }
-       rec_log(CL_NEWUSER, username);
 }