From 1a3138f7132003e097baa70dd1d9380fa65eadfe Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 29 Sep 2015 17:52:00 -0400 Subject: [PATCH] LOOK AT ME I AM COMMITTING AGAIN --- citadel/room_ops.c | 4 ++-- citadel/user_ops.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 3abaf307c..c545e4dde 100644 --- 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 4ae077862..1e8792d71 100644 --- 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"))) ) { -- 2.30.2