X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=f9ac7c843c8333a90b612ca52ef5c7767ffcd7dc;hb=1e656d277fe91b7c4f5d73eab4a0dd0b7a173145;hp=a631c2cee2bb525c547206444b6089a294a036fa;hpb=3c7bc53bb9f9fab6899206539bba8f794509f37b;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index a631c2cee..f9ac7c843 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -5,10 +5,6 @@
  *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include "sysdep.h"
 #include <errno.h>
 #include <stdlib.h>
@@ -20,6 +16,9 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -33,16 +32,13 @@
 #endif
 
 #include <string.h>
-#include <syslog.h>
 #include <limits.h>
-#ifndef ENABLE_CHKPWD
+#include <libcitadel.h>
 #include "auth.h"
-#endif
 #include "citadel.h"
 #include "server.h"
 #include "database.h"
 #include "user_ops.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "support.h"
 #include "room_ops.h"
@@ -50,51 +46,60 @@
 #include "control.h"
 #include "msgbase.h"
 #include "config.h"
-#include "tools.h"
 #include "citserver.h"
+#include "citadel_dirs.h"
+#include "genstamp.h"
+
+/* These pipes are used to talk to the chkpwd daemon, which is forked during startup */
+int chkpwd_write_pipe[2];
+int chkpwd_read_pipe[2];
+
+/*
+ * 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) {
+	int i, len;
+
+	len = strlen(username);
+	if (len >= USERNAME_SIZE)
+	{
+		lprintf (CTDL_EMERG, "Username to long: %s", username);
+		cit_backtrace ();
+		len = USERNAME_SIZE - 1; 
+		username[USERNAME_SIZE - 1]='\0';
+	}
+	for (i=0; i<=len; ++i) {
+		key[i] = tolower(username[i]);
+	}
+}
 
 
 /*
  * getuser()  -  retrieve named user into supplied buffer.
- *               returns 0 on success
+ *	       returns 0 on success
  */
