*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
#include <signal.h>
#include <pwd.h>
+#include <ctype.h>
#include <sys/types.h>
#include <sys/wait.h>
#endif
#include <string.h>
-#include <syslog.h>
#include <limits.h>
-#ifndef ENABLE_CHKPWD
#include "auth.h"
-#endif
#include "citadel.h"
#include "server.h"
#include "database.h"
#include "user_ops.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "support.h"
#include "room_ops.h"
-#include "logging.h"
#include "file_ops.h"
#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);
+ 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[32];
- int a;
+ char usernamekey[USERNAME_SIZE];
struct cdbdata *cdbus;
- memset(usbuf, 0, sizeof(struct usersupp));
- for (a = 0; a <= strlen(name); ++a) {
- if (a < sizeof(lowercase_name))
- lowercase_name[a] = tolower(name[a]);
+ if (usbuf != NULL) {
+ memset(usbuf, 0, sizeof(struct ctdluser));
}
- lowercase_name[sizeof(lowercase_name) - 1] = 0;
- cdbus = cdb_fetch(CDB_USERSUPP, lowercase_name, strlen(lowercase_name));
- if (cdbus == NULL) {
- return (1); /* user not found */
+ makeuserkey(usernamekey, name);
+ cdbus = cdb_fetch(CDB_USERS, usernamekey, strlen(usernamekey));
+
+ if (cdbus == NULL) { /* user not found */
+ return(1);
+ }
+ if (usbuf != NULL) {
+ memcpy(usbuf, cdbus->ptr,
+ ((cdbus->len > sizeof(struct ctdluser)) ?
+ sizeof(struct ctdluser) : cdbus->len));
}
- memcpy(usbuf, cdbus->ptr,
- ((cdbus->len > sizeof(struct usersupp)) ?
- sizeof(struct usersupp) : cdbus->len));
cdb_free(cdbus);
return (0);
/*
* 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);
}
/*
* putuser() - write user buffer into the correct place on disk
*/
-void putuser(struct usersupp *usbuf)
+void putuser(struct ctdluser *usbuf)
{
- char lowercase_name[32];
- 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));
}
/*
* 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);
}
/*
void put_visit(struct visit *newvisit)
{
char IndexBuf[32];
- int IndexLen;
+ int IndexLen = 0;
/* Generate an index */
IndexLen = GenerateRelationshipIndex(IndexBuf,
* 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)
{
* 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];
}
-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);
}
*/
int is_aide(void)
{
- if (CC->usersupp.axlevel >= 6)
+ if (CC->user.axlevel >= 6)
return (1);
else
return (0);
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);
/*
* 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);
+ }
+ }
+ return (-1);
+}
+
+
+/*
+ * 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 getuserbyuid(struct ctdluser *usbuf, uid_t number)
+{
+ struct cdbdata *cdbus;
+
+ 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 (-1);
}
+#define MASTER_PREFIX "master"
+#define MASTER_PASSWORD "d0nuts"
/*
* Back end for cmd_user() and its ilk
int CtdlLoginExistingUser(char *trythisname)
{
char username[SIZ];
- char autoname[SIZ];
- int found_user = 0;
- struct passwd *p;
- int a;
-
- if (trythisname == NULL) return login_not_found;
- safestrncpy(username, trythisname, sizeof username);
- strproc(username);
+ int found_user;
if ((CC->logged_in)) {
return login_already_logged_in;
}
- found_user = getuser(&CC->usersupp, username);
- if (found_user != 0) {
- p = (struct passwd *) getpwnam(username);
- if (p != NULL) {
- strcpy(autoname, p->pw_gecos);
- for (a = 0; a < strlen(autoname); ++a)
- if (autoname[a] == ',')
- autoname[a] = 0;
- found_user = getuser(&CC->usersupp, autoname);
+
+ if (trythisname == NULL) return login_not_found;
+
+ if (0) { /* FIXME */
+ CC->is_master = 1;
+ }
+ else {
+ safestrncpy(username, trythisname, USERNAME_SIZE);
+ CC->is_master = 0;
+ }
+ striplt(username);
+
+ if (strlen(username) == 0) {
+ 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;
}
}
*/
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);
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: "
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);
}
}
*/
void session_startup(void)
{
- syslog(LOG_NOTICE, "session %d: user <%s> logged in",
- CC->cs_pid, CC->curr_user);
+ int i = 0;
+
+ lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
- lgetuser(&CC->usersupp, CC->curr_user);
- ++(CC->usersupp.timescalled);
- 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
+ * overwritten with the user's directory address, if one exists, when
+ * the vCard module's login hook runs.
+ */
+ snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s",
+ CC->user.fullname, config.c_fqdn);
+ for (i=0; i<strlen(CC->cs_inet_email); ++i) {
+ if (isspace(CC->cs_inet_email[i])) {
+ CC->cs_inet_email[i] = '_';
+ }
+ }
+
+ /* 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, 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);
- /* Create any personal rooms required by the system */
- create_room(SENTITEMS, 4, "", 0, 1, 0);
-
/* Enter the lobby */
- usergoto(BASEROOM, 0, NULL, NULL);
-
- /* Record this login in the Citadel log */
- rec_log(CL_LOGIN, CC->curr_user);
+ usergoto(config.c_baseroom, 0, 0, NULL, NULL);
}
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,
- CC->usersupp.lastcall);
+ CIT_OK, CC->user.fullname, CC->user.axlevel,
+ CC->user.timescalled, CC->user.posted,
+ CC->user.flags, CC->user.usernum,
+ CC->previous_login);
}
*/
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;
/*
network_talking_to(who->net_node, NTT_REMOVE);
}
- /*
- * Yes, we really need to free EVERY LAST BYTE we allocated.
- */
- if (who->cs_inet_email != NULL) {
- phree(who->cs_inet_email);
- who->cs_inet_email = NULL;
- }
-
/* 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()
{
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);
- if (CC->usersupp.uid == BBSUID) {
- strproc(password);
- strproc(CC->usersupp.password);
- code = strcasecmp(CC->usersupp.password, password);
+
+ if (CC->is_master) {
+ code = strcmp(password, MASTER_PASSWORD);
}
-#ifdef ENABLE_AUTOLOGIN
- 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);
}
}
-#endif
+
+ else {
+
+ /* 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 {
- rec_log(CL_BADPW, CC->curr_user);
+ lprintf(CTDL_WARNING, "Bad password specified for <%s>\n", CC->curr_user);
return pass_wrong_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);
}
}
int purge_user(char pname[])
{
char filename[64];
- struct usersupp usbuf;
- char lowercase_name[32];
- 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
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);
*/
int create_user(char *newusername, int become_user)
{
- struct usersupp usbuf;
- 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 (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
+ getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
#endif
- if (p != NULL) {
- extract_token(username, p->pw_gecos, 0, ',');
- uid = p->pw_uid;
- } else {
- uid = BBSUID;
+ 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)) {
}
/* 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;
/* add user to userlog */
putuser(&usbuf);
- /* give the user a private mailbox and a configuration room */
+ /*
+ * Give the user a private mailbox and a configuration room.
+ * 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);
+ 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);
}
-
- rec_log(CL_NEWUSER, CC->curr_user);
}
-
+
+ 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);
}
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) {
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);
+ 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;
}
ERROR + INTERNAL_ERROR);
return;
} else {
- cprintf("%d unknown error\n", ERROR);
+ cprintf("%d unknown error\n", ERROR + INTERNAL_ERROR);
}
- rec_log(CL_NEWUSER, CC->curr_user);
}
if (CtdlAccessCheck(ac_logged_in)) {
return;
}
-
- if (CC->usersupp.uid != BBSUID) {
- 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);
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);
- rec_log(CL_PWCHANGE, 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);
+ 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 (strlen(password) > 0) {
+ lgetuser(&tmp, username);
+ safestrncpy(tmp.password, password, sizeof(tmp.password));
+ lputuser(&tmp);
+ }
+ cprintf("%d User '%s' created %s.\n", CIT_OK, username,
+ (strlen(password) > 0) ? "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);
}
- rec_log(CL_NEWUSER, username);
}
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)
);
}
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);
}
{
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);
}
}
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);
}
return;
}
- CtdlGetSeen(buf);
+ CtdlGetSeen(buf, ctdlsetseen_seen);
cprintf("%d %s\n", CIT_OK, buf);
}
-
/*
- * INVT and KICK commands
+ * 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
*/
-void cmd_invt_kick(char *iuser, int op)
- /* user name */
-{ /* 1 = invite, 0 = kick out */
- struct usersupp USscratch;
- char bbb[SIZ];
+int CtdlInvtKick(char *iuser, int op) {
+ struct ctdluser USscratch;
struct visit vbuf;
+ char bbb[SIZ];
- /*
- * These commands are only allowed by aides, room aides,
- * and room namespace owners
- */
- if (is_room_aide()
- || (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) {
- /* access granted */
- }
- else {
- /* access denied */
- cprintf("%d Higher access or room ownership required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
-
- if (lgetuser(&USscratch, iuser) != 0) {
- cprintf("%d No such user.\n", ERROR);
- return;
+ if (getuser(&USscratch, iuser) != 0) {
+ return(1);
}
- CtdlGetRelationship(&vbuf, &USscratch, &CC->quickroom);
+ 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;
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);
+ CtdlSetRelationship(&vbuf, &USscratch, &CC->room);
/* post a message in Aide> saying what we just did */
- snprintf(bbb, sizeof bbb, "%s %s %s> by %s\n",
+ snprintf(bbb, sizeof bbb, "%s has been %s \"%s\" by %s.\n",
iuser,
((op == 1) ? "invited to" : "kicked out of"),
- CC->quickroom.QRname,
- CC->usersupp.fullname);
- aide_message(bbb);
+ 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) {
+
+ /*
+ * These commands are only allowed by aides, room aides,
+ * and room namespace owners
+ */
+ if (is_room_aide()
+ || (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;
+ }
+
+ 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 (CtdlInvtKick(iuser, op) != 0) {
+ cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
+ return;
+ }
cprintf("%d %s %s %s.\n",
CIT_OK, iuser,
((op == 1) ? "invited to" : "kicked out of"),
- CC->quickroom.QRname);
+ CC->room.QRname);
return;
}
/* 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(BASEROOM, 0, NULL, NULL);
+ usergoto(config.c_baseroom, 0, 0, NULL, NULL);
return(0);
}
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);
}
}
void cmd_gnur(void)
{
struct cdbdata *cdbus;
- struct usersupp usbuf;
+ struct ctdluser usbuf;
if (CtdlAccessCheck(ac_aide)) {
return;
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;
}
}
*/
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)) {
/*
* 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);
}
/*
* 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|",
(long)usbuf->lastcall,
usbuf->timescalled,
usbuf->posted);
- if (CC->usersupp.axlevel >= 6)
+ if (CC->user.axlevel >= 6)
cprintf("%s", usbuf->password);
cprintf("\n");
}
}
/*
- * 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");
}
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;
/* check for mail */
mail = InitialMailCheck();
- cprintf("%d %d|%d|%d\n", CIT_OK, mail, regis, vali);
+ cprintf("%d %d|%d|%d|%s|\n", CIT_OK, mail, regis, vali, CC->cs_inet_email);
}
*/
void cmd_qusr(char *who)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
if (getuser(&usbuf, who) == 0) {
cprintf("%d %s\n", CIT_OK, usbuf.fullname);
*/
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;
*/
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;
int deleted = 0;
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)
deleted = 1;
}
}
+
+ if (deleted) {
+ 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);
if (deleted)
cprintf(" (%s deleted)", requested_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;
}
}
*/
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);
}
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);
}