* Fixed bug in room_ops.c that wasn't allowing aides to goto passworded

  rooms without knowing the password.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7d4c94d09176926f37b1f848f8a6695f69d2395a..a9aaee232ee78995e21250ea76e3739bca4089a5 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 573.126  2001/04/16 19:21:14  cough
+ * Fixed bug in room_ops.c that wasn't allowing aides to goto passworded
+   rooms without knowing the password.
+
  Revision 573.125  2001/04/14 04:26:44  ajc
  * Fixed an unterminated string bug in IMAP APPEND.  Storing messages should
    work now.

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index c13b8d830e31753fc7b080a450af491dda362b97..4cfeae3125a8a7bc6cac3f3d974f4d1934962b85 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -801,7 +801,8 @@ void cmd_goto(char *gargs)
                if (ok == 1) {
                        if ((QRscratch.QRflags & QR_PASSWORDED) &&
                            ((ra & UA_KNOWN) == 0) &&
-                           (strcasecmp(QRscratch.QRpasswd, password))
+                           (strcasecmp(QRscratch.QRpasswd, password)) &&
+                           (CC->usersupp.axlevel < 6)
                            ) {
                                cprintf("%d wrong or missing passwd\n",
                                        ERROR + PASSWORD_REQUIRED);
@@ -809,7 +810,9 @@ void cmd_goto(char *gargs)
                        } else if ((QRscratch.QRflags & QR_PRIVATE) &&
                                   ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
                                   ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
-                                  ((ra & UA_KNOWN) == 0)) {
+                                  ((ra & UA_KNOWN) == 0) &&
+                                  (CC->usersupp.axlevel < 6)
+                                  ) {
                                goto NOPE;
                        } else {
                                usergoto(towhere, 1, NULL, NULL);