From: Art Cancro <ajc@citadel.org>
Date: Tue, 24 Jul 2007 18:48:12 +0000 (+0000)
Subject: 'master user' hack is now an #ifdef instead of commented out
X-Git-Tag: v7.86~3209
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3d942be1b8068fb230597c90efaeb234578b7fc0

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

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 779c41850..4c29bd692 100644
--- 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);