-int getuser(struct usersupp *usbuf, char name[])
+int getuser(struct ctdluser *usbuf, char name[])
 {
 
-	char lowercase_name[USERNAME_SIZE];
-	char sysuser_name[USERNAME_SIZE];
-	int a;
+	char usernamekey[USERNAME_SIZE];
 	struct cdbdata *cdbus;
-	int using_sysuser = 0;
-
-	memset(usbuf, 0, sizeof(struct usersupp));
 
-#ifdef ENABLE_AUTOLOGIN
-	if (CtdlAssociateSystemUser(sysuser_name, name) == 0) {
-		++using_sysuser;
+	if (usbuf != NULL) {
+		memset(usbuf, 0, sizeof(struct ctdluser));
 	}
-#endif
 
-	if (using_sysuser) {
-		for (a = 0; a <= strlen(sysuser_name); ++a) {
-			lowercase_name[a] = tolower(sysuser_name[a]);
-		}
-	}
-	else {
-		for (a = 0; a <= strlen(name); ++a) {
-			if (a < sizeof(lowercase_name))
-				lowercase_name[a] = tolower(name[a]);
-		}
-	}
-	lowercase_name[sizeof(lowercase_name) - 1] = 0;
+	makeuserkey(usernamekey, name);
+	cdbus = cdb_fetch(CDB_USERS, usernamekey, strlen(usernamekey));
 
-	cdbus = cdb_fetch(CDB_USERSUPP, lowercase_name, strlen(lowercase_name));
 	if (cdbus == NULL) {	/* user not found */
 		return(1);
 	}
-	memcpy(usbuf, cdbus->ptr,
-	       ((cdbus->len > sizeof(struct usersupp)) ?
-		sizeof(struct usersupp) : cdbus->len));
+	if (usbuf != NULL) {
+		memcpy(usbuf, cdbus->ptr,
+			((cdbus->len > sizeof(struct ctdluser)) ?
+			 sizeof(struct ctdluser) : cdbus->len));
+	}
 	cdb_free(cdbus);
 
 	return (0);
@@ -104,13 +109,13 @@ int getuser(struct usersupp *usbuf, char name[])
 /*
  * lgetuser()  -  same as getuser() but locks the record
  */
-int lgetuser(struct usersupp *usbuf, char *name)
+int lgetuser(struct ctdluser *usbuf, char *name)
 {
 	int retcode;
 
 	retcode = getuser(usbuf, name);
 	if (retcode == 0) {
-		begin_critical_section(S_USERSUPP);
+		begin_critical_section(S_USERS);
 	}
 	return (retcode);
 }
@@ -119,21 +124,16 @@ int lgetuser(struct usersupp *usbuf, char *name)
 /*
  * putuser()  -  write user buffer into the correct place on disk
  */
-void putuser(struct usersupp *usbuf)
+void putuser(struct ctdluser *usbuf)
 {
-	char lowercase_name[USERNAME_SIZE];
-	int a;
+	char usernamekey[USERNAME_SIZE];
 
-	for (a = 0; a <= strlen(usbuf->fullname); ++a) {
-		if (a < sizeof(lowercase_name))
-			lowercase_name[a] = tolower(usbuf->fullname[a]);
-	}
-	lowercase_name[sizeof(lowercase_name) - 1] = 0;
+	makeuserkey(usernamekey, usbuf->fullname);
 
 	usbuf->version = REV_LEVEL;
-	cdb_store(CDB_USERSUPP,
-		  lowercase_name, strlen(lowercase_name),
-		  usbuf, sizeof(struct usersupp));
+	cdb_store(CDB_USERS,
+		  usernamekey, strlen(usernamekey),
+		  usbuf, sizeof(struct ctdluser));
 
 }
 
@@ -141,10 +141,10 @@ void putuser(struct usersupp *usbuf)
 /*
  * lputuser()  -  same as putuser() but locks the record
  */
-void lputuser(struct usersupp *usbuf)
+void lputuser(struct ctdluser *usbuf)
 {
 	putuser(usbuf);
-	end_critical_section(S_USERSUPP);
+	end_critical_section(S_USERS);
 }
 
 /*
@@ -178,8 +178,9 @@ int GenerateRelationshipIndex(char *IndexBuf,
 void put_visit(struct visit *newvisit)
 {
 	char IndexBuf[32];
-	int IndexLen;
+	int IndexLen = 0;
 
+	memset (IndexBuf, 0, sizeof (IndexBuf));
 	/* Generate an index */
 	IndexLen = GenerateRelationshipIndex(IndexBuf,
 					     newvisit->v_roomnum,
@@ -199,8 +200,8 @@ void put_visit(struct visit *newvisit)
  * Define a relationship between a user and a room
  */
 void CtdlSetRelationship(struct visit *newvisit,
-			 struct usersupp *rel_user,
-			 struct quickroom *rel_room)
+			 struct ctdluser *rel_user,
+			 struct ctdlroom *rel_room)
 {
 
 
@@ -218,8 +219,8 @@ void CtdlSetRelationship(struct visit *newvisit,
  * Locate a relationship between a user and a room
  */
 void CtdlGetRelationship(struct visit *vbuf,
-			 struct usersupp *rel_user,
-			 struct quickroom *rel_room)
+			 struct ctdluser *rel_user,
+			 struct ctdlroom *rel_room)
 {
 
 	char IndexBuf[32];
@@ -256,7 +257,7 @@ void CtdlGetRelationship(struct visit *vbuf,
 }
 
 
-void MailboxName(char *buf, size_t n, const struct usersupp *who, const char *prefix)
+void MailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix)
 {
 	snprintf(buf, n, "%010ld.%s", who->usernum, prefix);
 }
@@ -267,7 +268,7 @@ void MailboxName(char *buf, size_t n, const struct usersupp *who, const char *pr
  */
 int is_aide(void)
 {
-	if (CC->usersupp.axlevel >= 6)
+	if (CC->user.axlevel >= 6)
 		return (1);
 	else
 		return (0);
@@ -284,8 +285,8 @@ int is_room_aide(void)
 		return (0);
 	}
 
-	if ((CC->usersupp.axlevel >= 6)
-	    || (CC->quickroom.QRroomaide == CC->usersupp.usernum)) {
+	if ((CC->user.axlevel >= 6)
+	    || (CC->room.QRroomaide == CC->user.usernum)) {
 		return (1);
 	} else {
 		return (0);
@@ -294,25 +295,25 @@ int is_room_aide(void)
 
 /*
  * getuserbynumber()  -  get user by number
- *                       returns 0 if user was found
+ *		       returns 0 if user was found
  *
  * WARNING: don't use this function unless you absolutely have to.  It does
- *          a sequential search and therefore is computationally expensive.
+ *	  a sequential search and therefore is computationally expensive.
  */
-int getuserbynumber(struct usersupp *usbuf, long int number)
+int getuserbynumber(struct ctdluser *usbuf, long int number)
 {
 	struct cdbdata *cdbus;
 
-	cdb_rewind(CDB_USERSUPP);
+	cdb_rewind(CDB_USERS);
 
-	while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
-		memset(usbuf, 0, sizeof(struct usersupp));
+	while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
+		memset(usbuf, 0, sizeof(struct ctdluser));
 		memcpy(usbuf, cdbus->ptr,
-		       ((cdbus->len > sizeof(struct usersupp)) ?
-			sizeof(struct usersupp) : cdbus->len));
+		       ((cdbus->len > sizeof(struct ctdluser)) ?
+			sizeof(struct ctdluser) : cdbus->len));
 		cdb_free(cdbus);
 		if (usbuf->usernum == number) {
-			cdb_close_cursor(CDB_USERSUPP);
+			cdb_close_cursor(CDB_USERS);
 			return (0);
 		}
 	}
@@ -321,51 +322,123 @@ int getuserbynumber(struct usersupp *usbuf, long int number)
 
 
 /*
- * See if we can translate a system login name (i.e. from /etc/passwd)
- * to a Citadel screen name.  Returns 0 if one is found.
+ * getuserbyuid()  -     get user by system uid (for PAM mode authentication)
+ *		       returns 0 if user was found
+ *
+ * WARNING: don't use this function unless you absolutely have to.  It does
+ *	  a sequential search and therefore is computationally expensive.
  */
-int CtdlAssociateSystemUser(char *screenname, char *loginname) {
-	struct passwd *p;
-	int a;
+int getuserbyuid(struct ctdluser *usbuf, uid_t number)
+{
+	struct cdbdata *cdbus;
 
-	p = (struct passwd *) getpwnam(loginname);
-	if (p != NULL) {
-		strcpy(screenname, p->pw_gecos);
-		for (a = 0; a < strlen(screenname); ++a) {
-			if (screenname[a] == ',') {
-				screenname[a] = 0;
-			}
+	cdb_rewind(CDB_USERS);
+
+	while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
+		memset(usbuf, 0, sizeof(struct ctdluser));
+		memcpy(usbuf, cdbus->ptr,
+		       ((cdbus->len > sizeof(struct ctdluser)) ?
+			sizeof(struct ctdluser) : cdbus->len));
+		cdb_free(cdbus);
+		if (usbuf->uid == number) {
+			cdb_close_cursor(CDB_USERS);
+			return (0);
 		}
-		return(0);
 	}
-	return(1);
+	return (-1);
 }
 
-
-
 /*
  * 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 *trythisname)
+int CtdlLoginExistingUser(char *authname, char *trythisname)
 {
 	char username[SIZ];
 	int found_user;
 
-	if (trythisname == NULL) return login_not_found;
-	safestrncpy(username, trythisname, sizeof username);
-	strproc(username);
-
 	if ((CC->logged_in)) {
 		return login_already_logged_in;
 	}
 
-	found_user = getuser(&CC->usersupp, username);
+	if (trythisname == NULL) return login_not_found;
+
+	/* If a "master user" is defined, handle its authentication if specified */
+	CC->is_master = 0;
+	if (strlen(config.c_master_user) > 0) if (strlen(config.c_master_pass) > 0) if (authname) {
+		if (!strcasecmp(authname, config.c_master_user)) {
+			CC->is_master = 1;
+		}
+	}
+
+	/* Continue attempting user validation... */
+	safestrncpy(username, trythisname, USERNAME_SIZE);
+	striplt(username);
 
+	if (IsEmptyStr(username)) {
+		return login_not_found;
+	}
+
+	if (config.c_auth_mode == 1) {
+
+		/* host auth mode */
+
+		struct passwd pd;
+		struct passwd *tempPwdPtr;
+		char pwdbuffer[256];
+	
+		lprintf(CTDL_DEBUG, "asking host about <%s>\n", username);
+#ifdef SOLARIS_GETPWUID
+		tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
+#else
+		getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
+#endif
+		if (tempPwdPtr == NULL) {
+			return login_not_found;
+		}
+		lprintf(CTDL_DEBUG, "found it! uid=%ld, gecos=%s\n", (long)pd.pw_uid, pd.pw_gecos);
+	
+		/* Locate the associated Citadel account.
+		 * If not found, make one attempt to create it.
+		 */
+		found_user = getuserbyuid(&CC->user, pd.pw_uid);
+		if (found_user != 0) {
+			create_user(username, 0);
+			found_user = getuserbyuid(&CC->user, pd.pw_uid);
+		}
+
+	}
+
+	else {
+		/* native auth mode */
+
+		struct recptypes *valid = NULL;
+	
+		/* First, try to log in as if the supplied name is a display name */
+		found_user = getuser(&CC->user, username);
+	
+		/* If that didn't work, try to log in as if the supplied name
+	 	* is an e-mail address
+	 	*/
+		if (found_user != 0) {
+			valid = validate_recipients(username);
+			if (valid != NULL) {
+				if (valid->num_local == 1) {
+					found_user = getuser(&CC->user, valid->recp_local);
+				}
+				free_recipients(valid);
+			}
+		}
+	}
+
+	/* Did we find something? */
 	if (found_user == 0) {
-		if (((CC->nologin)) && (CC->usersupp.axlevel < 6)) {
+		if (((CC->nologin)) && (CC->user.axlevel < 6)) {
 			return login_too_many_users;
 		} else {
-			strcpy(CC->curr_user, CC->usersupp.fullname);
+			safestrncpy(CC->curr_user, CC->user.fullname,
+					sizeof CC->curr_user);
 			return login_ok;
 		}
 	}
@@ -379,17 +452,16 @@ int CtdlLoginExistingUser(char *trythisname)
  */
 void cmd_user(char *cmdbuf)
 {
-	char username[SIZ];
+	char username[256];
 	int a;
 
-	extract(username, cmdbuf, 0);
-	username[25] = 0;
-	strproc(username);
+	extract_token(username, cmdbuf, 0, '|', sizeof username);
+	striplt(username);
 
-	a = CtdlLoginExistingUser(username);
+	a = CtdlLoginExistingUser(NULL, 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: "
@@ -403,9 +475,10 @@ 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);
+	default:
+		cprintf("%d Internal error\n", ERROR + INTERNAL_ERROR);
 	}
 }
 
@@ -416,23 +489,32 @@ void cmd_user(char *cmdbuf)
  */
 void session_startup(void)
 {
-	int i;
+	int i = 0;
 
-	syslog(LOG_NOTICE, "session %d: user <%s> logged in",
-	       CC->cs_pid, CC->curr_user);
+	lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
 
-	lgetuser(&CC->usersupp, CC->curr_user);
-	++(CC->usersupp.timescalled);
-	CC->previous_login = CC->usersupp.lastcall;
-	time(&CC->usersupp.lastcall);
+	lgetuser(&CC->user, CC->curr_user);
+	++(CC->user.timescalled);
+	CC->previous_login = CC->user.lastcall;
+	time(&CC->user.lastcall);
 
 	/* If this user's name is the name of the system administrator
 	 * (as specified in setup), automatically assign access level 6.
 	 */
-	if (!strcasecmp(CC->usersupp.fullname, config.c_sysadm)) {
-		CC->usersupp.axlevel = 6;
+	if (!strcasecmp(CC->user.fullname, config.c_sysadm)) {
+		CC->user.axlevel = 6;
 	}
-	lputuser(&CC->usersupp);
+
+	/* If we're authenticating off the host system, automatically give
+	 * root the highest level of access.
+	 */
+	if (config.c_auth_mode == 1) {
+		if (CC->user.uid == 0) {
+			CC->user.axlevel = 6;
+		}
+	}
+
+	lputuser(&CC->user);
 
 	/*
 	 * Populate CC->cs_inet_email with a default address.  This will be
@@ -440,8 +522,8 @@ void session_startup(void)
 	 * the vCard module's login hook runs.
 	 */
 	snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s",
-		CC->usersupp.fullname, config.c_fqdn);
-	for (i=0; i<strlen(CC->cs_inet_email); ++i) {
+		CC->user.fullname, config.c_fqdn);
+	for (i=0; !IsEmptyStr(&CC->cs_inet_email[i]); ++i) {
 		if (isspace(CC->cs_inet_email[i])) {
 			CC->cs_inet_email[i] = '_';
 		}
@@ -450,8 +532,9 @@ void session_startup(void)
 	/* Create any personal rooms required by the system.
 	 * (Technically, MAILROOM should be there already, but just in case...)
 	 */
-	create_room(MAILROOM, 4, "", 0, 1, 0);
-	create_room(SENTITEMS, 4, "", 0, 1, 0);
+	create_room(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
+	create_room(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX);
+	create_room(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
 
 	/* Run any startup routines registered by loadable modules */
 	PerformSessionHooks(EVT_LOGIN);
@@ -464,9 +547,9 @@ void session_startup(void)
 void logged_in_response(void)
 {
 	cprintf("%d %s|%d|%ld|%ld|%u|%ld|%ld\n",
-		CIT_OK, CC->usersupp.fullname, CC->usersupp.axlevel,
-		CC->usersupp.timescalled, CC->usersupp.posted,
-		CC->usersupp.flags, CC->usersupp.usernum,
+		CIT_OK, CC->user.fullname, CC->user.axlevel,
+		CC->user.timescalled, CC->user.posted,
+		CC->user.flags, CC->user.usernum,
 		CC->previous_login);
 }
 
@@ -477,6 +560,15 @@ void logged_in_response(void)
  */
 void logout(struct CitContext *who)
 {
+	/*
+	 * Clear out some session data.  Most likely, the CitContext for this
+	 * session is about to get nuked when the session disconnects, but
+	 * since it's possible to log in again without reconnecting, we cannot
+	 * make that assumption.
+	 */
+	strcpy(who->fake_username, "");
+	strcpy(who->fake_hostname, "");
+	strcpy(who->fake_roomname, "");
 	who->logged_in = 0;
 
 	/*
@@ -497,71 +589,87 @@ void logout(struct CitContext *who)
 	/*
 	 * If we were talking to a network node, we're not anymore...
 	 */
-	if (strlen(who->net_node) > 0) {
+	if (!IsEmptyStr(who->net_node)) {
 		network_talking_to(who->net_node, NTT_REMOVE);
 	}
 
 	/* Do modular stuff... */
 	PerformSessionHooks(EVT_LOGOUT);
+
+	/* Free any output buffers */
+	if (who->output_buffer != NULL) {
+		unbuffer_output();
+	}
 }
 
-#ifdef ENABLE_CHKPWD
 /*
- * an alternate version of validpw() which executes `chkpwd' instead of
- * verifying the password directly
+ * Validate a password on the host unix system by talking to the chkpwd daemon
  */
 static int validpw(uid_t uid, const char *pass)
 {
-	pid_t pid;
-	int status, pipev[2];
-	char buf[24];
-
-	if (pipe(pipev)) {
-		lprintf(1, "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 "
-			"uid %ld\n", strerror(errno), (long)uid);
-		close(pipev[0]);
-		close(pipev[1]);
-		return 0;
-
-	case 0:
-		close(pipev[1]);
-		if (dup2(pipev[0], 0) == -1) {
-			perror("dup2");
-			exit(1);
-		}
-		close(pipev[0]);
-
-		execl(BBSDIR "/chkpwd", BBSDIR "/chkpwd", NULL);
-		perror(BBSDIR "/chkpwd");
-		exit(1);
-	}
-
-	close(pipev[0]);
-	write(pipev[1], buf,
-	      snprintf(buf, sizeof buf, "%lu\n", (unsigned long) uid));
-	write(pipev[1], pass, strlen(pass));
-	write(pipev[1], "\n", 1);
-	close(pipev[1]);
-
-	while (waitpid(pid, &status, 0) == -1)
-		if (errno != EINTR) {
-			lprintf(1, "waitpid failed (%s): denying autologin "
-				"access for uid %ld\n",
-				strerror(errno), (long)uid);
-			return 0;
-		}
-	if (WIFEXITED(status) && !WEXITSTATUS(status))
-		return 1;
+	char buf[256];
+
+	lprintf(CTDL_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid);
+
+	begin_critical_section(S_CHKPWD);
+	write(chkpwd_write_pipe[1], &uid, sizeof(uid_t));
+	write(chkpwd_write_pipe[1], pass, 256);
+	read(chkpwd_read_pipe[0], buf, 4);
+	end_critical_section(S_CHKPWD);
 
+	if (!strncmp(buf, "PASS", 4)) {
+		lprintf(CTDL_DEBUG, "...pass\n");
+		return(1);
+	}
+
+	lprintf(CTDL_DEBUG, "...fail\n");
 	return 0;
 }
-#endif
+
+/* 
+ * Start up the chkpwd daemon so validpw() has something to talk to
+ */
+void start_chkpwd_daemon(void) {
+	pid_t chkpwd_pid;
+	struct stat filestats;
+	int i;
+
+	lprintf(CTDL_DEBUG, "Starting chkpwd daemon for host authentication mode\n");
+
+	if ((stat(file_chkpwd, &filestats)==-1) ||
+	    (filestats.st_size==0)){
+		printf("didn't find chkpwd daemon in %s: %s\n", file_chkpwd, strerror(errno));
+		abort();
+	}
+	if (pipe(chkpwd_write_pipe) != 0) {
+		lprintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+		abort();
+	}
+	if (pipe(chkpwd_read_pipe) != 0) {
+		lprintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+		abort();
+	}
+
+	chkpwd_pid = fork();
+	if (chkpwd_pid < 0) {
+		lprintf(CTDL_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno));
+		abort();
+	}
+	if (chkpwd_pid == 0) {
+		lprintf(CTDL_DEBUG, "Now calling dup2() write\n");
+		dup2(chkpwd_write_pipe[0], 0);
+		lprintf(CTDL_DEBUG, "Now calling dup2() write\n");
+		dup2(chkpwd_read_pipe[1], 1);
+		lprintf(CTDL_DEBUG, "Now closing stuff\n");
+		for (i=2; i<256; ++i) close(i);
+		lprintf(CTDL_DEBUG, "Now calling execl(%s)\n", file_chkpwd);
+		execl(file_chkpwd, file_chkpwd, NULL);
+		lprintf(CTDL_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno));
+		abort();
+		exit(errno);
+	}
+}
+
 
 void do_login()
 {
@@ -575,56 +683,73 @@ 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->usersupp, CC->curr_user)) {
-		lprintf(5, "CtdlTryPassword: internal error\n");
+	if (getuser(&CC->user, CC->curr_user)) {
+		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);
 
-
-#ifdef ENABLE_AUTOLOGIN
-	/* 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);
+	if (CC->is_master) {
+		code = strcmp(password, config.c_master_pass);
 	}
-	/* Any other uid means we have to check the system password database */
-	else {
-		if (validpw(CC->usersupp.uid, password)) {
+
+	else if (config.c_auth_mode == 1) {
+
+		/* host auth mode */
+
+		if (validpw(CC->user.uid, password)) {
 			code = 0;
-			lgetuser(&CC->usersupp, CC->curr_user);
-			safestrncpy(CC->usersupp.password, password,
-				    sizeof CC->usersupp.password);
-			lputuser(&CC->usersupp);
+
+			/*
+			 * sooper-seekrit hack: populate the password field in the
+			 * citadel database with the password that the user typed,
+			 * if it's correct.  This allows most sites to convert from
+			 * host auth to native auth if they want to.  If you think
+			 * this is a security hazard, comment it out.
+			 */
+
+			lgetuser(&CC->user, CC->curr_user);
+			safestrncpy(CC->user.password, password, sizeof CC->user.password);
+			lputuser(&CC->user);
+
+			/*
+			 * (sooper-seekrit hack ends here)
+			 */
+
+		}
+		else {
+			code = (-1);
 		}
 	}
 
-#else /* ENABLE_AUTOLOGIN */
-	strproc(password);
-	strproc(CC->usersupp.password);
-	code = strcasecmp(CC->usersupp.password, password);
+	else {
 
-#endif /* ENABLE_AUTOLOGIN */
+		/* native auth mode */
+
+		strproc(password);
+		strproc(CC->user.password);
+		code = strcasecmp(CC->user.password, password);
+		strproc(password);
+		strproc(CC->user.password);
+		code = strcasecmp(CC->user.password, password);
+	}
 
 	if (!code) {
 		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;
 	}
 }
@@ -632,28 +757,26 @@ int CtdlTryPassword(char *password)
 
 void cmd_pass(char *buf)
 {
-	char password[SIZ];
+	char password[256];
 	int a;
 
-	extract(password, buf, 0);
+	extract_token(password, buf, 0, '|', sizeof password);
 	a = CtdlTryPassword(password);
 
 	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();
 		return;
-		cprintf("%d Can't find user record!\n",
-			ERROR + INTERNAL_ERROR);
 	}
 }
 
@@ -665,18 +788,15 @@ void cmd_pass(char *buf)
 int purge_user(char pname[])
 {
 	char filename[64];
-	struct usersupp usbuf;
-	char lowercase_name[USERNAME_SIZE];
-	int a;
+	struct ctdluser usbuf;
+	char usernamekey[USERNAME_SIZE];
 	struct CitContext *ccptr;
 	int user_is_logged_in = 0;
 
-	for (a = 0; a <= strlen(pname); ++a) {
-		lowercase_name[a] = tolower(pname[a]);
-	}
+	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
@@ -686,34 +806,42 @@ int purge_user(char pname[])
 	user_is_logged_in = 0;
 	begin_critical_section(S_SESSION_TABLE);
 	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-		if (ccptr->usersupp.usernum == usbuf.usernum) {
+		if (ccptr->user.usernum == usbuf.usernum) {
 			user_is_logged_in = 1;
 		}
 	}
 	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);
+	PerformUserHooks(&usbuf, EVT_PURGEUSER);
 
 	/* delete any existing user/room relationships */
 	cdb_delete(CDB_VISIT, &usbuf.usernum, sizeof(long));
 
 	/* delete the userlog entry */
-	cdb_delete(CDB_USERSUPP, lowercase_name, strlen(lowercase_name));
+	cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
 
 	/* remove the user's bio file */
-	snprintf(filename, sizeof filename, "./bio/%ld", usbuf.usernum);
+	snprintf(filename, 
+			 sizeof filename, 
+			 "%s/%ld",
+			 ctdl_bio_dir,
+			 usbuf.usernum);
 	unlink(filename);
 
 	/* remove the user's picture */
-	snprintf(filename, sizeof filename, "./userpics/%ld.gif", usbuf.usernum);
+	snprintf(filename, 
+			 sizeof filename, 
+			 "%s/%ld.gif",
+			 ctdl_image_dir,
+			 usbuf.usernum);
 	unlink(filename);
 
 	return (0);
@@ -729,35 +857,45 @@ int purge_user(char pname[])
  */
 int create_user(char *newusername, int become_user)
 {
-	struct usersupp usbuf;
-	struct quickroom qrbuf;
-	struct passwd *p = NULL;
-	char username[SIZ];
+	struct ctdluser usbuf;
+	struct ctdlroom qrbuf;
+	char username[256];
 	char mailboxname[ROOMNAMELEN];
-	uid_t uid;
+	char buf[SIZ];
+	uid_t uid = (-1);
 
-	strcpy(username, newusername);
+	safestrncpy(username, newusername, sizeof username);
 	strproc(username);
 
-#ifdef ENABLE_AUTOLOGIN
-	p = (struct passwd *) getpwnam(username);
-	if (p != NULL) {
-		extract_token(username, p->pw_gecos, 0, ',');
-		uid = p->pw_uid;
-	} else {
-		uid = (-1);
-	}
+	if (config.c_auth_mode == 1) {
+
+		/* host auth mode */
+
+		struct passwd pd;
+		struct passwd *tempPwdPtr;
+		char pwdbuffer[256];
+	
+#ifdef SOLARIS_GETPWUID
+		tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer));
 #else
-	uid = (-1);
+		getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
 #endif
+		if (tempPwdPtr != NULL) {
+			extract_token(username, pd.pw_gecos, 0, ',', sizeof username);
+			uid = pd.pw_uid;
+		}
+		else {
+			return (ERROR + NO_SUCH_USER);
+		}
+	}
 
 	if (!getuser(&usbuf, username)) {
 		return (ERROR + ALREADY_EXISTS);
 	}
 
 	/* Go ahead and initialize a new user record */
-	memset(&usbuf, 0, sizeof(struct usersupp));
-	strcpy(usbuf.fullname, username);
+	memset(&usbuf, 0, sizeof(struct ctdluser));
+	safestrncpy(usbuf.fullname, username, sizeof usbuf.fullname);
 	strcpy(usbuf.password, "");
 	usbuf.uid = uid;
 
@@ -787,32 +925,42 @@ int create_user(char *newusername, int become_user)
 	 * Make the latter an invisible system room.
 	 */
 	MailboxName(mailboxname, sizeof mailboxname, &usbuf, MAILROOM);
-	create_room(mailboxname, 5, "", 0, 1, 1);
+	create_room(mailboxname, 5, "", 0, 1, 1, VIEW_MAILBOX);
 
 	MailboxName(mailboxname, sizeof mailboxname, &usbuf, USERCONFIGROOM);
-	create_room(mailboxname, 5, "", 0, 1, 1);
-        if (lgetroom(&qrbuf, mailboxname) == 0) {
-                qrbuf.QRflags2 |= QR2_SYSTEM;
-                lputroom(&qrbuf);
-        }
+	create_room(mailboxname, 5, "", 0, 1, 1, VIEW_BBS);
+	if (lgetroom(&qrbuf, mailboxname) == 0) {
+		qrbuf.QRflags2 |= QR2_SYSTEM;
+		lputroom(&qrbuf);
+	}
+
+	/* Perform any create functions registered by server extensions */
+	PerformUserHooks(&usbuf, EVT_NEWUSER);
 
 	/* Everything below this line can be bypassed if administratively
-	   creating a user, instead of doing self-service account creation
+	 * creating a user, instead of doing self-service account creation
 	 */
 
 	if (become_user) {
 		/* Now become the user we just created */
-		memcpy(&CC->usersupp, &usbuf, sizeof(struct usersupp));
-		strcpy(CC->curr_user, username);
+		memcpy(&CC->user, &usbuf, sizeof(struct ctdluser));
+		safestrncpy(CC->curr_user, username, sizeof CC->curr_user);
 		CC->logged_in = 1;
 	
 		/* Check to make sure we're still who we think we are */
-		if (getuser(&CC->usersupp, CC->curr_user)) {
+		if (getuser(&CC->user, CC->curr_user)) {
 			return (ERROR + INTERNAL_ERROR);
 		}
 	}
-
-	lprintf(3, "New user <%s> created\n", username);
+	
+	snprintf(buf, SIZ, 
+		"New user account <%s> has been created, from host %s [%s].\n",
+		username,
+		CC->cs_host,
+		CC->cs_addr
+	);
+	aide_message(buf, "User Creation Notice");
+	lprintf(CTDL_NOTICE, "New user <%s> created\n", username);
 	return (0);
 }
 
@@ -825,16 +973,22 @@ int create_user(char *newusername, int become_user)
 void cmd_newu(char *cmdbuf)
 {
 	int a;
-	char username[SIZ];
+	char username[26];
+
+	if (config.c_auth_mode == 1) {
+		cprintf("%d This system does not use native mode authentication.\n",
+			ERROR + NOT_HERE);
+		return;
+	}
 
 	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) {
@@ -842,19 +996,19 @@ void cmd_newu(char *cmdbuf)
 			ERROR + MAX_SESSIONS_EXCEEDED,
 			config.c_nodename, config.c_maxsessions);
 	}
-	extract(username, cmdbuf, 0);
+	extract_token(username, cmdbuf, 0, '|', sizeof username);
 	username[25] = 0;
 	strproc(username);
 
-	if (strlen(username) == 0) {
-		cprintf("%d You must supply a user name.\n", ERROR);
+	if (IsEmptyStr(username)) {
+		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;
 	}
 
@@ -872,7 +1026,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);
 	}
 }
 
@@ -886,56 +1040,73 @@ void cmd_setp(char *new_pw)
 	if (CtdlAccessCheck(ac_logged_in)) {
 		return;
 	}
-	if ( (CC->usersupp.uid != BBSUID) && (CC->usersupp.uid != (-1)) ) {
-		cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR);
+	if ( (CC->user.uid != CTDLUID) && (CC->user.uid != (-1)) ) {
+		cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR + NOT_HERE);
+		return;
+	}
+	if (CC->is_master) {
+		cprintf("%d The master prefix password cannot be changed with this command.\n",
+			ERROR + NOT_HERE);
 		return;
 	}
 	strproc(new_pw);
-	if (strlen(new_pw) == 0) {
+	if (IsEmptyStr(new_pw)) {
 		cprintf("%d Password unchanged.\n", CIT_OK);
 		return;
 	}
-	lgetuser(&CC->usersupp, CC->curr_user);
-	strcpy(CC->usersupp.password, new_pw);
-	lputuser(&CC->usersupp);
+	lgetuser(&CC->user, CC->curr_user);
+	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);
 }
 
 
 /*
- * cmd_creu()  -  administratively create a new user account (do not log in to it)
+ * cmd_creu() - administratively create a new user account (do not log in to it)
  */
 void cmd_creu(char *cmdbuf)
 {
 	int a;
-	char username[SIZ];
+	char username[26];
+	char password[32];
+	struct ctdluser tmp;
 
 	if (CtdlAccessCheck(ac_aide)) {
 		return;
 	}
 
-	extract(username, cmdbuf, 0);
+	extract_token(username, cmdbuf, 0, '|', sizeof username);
+	extract_token(password, cmdbuf, 1, '|', sizeof password);
 	username[25] = 0;
+	password[31] = 0;
 	strproc(username);
+	strproc(password);
 
-	if (strlen(username) == 0) {
-		cprintf("%d You must supply a user name.\n", ERROR);
+	if (IsEmptyStr(username)) {
+		cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED);
 		return;
 	}
 
 	a = create_user(username, 0);
 
 	if (a == 0) {
-		cprintf("%d ok\n", CIT_OK);
+		if (!IsEmptyStr(password)) {
+			lgetuser(&tmp, username);
+			safestrncpy(tmp.password, password, sizeof(tmp.password));
+			lputuser(&tmp);
+		}
+		cprintf("%d User '%s' created %s.\n", CIT_OK, username,
+				(!IsEmptyStr(password)) ? "and password set" :
+				"with no password");
 		return;
 	} else if (a == ERROR + ALREADY_EXISTS) {
 		cprintf("%d '%s' already exists.\n",
 			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);
 	}
 }
 
@@ -950,12 +1121,12 @@ void cmd_getu(void)
 	if (CtdlAccessCheck(ac_logged_in))
 		return;
 
-	getuser(&CC->usersupp, CC->curr_user);
+	getuser(&CC->user, CC->curr_user);
 	cprintf("%d %d|%d|%d|\n",
 		CIT_OK,
-		CC->usersupp.USscreenwidth,
-		CC->usersupp.USscreenheight,
-		(CC->usersupp.flags & US_USER_SET)
+		CC->user.USscreenwidth,
+		CC->user.USscreenheight,
+		(CC->user.flags & US_USER_SET)
 	    );
 }
 
@@ -968,17 +1139,17 @@ 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->usersupp, CC->curr_user);
-	CC->usersupp.USscreenwidth = extract_int(new_parms, 0);
-	CC->usersupp.USscreenheight = extract_int(new_parms, 1);
-	CC->usersupp.flags = CC->usersupp.flags & (~US_USER_SET);
-	CC->usersupp.flags = CC->usersupp.flags |
+	lgetuser(&CC->user, CC->curr_user);
+	CC->user.USscreenwidth = extract_int(new_parms, 0);
+	CC->user.USscreenheight = extract_int(new_parms, 1);
+	CC->user.flags = CC->user.flags & (~US_USER_SET);
+	CC->user.flags = CC->user.flags |
 	    (extract_int(new_parms, 2) & US_USER_SET);
 
-	lputuser(&CC->usersupp);
+	lputuser(&CC->user);
 	cprintf("%d Ok\n", CIT_OK);
 }
 
@@ -989,25 +1160,32 @@ void cmd_slrp(char *new_ptr)
 {
 	long newlr;
 	struct visit vbuf;
+	struct visit original_vbuf;
 
 	if (CtdlAccessCheck(ac_logged_in)) {
 		return;
 	}
 
 	if (!strncasecmp(new_ptr, "highest", 7)) {
-		newlr = CC->quickroom.QRhighest;
+		newlr = CC->room.QRhighest;
 	} else {
 		newlr = atol(new_ptr);
 	}
 
-	lgetuser(&CC->usersupp, CC->curr_user);
+	lgetuser(&CC->user, CC->curr_user);
 
-	CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+	CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
+	memcpy(&original_vbuf, &vbuf, sizeof(struct visit));
 	vbuf.v_lastseen = newlr;
 	snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld", newlr);
-	CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
-	lputuser(&CC->usersupp);
+	/* Only rewrite the record if it changed */
+	if ( (vbuf.v_lastseen != original_vbuf.v_lastseen)
+	   || (strcmp(vbuf.v_seen, original_vbuf.v_seen)) ) {
+		CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
+	}
+
+	lputuser(&CC->user);
 	cprintf("%d %ld\n", CIT_OK, newlr);
 }
 
@@ -1021,14 +1199,15 @@ 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;
 	}
 
 	target_msgnum = extract_long(argbuf, 0);
 	target_setting = extract_int(argbuf, 1);
 
