From 18a0fd99f300eebd80cf18a09aa0266de799f245 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 19 Jun 2004 02:33:55 +0000 Subject: [PATCH] * Removed the configuration option "Allow Aides access to all mailboxes." This functionality *must* always be enabled for administrative create/edit of vCards, which live in the user's My Citadel Config> room. --- citadel/ChangeLog | 6 ++++++ citadel/citadel.h | 2 +- citadel/control.c | 6 ++---- citadel/room_ops.c | 10 +++++----- citadel/routines2.c | 3 --- citadel/techdoc/session.txt | 4 ++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 689ba6312..0587e53c1 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,9 @@ $Log$ + Revision 621.17 2004/06/19 02:33:54 ajc + * Removed the configuration option "Allow Aides access to all mailboxes." + This functionality *must* always be enabled for administrative create/edit + of vCards, which live in the user's My Citadel Config> room. + Revision 621.16 2004/06/16 04:17:43 ajc * More scheduler changes. Removed the rescan pipe again, and also removed the mutex wrapper around select(). In my initial testing I am @@ -5855,3 +5860,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/citadel.h b/citadel/citadel.h index 3b8ccd7ac..686c61389 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -125,7 +125,7 @@ struct config { int c_imap_port; /* IMAP listener port (usually 143) */ time_t c_net_freq; /* how often to run the networker */ char c_disable_newu; /* disable NEWU command */ - char c_aide_mailboxes; /* give Aides access to mailboxes */ + char c_niu_4; /* (not in use) */ char c_baseroom[ROOMNAMELEN]; /* Name of baseroom (Lobby) */ char c_aideroom[ROOMNAMELEN]; /* Name of aideroom (Aide) */ int c_purge_hour; /* Hour during which db purges run */ diff --git a/citadel/control.c b/citadel/control.c index e0a6dfd5d..6b05750aa 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -194,7 +194,7 @@ void cmd_conf(char *argbuf) cprintf("%d\n", config.c_imap_port); cprintf("%ld\n", config.c_net_freq); cprintf("%d\n", config.c_disable_newu); - cprintf("%d\n", config.c_aide_mailboxes); + cprintf("1\n"); /* no longer in use */ cprintf("%d\n", config.c_purge_hour); #ifdef HAVE_LDAP cprintf("%s\n", config.c_ldap_host); @@ -338,9 +338,7 @@ void cmd_conf(char *argbuf) config.c_disable_newu = 1; break; case 30: - config.c_aide_mailboxes = atoi(buf); - if (config.c_aide_mailboxes != 0) - config.c_aide_mailboxes = 1; + /* no longer in use */ break; case 31: if ((config.c_purge_hour >= 0) diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 9b5b27830..a4c2f5ff6 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -140,9 +140,10 @@ int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf) } } - /* On some systems, Aides can gain access to mailboxes as well */ - if ( (config.c_aide_mailboxes) - && (userbuf->axlevel >= 6) + /* Aides can gain access to mailboxes as well, but they don't show + * by default. + */ + if ( (userbuf->axlevel >= 6) && (roombuf->QRflags & QR_MAILBOX) ) { retval = retval | UA_GOTOALLOWED; } @@ -1742,8 +1743,7 @@ void cmd_cre8(char *args) } if (new_room_type == 5) { - if ((config.c_aide_mailboxes == 0) - || (CC->user.axlevel < 6)) { + if (CC->user.axlevel < 6) { cprintf("%d Higher access required\n", ERROR + HIGHER_ACCESS_REQUIRED); return; diff --git a/citadel/routines2.c b/citadel/routines2.c index 66ff6d090..7d627ae2e 100644 --- a/citadel/routines2.c +++ b/citadel/routines2.c @@ -714,9 +714,6 @@ void do_system_configuration(CtdlIPC *ipc) snprintf(sc[26], sizeof sc[26], "%d", (boolprompt( "Allow Aides to Zap (forget) rooms", atoi(&sc[26][0])))); - snprintf(sc[30], sizeof sc[30], "%d", (boolprompt( - "Allow system Aides access to user mailboxes", - atoi(&sc[30][0])))); if (strlen(&sc[18][0]) > 0) logpages = 1; else logpages = 0; diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt index 14645e62b..d589b6e44 100644 --- a/citadel/techdoc/session.txt +++ b/citadel/techdoc/session.txt @@ -1788,13 +1788,13 @@ fails for any reason, ERROR is returned. 28. Port number for IMAP service 29. How often (in seconds) to run the networker 30. Flag (0 or 1) - disable self-service new user registration - 31. Flag (0 or 1) - Aides are allowed access to all mailboxes + 31. (placeholder -- this field is no longer in use) 32. Hour (0 through 23) during which database auto-purge jobs are run 33. Name of host where an LDAP service may be found 34. Port number of LDAP service on above host 35. LDAP Base DN 36. LDAP Bind DN - 37. PAssword for LDAP Bind DN + 37. Password for LDAP Bind DN CONF also accepts two additional commands: GETSYS and PUTSYS followed by an arbitrary MIME type (such as application/x-citadel-internet-config) which -- 2.39.2