'master user' hack is now an #ifdef instead of commented out

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 779c41850e058acef5fc975045988b3718245617..4c29bd692bd81f725591663e476b11ce6b3108c5 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -361,13 +361,14 @@ int CtdlLoginExistingUser(char *authname, char *trythisname)
        if (trythisname == NULL) return login_not_found;
 
        CC->is_master = 0;
-/* This code WORKS!  It's commented out because we don't want anyone using the hardcoded password. 
+#ifdef MASTER_USER_HACK
+       /* This lives inside an ifdef for now, because it isn't yet secure enough for general deployment */
        if (authname) {
                if (!strcasecmp(authname, MASTER_USER)) {
                        CC->is_master = 1;
                }
        }
-*/
+#endif
 
        safestrncpy(username, trythisname, USERNAME_SIZE);
        striplt(username);