-	CtdlSetSeen(target_msgnum, target_setting);
+	CtdlSetSeen(&target_msgnum, 1, target_setting,
+			ctdlsetseen_seen, NULL, NULL);
 	cprintf("%d OK\n", CIT_OK);
 }
 
@@ -1040,73 +1219,84 @@ void cmd_gtsn(char *argbuf) {
 		return;
 	}
 
-	CtdlGetSeen(buf);
+	CtdlGetSeen(buf, ctdlsetseen_seen);
 	cprintf("%d %s\n", CIT_OK, buf);
 }
 
 
+/*
+ * API function for cmd_invt_kick() and anything else that needs to
+ * invite or kick out a user to/from a room.
+ * 
+ * Set iuser to the name of the user, and op to 1=invite or 0=kick
+ */
+int CtdlInvtKick(char *iuser, int op) {
+	struct ctdluser USscratch;
+	struct visit vbuf;
+	char bbb[SIZ];
+
+	if (getuser(&USscratch, iuser) != 0) {
+		return(1);
+	}
+
+	CtdlGetRelationship(&vbuf, &USscratch, &CC->room);
+	if (op == 1) {
+		vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
+		vbuf.v_flags = vbuf.v_flags | V_ACCESS;
+	}
+	if (op == 0) {
+		vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
+		vbuf.v_flags = vbuf.v_flags | V_FORGET | V_LOCKOUT;
+	}
+	CtdlSetRelationship(&vbuf, &USscratch, &CC->room);
+
+	/* post a message in Aide> saying what we just did */
+	snprintf(bbb, sizeof bbb, "%s has been %s \"%s\" by %s.\n",
+		iuser,
+		((op == 1) ? "invited to" : "kicked out of"),
+		CC->room.QRname,
+		CC->user.fullname);
+	aide_message(bbb,"User Admin Message");
+
+	return(0);
+}
+
 
 /*
  * INVT and KICK commands
  */
