X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=45e9a1e808b68f9733e3c0decb97bb825905b185;hb=83776a3a51b4cfb71f2ec19401b4ada9bd9ac0fd;hp=abb388924a2fbafbf9e38714b8a590d4ec3c959b;hpb=eb7e7fa868c9b3a61efe0e89b2600e588e6e9f7c;p=citadel.git diff --git a/citadel/user_ops.c b/citadel/user_ops.c index abb388924..45e9a1e80 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -5,10 +5,6 @@ * */ -#ifdef DLL_EXPORT -#define IN_LIBCIT -#endif - #include "sysdep.h" #include #include @@ -20,6 +16,9 @@ #include #include #include +#ifdef HAVE_SYS_STAT_H +#include +#endif #if TIME_WITH_SYS_TIME # include @@ -34,14 +33,12 @@ #include #include -#ifndef ENABLE_CHKPWD +#include #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" @@ -49,18 +46,30 @@ #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" +/* 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) { int i, len; len = strlen(username); + if (len >= USERNAME_SIZE) + { + lprintf (CTDL_EMERG, "Username to long: %s", username); + cit_backtrace (); + len = USERNAME_SIZE - 1; + username[USERNAME_SIZE - 1]='\0'; + } for (i=0; i<=len; ++i) { key[i] = tolower(username[i]); } @@ -69,34 +78,21 @@ static INLINE void makeuserkey(char *key, char *username) { /* * 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; if (usbuf != NULL) { 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); - } - + makeuserkey(usernamekey, name); cdbus = cdb_fetch(CDB_USERS, usernamekey, strlen(usernamekey)); + if (cdbus == NULL) { /* user not found */ return(1); } @@ -183,8 +179,9 @@ int GenerateRelationshipIndex(char *IndexBuf, void put_visit(struct visit *newvisit) { char IndexBuf[32]; - int IndexLen; + int IndexLen = 0; + memset (IndexBuf, 0, sizeof (IndexBuf)); /* Generate an index */ IndexLen = GenerateRelationshipIndex(IndexBuf, newvisit->v_roomnum, @@ -299,10 +296,10 @@ int is_room_aide(void) /* * getuserbynumber() - get user by number - * returns 0 if user was found + * returns 0 if user was found * * WARNING: don't use this function unless you absolutely have to. It does - * a sequential search and therefore is computationally expensive. + * a sequential search and therefore is computationally expensive. */ int getuserbynumber(struct ctdluser *usbuf, long int number) { @@ -326,76 +323,115 @@ int getuserbynumber(struct ctdluser *usbuf, long int number) /* - * See if we can translate a system login name (i.e. from /etc/passwd) - * to a Citadel screen name. Returns 0 if one is found. + * getuserbyuid() - get user by system uid (for PAM mode authentication) + * returns 0 if user was found + * + * WARNING: don't use this function unless you absolutely have to. It does + * a sequential search and therefore is computationally expensive. */ -int CtdlAssociateSystemUser(char *screenname, char *loginname) { - struct passwd *p; - int a; +int getuserbyuid(struct ctdluser *usbuf, uid_t number) +{ + struct cdbdata *cdbus; - p = (struct passwd *) getpwnam(loginname); - if (p != NULL) { - strcpy(screenname, p->pw_gecos); - for (a = 0; a < strlen(screenname); ++a) { - if (screenname[a] == ',') { - screenname[a] = 0; - } + cdb_rewind(CDB_USERS); + + while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) { + memset(usbuf, 0, sizeof(struct ctdluser)); + memcpy(usbuf, cdbus->ptr, + ((cdbus->len > sizeof(struct ctdluser)) ? + sizeof(struct ctdluser) : cdbus->len)); + cdb_free(cdbus); + if (usbuf->uid == number) { + cdb_close_cursor(CDB_USERS); + return (0); } - return(0); } - return(1); + return (-1); } - - /* * Back end for cmd_user() and its ilk + * + * NOTE: "authname" should only be used if we are attempting to use the "master user" feature */ -int CtdlLoginExistingUser(char *trythisname) +int CtdlLoginExistingUser(char *authname, char *trythisname) { char username[SIZ]; int found_user; - struct recptypes *valid = NULL; + + if ((CC->logged_in)) { + return login_already_logged_in; + } if (trythisname == NULL) return login_not_found; + + /* If a "master user" is defined, handle its authentication if specified */ + CC->is_master = 0; + if (strlen(config.c_master_user) > 0) if (strlen(config.c_master_pass) > 0) if (authname) { + if (!strcasecmp(authname, config.c_master_user)) { + CC->is_master = 1; + } + } + + /* Continue attempting user validation... */ safestrncpy(username, trythisname, USERNAME_SIZE); striplt(username); - if ((CC->logged_in)) { - return login_already_logged_in; + if (IsEmptyStr(username)) { + return login_not_found; } - /* First, try to log in as if the supplied name is a display name */ - found_user = getuser(&CC->user, username); + if (config.c_auth_mode == 1) { - /* 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(valid); + /* 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; + } + + /* Locate the associated Citadel account. + * If not found, make one attempt to create it. + */ + found_user = getuserbyuid(&CC->user, pd.pw_uid); + lprintf(CTDL_DEBUG, "found it: uid=%ld, gecos=%s here: %ld\n", (long)pd.pw_uid, pd.pw_gecos, found_user); + if (found_user != 0) { + create_user(username, 0); + found_user = getuserbyuid(&CC->user, pd.pw_uid); } + } -#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) { - struct passwd *p = (struct passwd *) getpwnam(username); + else { + /* native auth mode */ - if (p != NULL) { - create_user(username, 0); - found_user = getuser(&CC->user, username); + 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) { @@ -423,7 +459,7 @@ void cmd_user(char *cmdbuf) 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); @@ -454,7 +490,7 @@ void cmd_user(char *cmdbuf) */ void session_startup(void) { - int i; + int i = 0; lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user); @@ -469,6 +505,16 @@ void session_startup(void) 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 == 1) { + if (CC->user.uid == 0) { + CC->user.axlevel = 6; + } + } + lputuser(&CC->user); /* @@ -478,7 +524,7 @@ void session_startup(void) */ snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s", CC->user.fullname, config.c_fqdn); - for (i=0; ics_inet_email); ++i) { + for (i=0; !IsEmptyStr(&CC->cs_inet_email[i]); ++i) { if (isspace(CC->cs_inet_email[i])) { CC->cs_inet_email[i] = '_'; } @@ -489,6 +535,7 @@ void session_startup(void) */ 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); @@ -521,7 +568,6 @@ void logout(struct CitContext *who) * make that assumption. */ strcpy(who->fake_username, ""); - strcpy(who->fake_postname, ""); strcpy(who->fake_hostname, ""); strcpy(who->fake_roomname, ""); who->logged_in = 0; @@ -544,7 +590,7 @@ void logout(struct CitContext *who) /* * If we were talking to a network node, we're not anymore... */ - if (strlen(who->net_node) > 0) { + if (!IsEmptyStr(who->net_node)) { network_talking_to(who->net_node, NTT_REMOVE); } @@ -557,63 +603,74 @@ void logout(struct CitContext *who) } } -#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(CTDL_ERR, "pipe failed (%s): denying autologin access for " - "uid %ld\n", strerror(errno), (long)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(CTDLDIR "/chkpwd", CTDLDIR "/chkpwd", NULL); - perror(CTDLDIR "/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; + 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() { @@ -644,33 +701,50 @@ int CtdlTryPassword(char *password) } code = (-1); - -#ifdef ENABLE_AUTOLOGIN - /* A uid of CTDLUID or -1 indicates that this user exists only in - * Citadel, not in the underlying operating system. - */ - if ( (CC->user.uid == CTDLUID) || (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 == 1) { + + /* 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); + 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(); @@ -756,23 +830,19 @@ int purge_user(char pname[]) cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey)); /* remove the user's bio file */ - snprintf(filename, sizeof filename, -#ifndef HAVE_DATA_DIR - "." -#else - DATA_DIR -#endif - "/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, -#ifndef HAVE_DATA_DIR - "." -#else - DATA_DIR -#endif - "/userpics/%ld.gif", usbuf.usernum); + snprintf(filename, + sizeof filename, + "%s/%ld.gif", + ctdl_image_dir, + usbuf.usernum); unlink(filename); return (0); @@ -792,25 +862,44 @@ int create_user(char *newusername, int become_user) struct ctdlroom qrbuf; char username[256]; char mailboxname[ROOMNAMELEN]; - uid_t uid; + char buf[SIZ]; + uid_t uid = (-1); safestrncpy(username, newusername, sizeof username); strproc(username); -#ifdef ENABLE_AUTOLOGIN - { - struct passwd *p = (struct passwd *) getpwnam(username); + if (config.c_auth_mode == 1) { - if (p != NULL) { - extract_token(username, p->pw_gecos, 0, ',', sizeof username); - uid = p->pw_uid; - } else { - uid = (-1); - } - } + /* host auth mode */ + + struct passwd pd; + struct passwd *tempPwdPtr; + char pwdbuffer[256]; + +#ifdef SOLARIS_GETPWUID + tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer)); #else - uid = (-1); + getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr); #endif + if (tempPwdPtr != NULL) { + extract_token(username, pd.pw_gecos, 0, ',', sizeof username); + uid = pd.pw_uid; + if (IsEmptyStr (username)) + { + lprintf (CTDL_EMERG, + "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n", + newusername, pd.pw_uid); + snprintf(buf, SIZ, + "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n", + newusername, pd.pw_uid); + aide_message(buf, "User Creation Failure Notice"); + + } + } + else { + return (ERROR + NO_SUCH_USER); + } + } if (!getuser(&usbuf, username)) { return (ERROR + ALREADY_EXISTS); @@ -852,10 +941,10 @@ int create_user(char *newusername, int become_user) MailboxName(mailboxname, sizeof mailboxname, &usbuf, USERCONFIGROOM); create_room(mailboxname, 5, "", 0, 1, 1, VIEW_BBS); - if (lgetroom(&qrbuf, mailboxname) == 0) { - qrbuf.QRflags2 |= QR2_SYSTEM; - lputroom(&qrbuf); - } + if (lgetroom(&qrbuf, mailboxname) == 0) { + qrbuf.QRflags2 |= QR2_SYSTEM; + lputroom(&qrbuf); + } /* Perform any create functions registered by server extensions */ PerformUserHooks(&usbuf, EVT_NEWUSER); @@ -875,7 +964,14 @@ int create_user(char *newusername, int become_user) return (ERROR + INTERNAL_ERROR); } } - + + 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); } @@ -891,6 +987,12 @@ void cmd_newu(char *cmdbuf) int a; 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 + NOT_HERE); @@ -910,7 +1012,7 @@ void cmd_newu(char *cmdbuf) 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; } @@ -954,8 +1056,13 @@ void cmd_setp(char *new_pw) cprintf("%d Not allowed. Use the 'passwd' command.\n", ERROR + NOT_HERE); return; } + if (CC->is_master) { + cprintf("%d The master prefix password cannot be changed with this command.\n", + ERROR + NOT_HERE); + return; + } strproc(new_pw); - if (strlen(new_pw) == 0) { + if (IsEmptyStr(new_pw)) { cprintf("%d Password unchanged.\n", CIT_OK); return; } @@ -989,7 +1096,7 @@ void cmd_creu(char *cmdbuf) strproc(username); strproc(password); - if (strlen(username) == 0) { + if (IsEmptyStr(username)) { cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); return; } @@ -997,21 +1104,24 @@ void cmd_creu(char *cmdbuf) 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 == 1) && (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); } } @@ -1111,7 +1221,8 @@ void cmd_seen(char *argbuf) { target_msgnum = extract_long(argbuf, 0); target_setting = extract_int(argbuf, 1); - CtdlSetSeen(target_msgnum, target_setting, ctdlsetseen_seen, NULL, NULL); + CtdlSetSeen(&target_msgnum, 1, target_setting, + ctdlsetseen_seen, NULL, NULL); cprintf("%d OK\n", CIT_OK); } @@ -1155,12 +1266,12 @@ int CtdlInvtKick(char *iuser, int op) { 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); } @@ -1180,10 +1291,10 @@ void cmd_invt_kick(char *iuser, int op) { /* 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)) { @@ -1370,7 +1481,7 @@ void ListThisUser(struct ctdluser *usbuf, void *data) char *searchstring; searchstring = (char *)data; - if (strcasestr(usbuf->fullname, searchstring) == NULL) { + if (bmstrcasestr(usbuf->fullname, searchstring) == NULL) { return; } @@ -1534,9 +1645,9 @@ void cmd_asup(char *cmdbuf) } if (deleted) { - sprintf(notify, "User <%s> deleted by %s\n", + sprintf(notify, "User \"%s\" has been deleted by %s.\n", usbuf.fullname, CC->user.fullname); - aide_message(notify); + aide_message(notify, "User Deletion Message"); } cprintf("%d Ok", CIT_OK); @@ -1586,40 +1697,40 @@ int NewMailCount() */ 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 = 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); + 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); }