LOOK AT ME I AM COMMITTING AGAIN

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 3abaf307cf32a7c062104794d2f95ef8d20d7dcf..c545e4dde2abfcce76da25395fd131c8b4e65581 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -819,8 +819,8 @@ void CtdlUserGoto(char *where, int display_result, int transiently,
        /* Know the room ... but not if it's the page log room, or if the
         * caller specified that we're only entering this room transiently.
         */
-       if ((strcasecmp(CCC->room.QRname, CtdlGetConfigStr("c_logpages")))
-          && (transiently == 0) ) {
+       if ((strcasecmp(CCC->room.QRname, CtdlGetConfigStr("c_logpages"))) && (transiently == 0))
+       {
                vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
                vbuf.v_flags = vbuf.v_flags | V_ACCESS;
        }

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 4ae077862c857a8e0ef58770a017bacc205de25b..1e8792d71d6a0cb9681c9bad800650a4da28e427 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -529,8 +529,8 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 
        /* If a "master user" is defined, handle its authentication if specified */
        CC->is_master = 0;
-       if (    (strlen(CtdlGetConfigStr("c_master_user")) > 0) && 
-               (strlen(CtdlGetConfigStr("c_master_pass")) > 0) &&
+       if (    (!IsEmptyStr(CtdlGetConfigStr("c_master_user"))) && 
+               (!IsEmptyStr(CtdlGetConfigStr("c_master_pass"))) &&
                (authname != NULL) &&
                (!strcasecmp(authname, CtdlGetConfigStr("c_master_user"))) )
        {