-void cmd_invt_kick(char *iuser, int op)
-			/* user name */
-{				/* 1 = invite, 0 = kick out */
-	struct usersupp USscratch;
-	char bbb[SIZ];
-	struct visit vbuf;
+void cmd_invt_kick(char *iuser, int op) {
 
 	/*
 	 * These commands are only allowed by aides, room aides,
 	 * and room namespace owners
 	 */
 	if (is_room_aide()
-	   || (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) {
+	   || (atol(CC->room.QRname) == CC->user.usernum) ) {
 		/* access granted */
 	} else {
 		/* access denied */
-                cprintf("%d Higher access or room ownership required.\n",
-                        ERROR + HIGHER_ACCESS_REQUIRED);
-                return;
-        }
+		cprintf("%d Higher access or room ownership required.\n",
+			ERROR + HIGHER_ACCESS_REQUIRED);
+		return;
+	}
 
-	if (!strncasecmp(CC->quickroom.QRname, config.c_baseroom,
+	if (!strncasecmp(CC->room.QRname, config.c_baseroom,
 			 ROOMNAMELEN)) {
 		cprintf("%d Can't add/remove users from this room.\n",
 			ERROR + NOT_HERE);
 		return;
 	}
 
-	if (lgetuser(&USscratch, iuser) != 0) {
-		cprintf("%d No such user.\n", ERROR);
+	if (CtdlInvtKick(iuser, op) != 0) {
+		cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
 		return;
 	}
-	CtdlGetRelationship(&vbuf, &USscratch, &CC->quickroom);
-
-	if (op == 1) {
-		vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
-		vbuf.v_flags = vbuf.v_flags | V_ACCESS;
-	}
-	if (op == 0) {
-		vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
-		vbuf.v_flags = vbuf.v_flags | V_FORGET | V_LOCKOUT;
-	}
-	CtdlSetRelationship(&vbuf, &USscratch, &CC->quickroom);
-
-	lputuser(&USscratch);
-
-	/* post a message in Aide> saying what we just did */
-	snprintf(bbb, sizeof bbb, "%s %s %s> by %s\n",
-		iuser,
-		((op == 1) ? "invited to" : "kicked out of"),
-		CC->quickroom.QRname,
-		CC->usersupp.fullname);
-	aide_message(bbb);
 
 	cprintf("%d %s %s %s.\n",
 		CIT_OK, iuser,
 		((op == 1) ? "invited to" : "kicked out of"),
-		CC->quickroom.QRname);
+		CC->room.QRname);
 	return;
 }
 
@@ -1120,18 +1310,18 @@ int CtdlForgetThisRoom(void) {
 
 	/* On some systems, Aides are not allowed to forget rooms */
 	if (is_aide() && (config.c_aide_zap == 0)
-	   && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)  ) {
+	   && ((CC->room.QRflags & QR_MAILBOX) == 0)  ) {
 		return(1);
 	}
 
-	lgetuser(&CC->usersupp, CC->curr_user);
-	CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+	lgetuser(&CC->user, CC->curr_user);
+	CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
 
 	vbuf.v_flags = vbuf.v_flags | V_FORGET;
 	vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
 
-	CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
-	lputuser(&CC->usersupp);
+	CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
+	lputuser(&CC->user);
 
 	/* Return to the Lobby, so we don't end up in an undefined room */
 	usergoto(config.c_baseroom, 0, 0, NULL, NULL);
@@ -1154,7 +1344,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);
 	}
 }
 
