*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <errno.h>
#include <stdlib.h>
#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>
#include <string.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"
#include "control.h"
#include "msgbase.h"
#include "config.h"
-#include "tools.h"
#include "citserver.h"
+#include "citadel_dirs.h"
+#include "genstamp.h"
+#include "threads.h"
+#include "citadel_ldap.h"
+
+#include "ctdl_module.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)
+ * (it's just the username converted into lower case)
*/
-static INLINE void makeuserkey(char *key, char *username) {
+INLINE void makeuserkey(char *key, char *username) {
int i, len;
len = strlen(username);
+ if (len >= USERNAME_SIZE)
+ {
+ CtdlLogPrintf (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 ctdluser *usbuf, char name[])
{
char usernamekey[USERNAME_SIZE];
- char sysuser_name[USERNAME_SIZE];
struct cdbdata *cdbus;
- int using_sysuser = 0;
-
- memset(usbuf, 0, sizeof(struct ctdluser));
-
-#ifdef ENABLE_AUTOLOGIN
- if (CtdlAssociateSystemUser(sysuser_name, name) == 0) {
- ++using_sysuser;
- }
-#endif
- if (using_sysuser) {
- makeuserkey(usernamekey, sysuser_name);
- }
- else {
- makeuserkey(usernamekey, name);
+ if (usbuf != NULL) {
+ memset(usbuf, 0, sizeof(struct ctdluser));
}
+ makeuserkey(usernamekey, name);
cdbus = cdb_fetch(CDB_USERS, usernamekey, strlen(usernamekey));
+
if (cdbus == NULL) { /* user not found */
return(1);
}
- memcpy(usbuf, cdbus->ptr,
- ((cdbus->len > sizeof(struct ctdluser)) ?
- sizeof(struct ctdluser) : cdbus->len));
+ if (usbuf != NULL) {
+ memcpy(usbuf, cdbus->ptr,
+ ((cdbus->len > sizeof(struct ctdluser)) ?
+ sizeof(struct ctdluser) : cdbus->len));
+ }
cdb_free(cdbus);
return (0);
end_critical_section(S_USERS);
}
+
+/*
+ * rename_user() - this is tricky because the user's display name is the database key
+ *
+ * Returns 0 on success or nonzero if there was an error...
+ *
+ */
+int rename_user(char *oldname, char *newname) {
+ struct CitContext *cptr;
+ int retcode = RENAMEUSER_OK;
+ struct ctdluser usbuf;
+
+ char oldnamekey[USERNAME_SIZE];
+ char newnamekey[USERNAME_SIZE];
+
+ /* We cannot rename a user who is currently logged in */
+ for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
+ if (!strcasecmp(cptr->user.fullname, oldname)) {
+ return(RENAMEUSER_LOGGED_IN);
+ }
+ }
+
+ /* Create the database keys... */
+ makeuserkey(oldnamekey, oldname);
+ makeuserkey(newnamekey, newname);
+
+ /* Lock up and get going */
+ begin_critical_section(S_USERS);
+
+ if (getuser(&usbuf, newname) == 0) {
+ retcode = RENAMEUSER_ALREADY_EXISTS;
+ }
+ else {
+
+ if (getuser(&usbuf, oldname) != 0) {
+ retcode = RENAMEUSER_NOT_FOUND;
+ }
+
+ else { /* Sanity checks succeeded. Now rename the user. */
+ if (usbuf.usernum == 0)
+ {
+ CtdlLogPrintf (CTDL_DEBUG, "Can not rename user \"Citadel\".\n");
+ retcode = RENAMEUSER_NOT_FOUND;
+ } else {
+ CtdlLogPrintf(CTDL_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname);
+ cdb_delete(CDB_USERS, oldnamekey, strlen(oldnamekey));
+ safestrncpy(usbuf.fullname, newname, sizeof usbuf.fullname);
+ putuser(&usbuf);
+ cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long),
+ usbuf.fullname, strlen(usbuf.fullname)+1 );
+
+ retcode = RENAMEUSER_OK;
+ }
+ }
+
+ }
+
+ end_critical_section(S_USERS);
+ return(retcode);
+}
+
+
+
/*
* Index-generating function used by Ctdl[Get|Set]Relationship
*/
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,
}
/*
- * getuserbynumber() - get user by number
- * returns 0 if user was found
+ * getuserbynumber() - get user by number
+ * returns 0 if user was found
+ *
+ * Note: fetching a user this way requires one additional database operation.
+ */
+int getuserbynumber(struct ctdluser *usbuf, long number)
+{
+ struct cdbdata *cdbun;
+ int r;
+
+ cdbun = cdb_fetch(CDB_USERSBYNUMBER, &number, sizeof(long));
+ if (cdbun == NULL) {
+ CtdlLogPrintf(CTDL_INFO, "User %ld not found\n", number);
+ return(-1);
+ }
+
+ CtdlLogPrintf(CTDL_INFO, "User %ld maps to %s\n", number, cdbun->ptr);
+ r = getuser(usbuf, cdbun->ptr);
+ cdb_free(cdbun);
+ return(r);
+}
+
+
+
+/*
+ * Helper function for rebuild_usersbynumber()
+ */
+void rebuild_ubn_for_user(struct ctdluser *usbuf, void *data) {
+
+ struct ubnlist {
+ struct ubnlist *next;
+ char username[USERNAME_SIZE];
+ long usernum;
+ };
+
+ static struct ubnlist *u = NULL;
+ struct ubnlist *ptr = NULL;
+
+ /* Lazy programming here. Call this function as a ForEachUser backend
+ * in order to queue up the room names, or call it with a null user
+ * to make it do the processing.
+ */
+ if (usbuf != NULL) {
+ ptr = (struct ubnlist *) malloc(sizeof (struct ubnlist));
+ if (ptr == NULL) return;
+
+ ptr->usernum = usbuf->usernum;
+ safestrncpy(ptr->username, usbuf->fullname, sizeof ptr->username);
+ ptr->next = u;
+ u = ptr;
+ return;
+ }
+
+ while (u != NULL) {
+ CtdlLogPrintf(CTDL_DEBUG, "Rebuilding usersbynumber index %10ld : %s\n",
+ u->usernum, u->username);
+ cdb_store(CDB_USERSBYNUMBER, &u->usernum, sizeof(long), u->username, strlen(u->username)+1);
+
+ ptr = u;
+ u = u->next;
+ free(ptr);
+ }
+}
+
+
+
+/*
+ * Rebuild the users-by-number index
+ */
+void rebuild_usersbynumber(void) {
+ cdb_trunc(CDB_USERSBYNUMBER); /* delete the old indices */
+ ForEachUser(rebuild_ubn_for_user, NULL); /* enumerate the users */
+ rebuild_ubn_for_user(NULL, NULL); /* and index them */
+}
+
+
+
+/*
+ * 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.
+ * a sequential search and therefore is computationally expensive.
*/
-int getuserbynumber(struct ctdluser *usbuf, long int number)
+int getuserbyuid(struct ctdluser *usbuf, uid_t number)
{
struct cdbdata *cdbus;
((cdbus->len > sizeof(struct ctdluser)) ?
sizeof(struct ctdluser) : cdbus->len));
cdb_free(cdbus);
- if (usbuf->usernum == number) {
+ if (usbuf->uid == number) {
cdb_close_cursor(CDB_USERS);
return (0);
}
return (-1);
}
-
-/*
- * 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
+ *
+ * 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;
- struct recptypes *valid = NULL;
- struct passwd *p = NULL;
- if (trythisname == NULL) return login_not_found;
- safestrncpy(username, trythisname, sizeof username);
- strproc(username);
+ CtdlLogPrintf(9, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname);
if ((CC->logged_in)) {
return login_already_logged_in;
}
- /* First, try to log in as if the supplied name is a display name */
- found_user = getuser(&CC->user, username);
+ if (trythisname == NULL) return login_not_found;
+
+ if (!strncasecmp(trythisname, "SYS_", 4))
+ {
+ CtdlLogPrintf(CTDL_DEBUG, "System user \"%s\" is not allowed to log in.\n", trythisname);
+ return login_not_found;
+ }
- /* 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(trythisname);
- if (valid != NULL) {
- if (valid->num_local == 1) {
- found_user = getuser(&CC->user,
- valid->recp_local);
- }
- phree(valid);
+ /* 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;
}
}
-#ifdef ENABLE_AUTOLOGIN
- /* If we haven't found the account yet, and the supplied name
- * is a login name on the underlying host system, create the
- * account.
- */
- if (found_user != 0) {
- p = (struct passwd *) getpwnam(username);
- if (p != NULL) {
+ /* Continue attempting user validation... */
+ safestrncpy(username, trythisname, USERNAME_SIZE);
+ striplt(username);
+
+ if (IsEmptyStr(username)) {
+ return login_not_found;
+ }
+
+ if (config.c_auth_mode == AUTHMODE_HOST) {
+
+ /* host auth mode */
+
+ struct passwd pd;
+ struct passwd *tempPwdPtr;
+ char pwdbuffer[256];
+
+ CtdlLogPrintf(CTDL_DEBUG, "asking host about <%s>\n", username);
+#ifdef HAVE_GETPWNAM_R
+#ifdef SOLARIS_GETPWUID
+ CtdlLogPrintf(CTDL_DEBUG, "Calling getpwnam_r()\n");
+ tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
+#else // SOLARIS_GETPWUID
+ CtdlLogPrintf(CTDL_DEBUG, "Calling getpwnam_r()\n");
+ getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWNAM_R
+ CtdlLogPrintf(CTDL_DEBUG, "SHOULD NEVER GET HERE!!!\n");
+ tempPwdPtr = NULL;
+#endif // HAVE_GETPWNAM_R
+ if (tempPwdPtr == NULL) {
+ CtdlLogPrintf(CTDL_DEBUG, "no such user <%s>\n", username);
+ return login_not_found;
+ }
+
+ /* Locate the associated Citadel account.
+ * If not found, make one attempt to create it.
+ */
+ found_user = getuserbyuid(&CC->user, pd.pw_uid);
+ CtdlLogPrintf(CTDL_DEBUG, "found it: uid=%ld, gecos=%s here: %d\n",
+ (long)pd.pw_uid, pd.pw_gecos, found_user);
+ if (found_user != 0) {
create_user(username, 0);
- found_user = getuser(&CC->user, username);
+ found_user = getuserbyuid(&CC->user, pd.pw_uid);
+ }
+
+ }
+
+#ifdef HAVE_LDAP
+ else if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+
+ /* LDAP auth mode */
+
+ uid_t ldap_uid;
+ char ldap_cn[256];
+ char ldap_dn[256];
+
+ found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid);
+ if (found_user != 0) {
+ return login_not_found;
+ }
+
+ found_user = getuserbyuid(&CC->user, ldap_uid);
+ if (found_user != 0) {
+ create_user(trythisname, 0);
+ found_user = getuserbyuid(&CC->user, ldap_uid);
+ }
+
+ if (found_user == 0) {
+ if (CC->ldap_dn != NULL) free(CC->ldap_dn);
+ CC->ldap_dn = strdup(ldap_dn);
+ }
+
+ }
+#endif
+
+ 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, NULL, 0);
+ if (valid != NULL) {
+ if (valid->num_local == 1) {
+ found_user = getuser(&CC->user, valid->recp_local);
+ }
+ free_recipients(valid);
+ }
}
}
-#endif /* ENABLE_AUTOLOGIN */
/* Did we find something? */
if (found_user == 0) {
*/
void cmd_user(char *cmdbuf)
{
- char username[SIZ];
+ char username[256];
int a;
- extract(username, cmdbuf, 0);
+ 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 + ALREADY_LOGGED_IN);
case login_not_found:
cprintf("%d %s not found.\n", ERROR + NO_SUCH_USER, username);
return;
+ default:
cprintf("%d Internal error\n", ERROR + INTERNAL_ERROR);
}
}
/*
* session startup code which is common to both cmd_pass() and cmd_newu()
*/
-void session_startup(void)
+void do_login(void)
{
- int i;
-
- lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
+ CC->logged_in = 1;
+ CtdlLogPrintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
lgetuser(&CC->user, CC->curr_user);
++(CC->user.timescalled);
if (!strcasecmp(CC->user.fullname, config.c_sysadm)) {
CC->user.axlevel = 6;
}
+
+ /* If we're authenticating off the host system, automatically give
+ * root the highest level of access.
+ */
+ if (config.c_auth_mode == AUTHMODE_HOST) {
+ if (CC->user.uid == 0) {
+ CC->user.axlevel = 6;
+ }
+ }
+
lputuser(&CC->user);
/*
*/
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] = '_';
- }
- }
+ convert_spaces_to_underscores(CC->cs_inet_email);
/* 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);
/*
* misc things to be taken care of when a user is logged out
*/
-void logout(struct CitContext *who)
+void logout(void)
{
- /*
- * 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_postname, "");
- strcpy(who->fake_hostname, "");
- strcpy(who->fake_roomname, "");
- who->logged_in = 0;
-
+ struct CitContext *CCC = CC; /* CachedCitContext - performance boost */
/*
* If there is a download in progress, abort it.
*/
- if (who->download_fp != NULL) {
- fclose(who->download_fp);
- who->download_fp = NULL;
+ if (CCC->download_fp != NULL) {
+ fclose(CCC->download_fp);
+ CCC->download_fp = NULL;
}
/*
* If there is an upload in progress, abort it.
*/
- if (who->upload_fp != NULL) {
- abort_upl(who);
+ if (CCC->upload_fp != NULL) {
+ abort_upl(CCC);
}
/*
* If we were talking to a network node, we're not anymore...
*/
- if (strlen(who->net_node) > 0) {
- network_talking_to(who->net_node, NTT_REMOVE);
+ if (!IsEmptyStr(CCC->net_node)) {
+ network_talking_to(CCC->net_node, NTT_REMOVE);
}
- /* Do modular stuff... */
+ /* Run any hooks registered by modules... */
PerformSessionHooks(EVT_LOGOUT);
+
+ /*
+ * 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(CCC->fake_username, "");
+ strcpy(CCC->fake_hostname, "");
+ strcpy(CCC->fake_roomname, "");
+ CCC->logged_in = 0;
+
+ /* Check to see if the user was deleted whilst logged in and purge them if necessary */
+ if ((CCC->user.axlevel == 0) && (CCC->user.usernum))
+ purge_user(CCC->user.fullname);
/* Free any output buffers */
- if (who->output_buffer != NULL) {
- unbuffer_output();
- }
+ 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];
+ char buf[256];
- if (pipe(pipev)) {
- lprintf(CTDL_ERR, "pipe failed (%s): denying autologin access for "
- "uid %ld\n", strerror(errno), (long)uid);
+ if (IsEmptyStr(pass)) {
+ CtdlLogPrintf(CTDL_DEBUG, "refusing to check empty password for uid=%d using chkpwd...\n", uid);
return 0;
}
- switch (pid = fork()) {
- case -1:
- lprintf(CTDL_ERR, "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(CTDL_ERR, "waitpid failed (%s): denying autologin "
- "access for uid %ld\n",
- strerror(errno), (long)uid);
- return 0;
- }
- if (WIFEXITED(status) && !WEXITSTATUS(status))
- return 1;
+ CtdlLogPrintf(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)) {
+ CtdlLogPrintf(CTDL_DEBUG, "...pass\n");
+ return(1);
+ }
+ CtdlLogPrintf(CTDL_DEBUG, "...fail\n");
return 0;
}
-#endif
-void do_login()
-{
- (CC->logged_in) = 1;
- session_startup();
+/*
+ * 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;
+
+ CtdlLogPrintf(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) {
+ CtdlLogPrintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ abort();
+ }
+ if (pipe(chkpwd_read_pipe) != 0) {
+ CtdlLogPrintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ abort();
+ }
+
+ chkpwd_pid = fork();
+ if (chkpwd_pid < 0) {
+ CtdlLogPrintf(CTDL_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno));
+ abort();
+ }
+ if (chkpwd_pid == 0) {
+ CtdlLogPrintf(CTDL_DEBUG, "Now calling dup2() write\n");
+ dup2(chkpwd_write_pipe[0], 0);
+ CtdlLogPrintf(CTDL_DEBUG, "Now calling dup2() write\n");
+ dup2(chkpwd_read_pipe[1], 1);
+ CtdlLogPrintf(CTDL_DEBUG, "Now closing stuff\n");
+ for (i=2; i<256; ++i) close(i);
+ CtdlLogPrintf(CTDL_DEBUG, "Now calling execl(%s)\n", file_chkpwd);
+ execl(file_chkpwd, file_chkpwd, NULL);
+ CtdlLogPrintf(CTDL_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno));
+ abort();
+ exit(errno);
+ }
}
int code;
if ((CC->logged_in)) {
- lprintf(CTDL_WARNING, "CtdlTryPassword: already logged in\n");
+ CtdlLogPrintf(CTDL_WARNING, "CtdlTryPassword: already logged in\n");
return pass_already_logged_in;
}
if (!strcmp(CC->curr_user, NLI)) {
- lprintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n");
+ CtdlLogPrintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n");
return pass_no_user;
}
if (getuser(&CC->user, CC->curr_user)) {
- lprintf(CTDL_ERR, "CtdlTryPassword: internal error\n");
+ CtdlLogPrintf(CTDL_ERR, "CtdlTryPassword: internal error\n");
return pass_internal_error;
}
if (password == NULL) {
- lprintf(CTDL_INFO, "CtdlTryPassword: NULL password string supplied\n");
+ CtdlLogPrintf(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->user.uid == BBSUID) || (CC->user.uid == (-1)) ) {
- strproc(password);
- strproc(CC->user.password);
- code = strcasecmp(CC->user.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 {
+
+ else if (config.c_auth_mode == AUTHMODE_HOST) {
+
+ /* host auth mode */
+
if (validpw(CC->user.uid, password)) {
code = 0;
+
+ /*
+ * 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);
+ 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->user.password);
- code = strcasecmp(CC->user.password, password);
+#ifdef HAVE_LDAP
+ else if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+
+ /* LDAP auth mode */
+
+ if ((CC->ldap_dn) && (!CtdlTryPasswordLDAP(CC->ldap_dn, password))) {
+ code = 0;
+ }
+ else {
+ code = (-1);
+ }
+ }
+#endif
+
+ 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(CTDL_WARNING, "Bad password specified for <%s>\n", CC->curr_user);
+ CtdlLogPrintf(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_ok:
logged_in_response();
return;
- cprintf("%d Can't find user record!\n",
- ERROR + INTERNAL_ERROR);
}
}
makeuserkey(usernamekey, pname);
+ /* If the name is empty we can't find them in the DB any way so just return */
+ if (IsEmptyStr(pname))
+ return (ERROR + NO_SUCH_USER);
+
if (getuser(&usbuf, pname) != 0) {
- lprintf(CTDL_ERR, "Cannot purge user <%s> - not found\n", pname);
+ CtdlLogPrintf(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
}
end_critical_section(S_SESSION_TABLE);
if (user_is_logged_in == 1) {
- lprintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
+ CtdlLogPrintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
usbuf.axlevel = 0;
putuser(&usbuf);
return (1);
}
- lprintf(CTDL_NOTICE, "Deleting user <%s>\n", pname);
+ CtdlLogPrintf(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 users-by-number index record */
+ cdb_delete(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long));
+
/* delete the userlog entry */
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 internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid)
+{
+ if (!getuser(usbuf, username)) {
+ return (ERROR + ALREADY_EXISTS);
+ }
+
+ /* Go ahead and initialize a new user record */
+ memset(usbuf, 0, sizeof(struct ctdluser));
+ safestrncpy(usbuf->fullname, username, sizeof usbuf->fullname);
+ strcpy(usbuf->password, "");
+ usbuf->uid = uid;
+
+ /* These are the default flags on new accounts */
+ usbuf->flags = US_LASTOLD | US_DISAPPEAR | US_PAGINATOR | US_FLOORS;
+
+ usbuf->timescalled = 0;
+ usbuf->posted = 0;
+ usbuf->axlevel = config.c_initax;
+ usbuf->USscreenwidth = 80;
+ usbuf->USscreenheight = 24;
+ usbuf->lastcall = time(NULL);
+
+ /* fetch a new user number */
+ usbuf->usernum = get_new_user_number();
+
+ /* add user to the database */
+ putuser(usbuf);
+ cdb_store(CDB_USERSBYNUMBER, &usbuf->usernum, sizeof(long), usbuf->fullname, strlen(usbuf->fullname)+1);
+
+ return 0;
+}
+
+
+
/*
* create_user() - back end processing to create a new user
*
{
struct ctdluser usbuf;
struct ctdlroom qrbuf;
- struct passwd *p = NULL;
- char username[SIZ];
+ char username[256];
char mailboxname[ROOMNAMELEN];
- uid_t uid;
+ char buf[SIZ];
+ int retval;
+ uid_t uid = (-1);
+
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);
- }
-#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 ctdluser));
- safestrncpy(usbuf.fullname, username, sizeof usbuf.fullname);
- strcpy(usbuf.password, "");
- usbuf.uid = uid;
-
- /* These are the default flags on new accounts */
- usbuf.flags = US_LASTOLD | US_DISAPPEAR | US_PAGINATOR | US_FLOORS;
-
- usbuf.timescalled = 0;
- usbuf.posted = 0;
- usbuf.axlevel = config.c_initax;
- usbuf.USscreenwidth = 80;
- usbuf.USscreenheight = 24;
- usbuf.lastcall = time(NULL);
+
+ if (config.c_auth_mode == AUTHMODE_HOST) {
- /* fetch a new user number */
- usbuf.usernum = get_new_user_number();
+ /* host auth mode */
- /* The very first user created on the system will always be an Aide */
- if (usbuf.usernum == 1L) {
- usbuf.axlevel = 6;
+ struct passwd pd;
+ struct passwd *tempPwdPtr;
+ char pwdbuffer[256];
+
+#ifdef HAVE_GETPWNAM_R
+#ifdef SOLARIS_GETPWUID
+ tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer));
+#else // SOLARIS_GETPWUID
+ getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWNAM_R
+ tempPwdPtr = NULL;
+#endif // HAVE_GETPWNAM_R
+ if (tempPwdPtr != NULL) {
+ extract_token(username, pd.pw_gecos, 0, ',', sizeof username);
+ uid = pd.pw_uid;
+ if (IsEmptyStr (username))
+ {
+ safestrncpy(username, pd.pw_name, sizeof username);
+ }
+ }
+ else {
+ return (ERROR + NO_SUCH_USER);
+ }
}
- /* add user to userlog */
- putuser(&usbuf);
-
+#ifdef HAVE_LDAP
+ if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+ if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid) != 0) {
+ return(ERROR + NO_SUCH_USER);
+ }
+ }
+#endif /* HAVE_LDAP */
+
+ if ((retval = internal_create_user(username, &usbuf, uid)) != 0)
+ return retval;
+
/*
* 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);
- 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->user, &usbuf, sizeof(struct ctdluser));
safestrncpy(CC->curr_user, username, sizeof CC->curr_user);
- CC->logged_in = 1;
+ do_login();
/* Check to make sure we're still who we think we are */
if (getuser(&CC->user, CC->curr_user)) {
return (ERROR + INTERNAL_ERROR);
}
}
-
- lprintf(CTDL_NOTICE, "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");
+ CtdlLogPrintf(CTDL_NOTICE, "New user <%s> created\n", username);
return (0);
}
-
/*
* cmd_newu() - create a new user account and log in as that user
*/
void cmd_newu(char *cmdbuf)
{
int a;
- char username[SIZ];
+ char username[26];
+
+ if (config.c_auth_mode != AUTHMODE_NATIVE) {
+ 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 "
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) {
+ if (IsEmptyStr(username)) {
cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED);
return;
}
a = create_user(username, 1);
if (a == 0) {
- session_startup();
logged_in_response();
} else if (a == ERROR + ALREADY_EXISTS) {
cprintf("%d '%s' already exists.\n",
}
+/*
+ * set password - back end api code
+ */
+void CtdlSetPassword(char *new_pw)
+{
+ lgetuser(&CC->user, CC->curr_user);
+ safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password));
+ lputuser(&CC->user);
+ CtdlLogPrintf(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user);
+ PerformSessionHooks(EVT_SETPASS);
+}
+
/*
- * set password
+ * set password - citadel protocol implementation
*/
void cmd_setp(char *new_pw)
{
+ int generate_random_password = 0;
+
if (CtdlAccessCheck(ac_logged_in)) {
return;
}
- if ( (CC->user.uid != BBSUID) && (CC->user.uid != (-1)) ) {
+ if ( (CC->user.uid != CTDLUID) && (CC->user.uid != (-1)) ) {
cprintf("%d Not allowed. Use the 'passwd' command.\n", ERROR + NOT_HERE);
return;
}
- strproc(new_pw);
- if (strlen(new_pw) == 0) {
- cprintf("%d Password unchanged.\n", CIT_OK);
+ if (CC->is_master) {
+ cprintf("%d The master prefix password cannot be changed with this command.\n",
+ ERROR + NOT_HERE);
return;
}
- 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(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user);
- PerformSessionHooks(EVT_SETPASS);
+
+ if (!strcasecmp(new_pw, "GENERATE_RANDOM_PASSWORD")) {
+ char random_password[17];
+ generate_random_password = 1;
+ snprintf(random_password, sizeof random_password, "%08lx%08lx", random(), random());
+ CtdlSetPassword(random_password);
+ cprintf("%d %s\n", CIT_OK, random_password);
+ }
+ else {
+ strproc(new_pw);
+ if (IsEmptyStr(new_pw)) {
+ cprintf("%d Password unchanged.\n", CIT_OK);
+ return;
+ }
+ CtdlSetPassword(new_pw);
+ cprintf("%d Password changed.\n", CIT_OK);
+ }
}
void cmd_creu(char *cmdbuf)
{
int a;
- char username[SIZ];
- char password[SIZ];
+ char username[26];
+ char password[32];
struct ctdluser tmp;
if (CtdlAccessCheck(ac_aide)) {
return;
}
- extract(username, cmdbuf, 0);
- extract(password, cmdbuf, 1);
+ 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) {
+ if (IsEmptyStr(username)) {
cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED);
return;
}
a = create_user(username, 0);
if (a == 0) {
- if (strlen(password) > 0) {
+ 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,
- (strlen(password) > 0) ? "and password set" :
+ (!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);
+ cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, username);
+ return;
+ } else if ( (config.c_auth_mode != AUTHMODE_NATIVE) && (a == ERROR + NO_SUCH_USER) ) {
+ cprintf("%d User accounts are not created within Citadel in host authentication mode.\n",
+ ERROR + NO_SUCH_USER);
return;
} else {
- cprintf("%d An error occured creating the user account.\n", ERROR + INTERNAL_ERROR);
+ cprintf("%d An error occurred creating the user account.\n", ERROR + INTERNAL_ERROR);
}
}
/*
* get user parameters
*/
-void cmd_getu(void)
+void cmd_getu(char *cmdbuf)
{
if (CtdlAccessCheck(ac_logged_in))
target_msgnum = extract_long(argbuf, 0);
target_setting = extract_int(argbuf, 1);
- CtdlSetSeen(target_msgnum, target_setting, ctdlsetseen_seen);
+ CtdlSetSeen(&target_msgnum, 1, target_setting,
+ ctdlsetseen_seen, NULL, NULL);
cprintf("%d OK\n", CIT_OK);
}
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->room.QRname,
CC->user.fullname);
- aide_message(bbb);
+ aide_message(bbb,"User Admin Message");
return(0);
}
/* 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->room.QRname, config.c_baseroom,
ROOMNAMELEN)) {
return;
}
+void cmd_invt(char *iuser) {cmd_invt_kick(iuser, 1);}
+void cmd_kick(char *iuser) {cmd_invt_kick(iuser, 0);}
/*
* Forget (Zap) the current room (API call)
/*
* forget (Zap) the current room
*/
-void cmd_forg(void)
+void cmd_forg(char *argbuf)
{
if (CtdlAccessCheck(ac_logged_in)) {
/*
* Get Next Unregistered User
*/
-void cmd_gnur(void)
+void cmd_gnur(char *argbuf)
{
struct cdbdata *cdbus;
struct ctdluser usbuf;
*/
void cmd_vali(char *v_args)
{
- char user[SIZ];
+ char user[128];
int newax;
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)) {
*/
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->user.axlevel >= 6)
|| ((usbuf->flags & US_UNLISTED) == 0)
|| ((CC->internal_pgm))) {
- cprintf("%s|%d|%ld|%ld|%ld|%ld|",
+ cprintf("%s|%d|%ld|%ld|%ld|%ld||\n",
usbuf->fullname,
usbuf->axlevel,
usbuf->usernum,
(long)usbuf->lastcall,
usbuf->timescalled,
usbuf->posted);
- 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");
}
/*
* assorted info we need to check at login
*/
-void cmd_chek(void)
+void cmd_chek(char *argbuf)
{
int mail = 0;
int regis = 0;
void cmd_agup(char *cmdbuf)
{
struct ctdluser usbuf;
- char requested_user[SIZ];
+ 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 ctdluser usbuf;
- char requested_user[SIZ];
+ char requested_user[128];
char notify[SIZ];
int np;
int newax;
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)
}
if (deleted) {
- sprintf(notify, "User <%s> deleted by %s\n",
- usbuf.fullname, CC->user.fullname);
- aide_message(notify);
+ snprintf(notify, SIZ,
+ "User \"%s\" has been deleted by %s.\n",
+ usbuf.fullname, CC->user.fullname);
+ aide_message(notify, "User Deletion Message");
}
cprintf("%d Ok", CIT_OK);
*/
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);
+ 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);
}
cprintf("%d ok\n", CIT_OK);
}
+
+
+/*
+ * Rename a user
+ */
+void cmd_renu(char *cmdbuf)
+{
+ int retcode;
+ char oldname[USERNAME_SIZE];
+ char newname[USERNAME_SIZE];
+
+ if (CtdlAccessCheck(ac_aide)) {
+ return;
+ }
+
+ extract_token(oldname, cmdbuf, 0, '|', sizeof oldname);
+ extract_token(newname, cmdbuf, 1, '|', sizeof newname);
+
+ retcode = rename_user(oldname, newname);
+ switch(retcode) {
+ case RENAMEUSER_OK:
+ cprintf("%d '%s' has been renamed to '%s'.\n", CIT_OK, oldname, newname);
+ return;
+ case RENAMEUSER_LOGGED_IN:
+ cprintf("%d '%s' is currently logged in and cannot be renamed.\n",
+ ERROR + ALREADY_LOGGED_IN , oldname);
+ return;
+ case RENAMEUSER_NOT_FOUND:
+ cprintf("%d '%s' does not exist.\n", ERROR + NO_SUCH_USER, oldname);
+ return;
+ case RENAMEUSER_ALREADY_EXISTS:
+ cprintf("%d A user named '%s' already exists.\n", ERROR + ALREADY_EXISTS, newname);
+ return;
+ }
+
+ cprintf("%d An unknown error occurred.\n", ERROR);
+}
+
+
+
+/*****************************************************************************/
+/* MODULE INITIALIZATION STUFF */
+/*****************************************************************************/
+
+
+CTDL_MODULE_INIT(user_ops)
+{
+ CtdlRegisterProtoHook(cmd_user, "USER", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_pass, "PASS", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_creu, "CREU", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_setp, "SETP", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_getu, "GETU", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_setu, "SETU", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_slrp, "SLRP", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_invt, "INVT", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_kick, "KICK", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_forg, "FORG", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_vali, "VALI", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_list, "LIST", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_chek, "CHEK", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_qusr, "QUSR", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_agup, "AGUP", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_asup, "ASUP", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_seen, "SEEN", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_view, "VIEW", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_renu, "RENU", "Autoconverted. TODO: document me.");
+ CtdlRegisterProtoHook(cmd_newu, "NEWU", "Autoconverted. TODO: document me.");
+ /* return our Subversion id for the Log */
+ return "$Id$";
+}
projects / citadel.git / blobdiff