#include <fcntl.h>
#include <signal.h>
#include <pwd.h>
+#include <ctype.h>
#include <sys/types.h>
#include <sys/wait.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"
* getuser() - retrieve named user into supplied buffer.
* returns 0 on success
*/
-int getuser(struct usersupp *usbuf, char name[])
+int getuser(struct ctdluser *usbuf, char name[])
{
- char lowercase_name[32];
+ char lowercase_name[USERNAME_SIZE];
+ char sysuser_name[USERNAME_SIZE];
int a;
struct cdbdata *cdbus;
+ int using_sysuser = 0;
- memset(usbuf, 0, sizeof(struct usersupp));
- for (a = 0; a <= strlen(name); ++a) {
- if (a < sizeof(lowercase_name))
- lowercase_name[a] = tolower(name[a]);
+ memset(usbuf, 0, sizeof(struct ctdluser));
+
+#ifdef ENABLE_AUTOLOGIN
+ if (CtdlAssociateSystemUser(sysuser_name, name) == 0) {
+ ++using_sysuser;
+ }
+#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;
- cdbus = cdb_fetch(CDB_USERSUPP, lowercase_name, strlen(lowercase_name));
- if (cdbus == NULL) {
- return (1); /* user not found */
+ cdbus = cdb_fetch(CDB_USERS, 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));
+ ((cdbus->len > sizeof(struct ctdluser)) ?
+ sizeof(struct ctdluser) : cdbus->len));
cdb_free(cdbus);
- if (usbuf->version < 573) {
- CC->usersupp.moderation_filter = config.c_default_filter;
- }
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];
+ char lowercase_name[USERNAME_SIZE];
int a;
for (a = 0; a <= strlen(usbuf->fullname); ++a) {
lowercase_name[sizeof(lowercase_name) - 1] = 0;
usbuf->version = REV_LEVEL;
- cdb_store(CDB_USERSUPP,
+ cdb_store(CDB_USERS,
lowercase_name, strlen(lowercase_name),
- usbuf, sizeof(struct usersupp));
+ 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);
}
/*
* 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];
sizeof(struct visit) : cdbvisit->len));
cdb_free(cdbvisit);
}
+ else {
+ /* If this is the first time the user has seen this room,
+ * set the view to be the default for the room.
+ */
+ vbuf->v_view = rel_room->QRdefaultview;
+ }
/* Set v_seen if necessary */
if (vbuf->v_seen[0] == 0) {
- sprintf(vbuf->v_seen, "*:%ld", vbuf->v_lastseen);
+ snprintf(vbuf->v_seen, sizeof vbuf->v_seen, "*:%ld", vbuf->v_lastseen);
}
}
-void MailboxName(char *buf, struct usersupp *who, char *prefix)
+void MailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix)
{
- sprintf(buf, "%010ld.%s", who->usernum, 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);
* WARNING: don't use this function unless you absolutely have to. It does
* 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);
}
}
}
+/*
+ * 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.
+ */
+int CtdlAssociateSystemUser(char *screenname, char *loginname) {
+ struct passwd *p;
+ int a;
+
+ 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;
+ }
+ }
+ return(0);
+ }
+ return(1);
+}
+
+
+
/*
* 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;
+ int found_user;
if (trythisname == NULL) return login_not_found;
safestrncpy(username, trythisname, sizeof username);
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);
- }
- }
+
+ found_user = getuser(&CC->user, username);
+
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);
+ strcpy(CC->curr_user, CC->user.fullname);
return login_ok;
}
}
*/
void session_startup(void)
{
+ int i;
+
syslog(LOG_NOTICE, "session %d: user <%s> logged in",
CC->cs_pid, 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->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] = '_';
+ }
}
- lputuser(&CC->usersupp);
+
+ /* 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);
/* 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);
-
/* 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",
- 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);
}
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);
}
}
close(pipev[0]);
- write(pipev[1], buf, sprintf(buf, "%lu\n", (unsigned long) uid));
+ 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]);
lprintf(5, "CtdlTryPassword: no user selected\n");
return pass_no_user;
}
- if (getuser(&CC->usersupp, CC->curr_user)) {
+ if (getuser(&CC->user, CC->curr_user)) {
lprintf(5, "CtdlTryPassword: internal error\n");
return pass_internal_error;
}
return pass_wrong_password;
}
code = (-1);
- if (CC->usersupp.uid == BBSUID) {
+
+
+#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->user.uid == BBSUID) || (CC->user.uid == (-1)) ) {
strproc(password);
- strproc(CC->usersupp.password);
- code = strcasecmp(CC->usersupp.password, password);
+ strproc(CC->user.password);
+ code = strcasecmp(CC->user.password, password);
}
-#ifdef ENABLE_AUTOLOGIN
+ /* Any other uid means we have to check the system password database */
else {
- if (validpw(CC->usersupp.uid, password)) {
+ 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);
+ lgetuser(&CC->user, CC->curr_user);
+ safestrncpy(CC->user.password, password,
+ sizeof CC->user.password);
+ lputuser(&CC->user);
}
}
-#endif
+
+#else /* ENABLE_AUTOLOGIN */
+ strproc(password);
+ strproc(CC->user.password);
+ code = strcasecmp(CC->user.password, password);
+
+#endif /* ENABLE_AUTOLOGIN */
if (!code) {
do_login();
return pass_ok;
} else {
- rec_log(CL_BADPW, CC->curr_user);
+ lprintf(3, "Bad password specified for <%s>\n", CC->curr_user);
return pass_wrong_password;
}
}
int purge_user(char pname[])
{
char filename[64];
- struct usersupp usbuf;
- char lowercase_name[32];
+ struct ctdluser usbuf;
+ char lowercase_name[USERNAME_SIZE];
int a;
struct CitContext *ccptr;
int user_is_logged_in = 0;
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;
}
}
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, lowercase_name, strlen(lowercase_name));
/* remove the user's bio file */
- sprintf(filename, "./bio/%ld", usbuf.usernum);
+ snprintf(filename, sizeof filename, "./bio/%ld", usbuf.usernum);
unlink(filename);
/* remove the user's picture */
- sprintf(filename, "./userpics/%ld.gif", usbuf.usernum);
+ snprintf(filename, sizeof filename, "./userpics/%ld.gif", usbuf.usernum);
unlink(filename);
return (0);
*/
int create_user(char *newusername, int become_user)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
+ struct ctdlroom qrbuf;
struct passwd *p = NULL;
char username[SIZ];
char mailboxname[ROOMNAMELEN];
#ifdef ENABLE_AUTOLOGIN
p = (struct passwd *) getpwnam(username);
-#endif
if (p != NULL) {
extract_token(username, p->pw_gecos, 0, ',');
uid = p->pw_uid;
} else {
- uid = BBSUID;
+ uid = (-1);
}
+#else
+ uid = (-1);
+#endif
if (!getuser(&usbuf, username)) {
return (ERROR + ALREADY_EXISTS);
}
/* Go ahead and initialize a new user record */
- memset(&usbuf, 0, sizeof(struct usersupp));
+ memset(&usbuf, 0, sizeof(struct ctdluser));
strcpy(usbuf.fullname, username);
strcpy(usbuf.password, "");
usbuf.uid = uid;
usbuf.USscreenwidth = 80;
usbuf.USscreenheight = 24;
usbuf.lastcall = time(NULL);
- usbuf.moderation_filter = config.c_default_filter;
/* fetch a new user number */
usbuf.usernum = get_new_user_number();
/* add user to userlog */
putuser(&usbuf);
- /* give the user a private mailbox */
- MailboxName(mailboxname, &usbuf, MAILROOM);
- create_room(mailboxname, 5, "", 0, 1);
-
- /*** Everything below this line can be bypassed if we are administratively
- creating a user, instead of doing self-service account creation
- ***/
+ /*
+ * 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);
+
+ MailboxName(mailboxname, sizeof mailboxname, &usbuf, USERCONFIGROOM);
+ create_room(mailboxname, 5, "", 0, 1, 1);
+ if (lgetroom(&qrbuf, mailboxname) == 0) {
+ qrbuf.QRflags2 |= QR2_SYSTEM;
+ lputroom(&qrbuf);
+ }
+
+ /* Everything below this line can be bypassed if administratively
+ 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));
+ memcpy(&CC->user, &usbuf, sizeof(struct ctdluser));
strcpy(CC->curr_user, username);
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);
}
+ lprintf(3, "New user <%s> created\n", username);
return (0);
}
} else {
cprintf("%d unknown error\n", ERROR);
}
- rec_log(CL_NEWUSER, CC->curr_user);
}
if (CtdlAccessCheck(ac_logged_in)) {
return;
}
-
- if (CC->usersupp.uid != BBSUID) {
+ if ( (CC->user.uid != BBSUID) && (CC->user.uid != (-1)) ) {
cprintf("%d Not allowed. Use the 'passwd' command.\n", ERROR);
return;
}
strproc(new_pw);
if (strlen(new_pw) == 0) {
- cprintf("%d Password unchanged.\n", OK);
+ cprintf("%d Password unchanged.\n", CIT_OK);
return;
}
- lgetuser(&CC->usersupp, CC->curr_user);
- strcpy(CC->usersupp.password, new_pw);
- lputuser(&CC->usersupp);
- cprintf("%d Password changed.\n", OK);
- rec_log(CL_PWCHANGE, CC->curr_user);
+ lgetuser(&CC->user, CC->curr_user);
+ strcpy(CC->user.password, new_pw);
+ lputuser(&CC->user);
+ cprintf("%d Password changed.\n", CIT_OK);
+ lprintf(3, "Password changed for user <%s>\n", CC->curr_user);
PerformSessionHooks(EVT_SETPASS);
}
a = create_user(username, 0);
if (a == 0) {
- cprintf("%d ok\n", OK);
+ cprintf("%d ok\n", CIT_OK);
return;
} else if (a == ERROR + ALREADY_EXISTS) {
cprintf("%d '%s' already exists.\n",
} else {
cprintf("%d An error occured creating the user account.\n", ERROR);
}
- rec_log(CL_NEWUSER, username);
}
if (CtdlAccessCheck(ac_logged_in))
return;
- getuser(&CC->usersupp, CC->curr_user);
- cprintf("%d %d|%d|%d|%d\n",
- OK,
- CC->usersupp.USscreenwidth,
- CC->usersupp.USscreenheight,
- (CC->usersupp.flags & US_USER_SET),
- CC->usersupp.moderation_filter
+ getuser(&CC->user, CC->curr_user);
+ cprintf("%d %d|%d|%d|\n",
+ CIT_OK,
+ CC->user.USscreenwidth,
+ CC->user.USscreenheight,
+ (CC->user.flags & US_USER_SET)
);
}
*/
void cmd_setu(char *new_parms)
{
- int new_mod;
-
if (CtdlAccessCheck(ac_logged_in))
return;
cprintf("%d Usage error.\n", ERROR);
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);
- if (num_parms(new_parms) >= 4) {
- new_mod = extract_int(new_parms, 3);
- lprintf(9, "new_mod extracted to %d\n", new_mod);
-
- /* Aides cannot set the filter level lower than -100 */
- if (new_mod < (-100))
- new_mod = -100;
-
- /* Normal users cannot set the filter level lower than -63 */
- if ((new_mod < (-63)) && (CC->usersupp.axlevel < 6))
- new_mod = -63;
-
- /* Nobody can set the filter level higher than +63 */
- if (new_mod > 63)
- new_mod = 63;
-
- CC->usersupp.moderation_filter = new_mod;
- lprintf(9, "new_mod processed to %d\n", new_mod);
- }
- lputuser(&CC->usersupp);
- cprintf("%d Ok\n", OK);
+ lputuser(&CC->user);
+ cprintf("%d Ok\n", CIT_OK);
}
/*
}
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);
vbuf.v_lastseen = newlr;
- sprintf(vbuf.v_seen, "*:%ld", newlr);
- CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+ snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld", newlr);
+ CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
- lputuser(&CC->usersupp);
- cprintf("%d %ld\n", OK, newlr);
+ lputuser(&CC->user);
+ cprintf("%d %ld\n", CIT_OK, newlr);
}
target_setting = extract_int(argbuf, 1);
CtdlSetSeen(target_msgnum, target_setting);
- cprintf("%d OK\n", OK);
+ cprintf("%d OK\n", CIT_OK);
+}
+
+
+void cmd_gtsn(char *argbuf) {
+ char buf[SIZ];
+
+ if (CtdlAccessCheck(ac_logged_in)) {
+ return;
+ }
+
+ CtdlGetSeen(buf);
+ cprintf("%d %s\n", CIT_OK, buf);
}
+
/*
* INVT and KICK commands
*/
void cmd_invt_kick(char *iuser, int op)
/* user name */
{ /* 1 = invite, 0 = kick out */
- struct usersupp USscratch;
+ struct ctdluser USscratch;
char bbb[SIZ];
struct visit vbuf;
- if (CtdlAccessCheck(ac_room_aide))
+ /*
+ * 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 (lgetuser(&USscratch, iuser) != 0) {
cprintf("%d No such user.\n", ERROR);
return;
}
- 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_FORGET | V_LOCKOUT;
}
- CtdlSetRelationship(&vbuf, &USscratch, &CC->quickroom);
+ CtdlSetRelationship(&vbuf, &USscratch, &CC->room);
lputuser(&USscratch);
/* post a message in Aide> saying what we just did */
- sprintf(bbb, "%s %s %s> by %s\n",
+ snprintf(bbb, sizeof bbb, "%s %s %s> by %s\n",
iuser,
((op == 1) ? "invited to" : "kicked out of"),
- CC->quickroom.QRname,
- CC->usersupp.fullname);
+ CC->room.QRname,
+ CC->user.fullname);
aide_message(bbb);
cprintf("%d %s %s %s.\n",
- OK, iuser,
+ 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);
}
}
if (CtdlForgetThisRoom() == 0) {
- cprintf("%d Ok\n", OK);
+ cprintf("%d Ok\n", CIT_OK);
}
else {
cprintf("%d You may not forget this room.\n", ERROR);
void cmd_gnur(void)
{
struct cdbdata *cdbus;
- struct usersupp usbuf;
+ struct ctdluser usbuf;
if (CtdlAccessCheck(ac_aide)) {
return;
}
if ((CitControl.MMflags & MM_VALID) == 0) {
- cprintf("%d There are no unvalidated users.\n", OK);
+ cprintf("%d There are no unvalidated users.\n", CIT_OK);
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;
}
}
CitControl.MMflags = CitControl.MMflags & (~MM_VALID);
put_control();
end_critical_section(S_CONTROL);
- cprintf("%d *** End of registration.\n", OK);
+ cprintf("%d *** End of registration.\n", CIT_OK);
}
{
char user[SIZ];
int newax;
- struct usersupp userbuf;
+ struct ctdluser userbuf;
extract(user, v_args, 0);
newax = extract_int(v_args, 1);
/* If the access level was set to zero, delete the user */
if (newax == 0) {
if (purge_user(user) == 0) {
- cprintf("%d %s Deleted.\n", OK, userbuf.fullname);
+ cprintf("%d %s Deleted.\n", CIT_OK, userbuf.fullname);
return;
}
}
- cprintf("%d User '%s' validated.\n", OK, userbuf.fullname);
+ cprintf("%d User '%s' validated.\n", CIT_OK, userbuf.fullname);
}
/*
* 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)
{
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");
}
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 = NewMailCount();
+ mail = InitialMailCheck();
- cprintf("%d %d|%d|%d\n", 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", OK, usbuf.fullname);
+ cprintf("%d %s\n", CIT_OK, usbuf.fullname);
} else {
cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
}
*/
void cmd_agup(char *cmdbuf)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
char requested_user[SIZ];
if (CtdlAccessCheck(ac_aide)) {
return;
}
cprintf("%d %s|%s|%u|%ld|%ld|%d|%ld|%ld|%d\n",
- OK,
+ CIT_OK,
usbuf.fullname,
usbuf.password,
usbuf.flags,
*/
void cmd_asup(char *cmdbuf)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
char requested_user[SIZ];
+ char notify[SIZ];
int np;
int newax;
int deleted = 0;
deleted = 1;
}
}
- cprintf("%d Ok", OK);
+
+ if (deleted) {
+ sprintf(notify, "User <%s> deleted by %s\n",
+ usbuf.fullname, CC->user.fullname);
+ aide_message(notify);
+ }
+
+ cprintf("%d Ok", CIT_OK);
if (deleted)
cprintf(" (%s deleted)", requested_user);
cprintf("\n");
}
+
+/*
+ * Check to see if the user who we just sent mail to is logged in. If yes,
+ * bump the 'new mail' counter for their session. That enables them to
+ * receive a new mail notification without having to hit the database.
+ */
+void BumpNewMailCounter(long which_user) {
+ struct CitContext *ptr;
+
+ begin_critical_section(S_SESSION_TABLE);
+
+ for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
+ if (ptr->user.usernum == which_user) {
+ ptr->newmail += 1;
+ }
+ }
+
+ end_critical_section(S_SESSION_TABLE);
+}
+
+
/*
* Count the number of new mail messages the user has
*/
int NewMailCount()
{
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, &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);
+ num_newmsgs = CC->newmail;
+ CC->newmail = 0;
return (num_newmsgs);
}
+
+
+/*
+ * Count the number of new mail messages the user has
+ */
+int InitialMailCheck()
+{
+ 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 = 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);
+}
+
+
+
+/*
+ * Set the preferred view for the current user/room combination
+ */
+void cmd_view(char *cmdbuf) {
+ int requested_view;
+ struct visit vbuf;
+
+ if (CtdlAccessCheck(ac_logged_in)) {
+ return;
+ }
+
+ requested_view = extract_int(cmdbuf, 0);
+
+ CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
+ vbuf.v_view = requested_view;
+ CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
+
+ cprintf("%d ok\n", CIT_OK);
+}
projects / citadel.git / blobdiff