@@ -1164,7 +1354,7 @@ void cmd_forg(void)
 void cmd_gnur(void)
 {
 	struct cdbdata *cdbus;
-	struct usersupp usbuf;
+	struct ctdluser usbuf;
 
 	if (CtdlAccessCheck(ac_aide)) {
 		return;
@@ -1175,20 +1365,20 @@ void cmd_gnur(void)
 		return;
 	}
 
-	/* There are unvalidated users.  Traverse the usersupp database,
+	/* There are unvalidated users.  Traverse the user database,
 	 * and return the first user we find that needs validation.
 	 */
-	cdb_rewind(CDB_USERSUPP);
-	while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
-		memset(&usbuf, 0, sizeof(struct usersupp));
+	cdb_rewind(CDB_USERS);
+	while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
+		memset(&usbuf, 0, sizeof(struct ctdluser));
 		memcpy(&usbuf, cdbus->ptr,
-		       ((cdbus->len > sizeof(struct usersupp)) ?
-			sizeof(struct usersupp) : cdbus->len));
+		       ((cdbus->len > sizeof(struct ctdluser)) ?
+			sizeof(struct ctdluser) : cdbus->len));
 		cdb_free(cdbus);
 		if ((usbuf.flags & US_NEEDVALID)
 		    && (usbuf.axlevel > 0)) {
 			cprintf("%d %s\n", MORE_DATA, usbuf.fullname);
-			cdb_close_cursor(CDB_USERSUPP);
+			cdb_close_cursor(CDB_USERS);
 			return;
 		}
 	}
