Moved makeuserkey() and cutuserkey() from user_ops.h to user_ops.c

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index dab7f296baed524f125cc5f849672ad6f5805998..168639ed91da8c3a93e6d84f2668e4c04c63b589 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which perform operations on user objects.
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-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.
@@ -32,6 +32,41 @@ int chkpwd_write_pipe[2];
 int chkpwd_read_pipe[2];
 
 
+
+/*
+ * Figure out what this does and make it cleaner
+ */
+long cutuserkey(char *username) { 
+       long len;
+       len = strlen(username);
+       if (len >= USERNAME_SIZE)
+       {
+               syslog(LOG_INFO, "Username too long: %s", username);
+               len = USERNAME_SIZE - 1; 
+               username[len]='\0';
+       }
+       return len;
+}
+
+
+/*
+ * makeuserkey() - convert a username into the format used as a database key
+ *              (it's just the username converted into lower case)
+ */
+void makeuserkey(char *key, const char *username, long len) {
+       int i;
+
+       if (len >= USERNAME_SIZE)
+       {
+               syslog(LOG_INFO, "Username too long: %s", username);
+               len = USERNAME_SIZE - 1; 
+       }
+       for (i=0; i<=len; ++i) {
+               key[i] = tolower(username[i]);
+       }
+}
+
+
 /*
  * CtdlGetUser()       retrieve named user into supplied buffer.
  *                     returns 0 on success
@@ -475,15 +510,13 @@ int getuserbyuid(struct ctdluser *usbuf, uid_t number)
 
 /*
  * Back end for cmd_user() and its ilk
- *
- * NOTE: "authname" should only be used if we are attempting to use the "master user" feature
  */
-int CtdlLoginExistingUser(char *authname, const char *trythisname)
+int CtdlLoginExistingUser(const char *trythisname)
 {
        char username[SIZ];
        int found_user;
 
-       syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s, %s)", authname, trythisname);
+       syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s)", trythisname);
 
        if ((CC->logged_in)) {
                return login_already_logged_in;
@@ -497,16 +530,6 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
                return login_not_found;
        }
 
-       /* If a "master user" is defined, handle its authentication if specified */
-       CC->is_master = 0;
-       if (    (!IsEmptyStr(CtdlGetConfigStr("c_master_user"))) && 
-               (!IsEmptyStr(CtdlGetConfigStr("c_master_pass"))) &&
-               (authname != NULL) &&
-               (!strcasecmp(authname, CtdlGetConfigStr("c_master_user"))) )
-       {
-               CC->is_master = 1;
-       }
-
        /* Continue attempting user validation... */
        safestrncpy(username, trythisname, sizeof (username));
        striplt(username);
@@ -712,9 +735,6 @@ void CtdlUserLogout(void)
         * since it's possible to log in again without reconnecting, we cannot
         * make that assumption.
         */
-       strcpy(CCC->fake_username, "");
-       strcpy(CCC->fake_hostname, "");
-       strcpy(CCC->fake_roomname, "");
        CCC->logged_in = 0;
 
        /* Check to see if the user was deleted while logged in and purge them if necessary */
@@ -725,13 +745,9 @@ void CtdlUserLogout(void)
        /* Clear out the user record in memory so we don't behave like a ghost */
        memset(&CCC->user, 0, sizeof(struct ctdluser));
        CCC->curr_user[0] = 0;
-       CCC->is_master = 0;
        CCC->cs_inet_email[0] = 0;
        CCC->cs_inet_other_emails[0] = 0;
        CCC->cs_inet_fn[0] = 0;
-       CCC->fake_username[0] = 0;
-       CCC->fake_hostname[0] = 0;
-       CCC->fake_roomname[0] = 0;
 
        /* Free any output buffers */
        unbuffer_output();
@@ -846,10 +862,6 @@ int CtdlTryPassword(const char *password, long len)
                return pass_wrong_password;
        }
 
-       if (CCC->is_master) {
-               code = strcmp(password, CtdlGetConfigStr("c_master_pass"));
-       }
-
        else if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 
                /* host auth mode */