@@ -1213,11 +1403,11 @@ void cmd_gnur(void)
  */
 void cmd_vali(char *v_args)
 {
-	char user[SIZ];
+	char user[128];
 	int newax;
-	struct usersupp userbuf;
+	struct ctdluser userbuf;
 
-	extract(user, v_args, 0);
+	extract_token(user, v_args, 0, '|', sizeof user);
 	newax = extract_int(v_args, 1);
 
 	if (CtdlAccessCheck(ac_aide)) {
@@ -1249,19 +1439,19 @@ void cmd_vali(char *v_args)
 /* 
  *  Traverse the user file...
  */
-void ForEachUser(void (*CallBack) (struct usersupp * EachUser, void *out_data),
+void ForEachUser(void (*CallBack) (struct ctdluser * EachUser, void *out_data),
 		 void *in_data)
 {
-	struct usersupp usbuf;
+	struct ctdluser usbuf;
 	struct cdbdata *cdbus;
 
-	cdb_rewind(CDB_USERSUPP);
+	cdb_rewind(CDB_USERS);
 
-	while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
-		memset(&usbuf, 0, sizeof(struct usersupp));
+	while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
+		memset(&usbuf, 0, sizeof(struct ctdluser));
 		memcpy(&usbuf, cdbus->ptr,
-		       ((cdbus->len > sizeof(struct usersupp)) ?
-			sizeof(struct usersupp) : cdbus->len));
+		       ((cdbus->len > sizeof(struct ctdluser)) ?
+			sizeof(struct ctdluser) : cdbus->len));
 		cdb_free(cdbus);
 		(*CallBack) (&usbuf, in_data);
 	}
@@ -1271,10 +1461,17 @@ void ForEachUser(void (*CallBack) (struct usersupp * EachUser, void *out_data),
 /*
  * List one user (this works with cmd_list)
  */
-void ListThisUser(struct usersupp *usbuf, void *data)
+void ListThisUser(struct ctdluser *usbuf, void *data)
 {
+	char *searchstring;
+
+	searchstring = (char *)data;
+	if (bmstrcasestr(usbuf->fullname, searchstring) == NULL) {
+		return;
+	}
+
 	if (usbuf->axlevel > 0) {
-		if ((CC->usersupp.axlevel >= 6)
+		if ((CC->user.axlevel >= 6)
 		    || ((usbuf->flags & US_UNLISTED) == 0)
 		    || ((CC->internal_pgm))) {
 			cprintf("%s|%d|%ld|%ld|%ld|%ld|",
@@ -1284,7 +1481,7 @@ void ListThisUser(struct usersupp *usbuf, void *data)
 				(long)usbuf->lastcall,
 				usbuf->timescalled,
 				usbuf->posted);
-			if (CC->usersupp.axlevel >= 6)
+			if (CC->user.axlevel >= 6)
 				cprintf("%s", usbuf->password);
 			cprintf("\n");
 		}
@@ -1292,12 +1489,15 @@ void ListThisUser(struct usersupp *usbuf, void *data)
 }
 
 /* 
- *  List users
+ *  List users (searchstring may be empty to list all users)
  */
-void cmd_list(void)
+void cmd_list(char *cmdbuf)
 {
+	char searchstring[256];
+	extract_token(searchstring, cmdbuf, 0, '|', sizeof searchstring);
+	striplt(searchstring);
 	cprintf("%d \n", LISTING_FOLLOWS);
-	ForEachUser(ListThisUser, NULL);
+	ForEachUser(ListThisUser, (void *)searchstring );
 	cprintf("000\n");
 }
 
@@ -1317,11 +1517,11 @@ void cmd_chek(void)
 		return;
 	}
 
-	getuser(&CC->usersupp, CC->curr_user);	/* no lock is needed here */
-	if ((REGISCALL != 0) && ((CC->usersupp.flags & US_REGIS) == 0))
+	getuser(&CC->user, CC->curr_user);	/* no lock is needed here */
+	if ((REGISCALL != 0) && ((CC->user.flags & US_REGIS) == 0))
 		regis = 1;
 
-	if (CC->usersupp.axlevel >= 6) {
+	if (CC->user.axlevel >= 6) {
 		get_control();
 		if (CitControl.MMflags & MM_VALID)
 			vali = 1;
@@ -1339,7 +1539,7 @@ void cmd_chek(void)
  */
 void cmd_qusr(char *who)
 {
-	struct usersupp usbuf;
+	struct ctdluser usbuf;
 
 	if (getuser(&usbuf, who) == 0) {
 		cprintf("%d %s\n", CIT_OK, usbuf.fullname);
@@ -1354,14 +1554,14 @@ void cmd_qusr(char *who)
  */
 void cmd_agup(char *cmdbuf)
 {
-	struct usersupp usbuf;
-	char requested_user[SIZ];
+	struct ctdluser usbuf;
+	char requested_user[128];
 
 	if (CtdlAccessCheck(ac_aide)) {
 		return;
 	}
 
-	extract(requested_user, cmdbuf, 0);
+	extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user);
 	if (getuser(&usbuf, requested_user) != 0) {
 		cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
 		return;
@@ -1386,8 +1586,8 @@ void cmd_agup(char *cmdbuf)
  */
 void cmd_asup(char *cmdbuf)
 {
-	struct usersupp usbuf;
-	char requested_user[SIZ];
+	struct ctdluser usbuf;
+	char requested_user[128];
 	char notify[SIZ];
 	int np;
 	int newax;
@@ -1396,14 +1596,14 @@ void cmd_asup(char *cmdbuf)
 	if (CtdlAccessCheck(ac_aide))
 		return;
 
-	extract(requested_user, cmdbuf, 0);
+	extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user);
 	if (lgetuser(&usbuf, requested_user) != 0) {
 		cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
 		return;
 	}
 	np = num_parms(cmdbuf);
 	if (np > 1)
-		extract(usbuf.password, cmdbuf, 1);
+		extract_token(usbuf.password, cmdbuf, 1, '|', sizeof usbuf.password);
 	if (np > 2)
 		usbuf.flags = extract_int(cmdbuf, 2);
 	if (np > 3)
@@ -1430,9 +1630,9 @@ void cmd_asup(char *cmdbuf)
 	}
 
 	if (deleted) {
-		sprintf(notify, "User <%s> deleted by %s\n",
-			usbuf.fullname, CC->usersupp.fullname);
-		aide_message(notify);
+		sprintf(notify, "User \"%s\" has been deleted by %s.\n",
+			usbuf.fullname, CC->user.fullname);
+		aide_message(notify, "User Deletion Message");
 	}
 
 	cprintf("%d Ok", CIT_OK);
@@ -1454,7 +1654,7 @@ void BumpNewMailCounter(long which_user) {
 	begin_critical_section(S_SESSION_TABLE);
 
 	for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
-		if (ptr->usersupp.usernum == which_user) {
+		if (ptr->user.usernum == which_user) {
 			ptr->newmail += 1;
 		}
 	}
@@ -1482,40 +1682,40 @@ int NewMailCount()
  */
 int InitialMailCheck()
 {
-        int num_newmsgs = 0;
-        int a;
-        char mailboxname[ROOMNAMELEN];
-        struct quickroom mailbox;
-        struct visit vbuf;
-        struct cdbdata *cdbfr;
-        long *msglist = NULL;
-        int num_msgs = 0;
-
-        MailboxName(mailboxname, sizeof mailboxname, &CC->usersupp, MAILROOM);
-        if (getroom(&mailbox, mailboxname) != 0)
-                return (0);
-        CtdlGetRelationship(&vbuf, &CC->usersupp, &mailbox);
-
-        cdbfr = cdb_fetch(CDB_MSGLISTS, &mailbox.QRnumber, sizeof(long));
-
-        if (cdbfr != NULL) {
-                msglist = mallok(cdbfr->len);
-                memcpy(msglist, cdbfr->ptr, cdbfr->len);
-                num_msgs = cdbfr->len / sizeof(long);
-                cdb_free(cdbfr);
-        }
-        if (num_msgs > 0)
-                for (a = 0; a < num_msgs; ++a) {
-                        if (msglist[a] > 0L) {
-                                if (msglist[a] > vbuf.v_lastseen) {
-                                        ++num_newmsgs;
-                                }
-                        }
-                }
-        if (msglist != NULL)
-                phree(msglist);
-
-        return (num_newmsgs);
+	int num_newmsgs = 0;
+	int a;
+	char mailboxname[ROOMNAMELEN];
+	struct ctdlroom mailbox;
+	struct visit vbuf;
+	struct cdbdata *cdbfr;
+	long *msglist = NULL;
+	int num_msgs = 0;
+
+	MailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM);
+	if (getroom(&mailbox, mailboxname) != 0)
+		return (0);
+	CtdlGetRelationship(&vbuf, &CC->user, &mailbox);
+
+	cdbfr = cdb_fetch(CDB_MSGLISTS, &mailbox.QRnumber, sizeof(long));
+
+	if (cdbfr != NULL) {
+		msglist = malloc(cdbfr->len);
+		memcpy(msglist, cdbfr->ptr, cdbfr->len);
+		num_msgs = cdbfr->len / sizeof(long);
+		cdb_free(cdbfr);
+	}
+	if (num_msgs > 0)
+		for (a = 0; a < num_msgs; ++a) {
+			if (msglist[a] > 0L) {
+				if (msglist[a] > vbuf.v_lastseen) {
+					++num_newmsgs;
+				}
+			}
+		}
+	if (msglist != NULL)
+		free(msglist);
+
+	return (num_newmsgs);
 }
 
 
@@ -1533,9 +1733,9 @@ void cmd_view(char *cmdbuf) {
 
 	requested_view = extract_int(cmdbuf, 0);
 
-	CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+	CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
 	vbuf.v_view = requested_view;
-	CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+	CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
 	
 	cprintf("%d ok\n", CIT_OK);
 }