X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Futils%2Fsetup.c;h=e95b30167926d5cb55acc615be57feda832413d3;hp=ce99e8f02772212a8a79673d37039e6918397187;hb=1cf98031e3530393ec5fb753567bf496c6277ab3;hpb=e50a8a181e1cbd4aa0e8bc032fa8153040e66eea

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index ce99e8f02..e95b30167 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1,7 +1,7 @@
 /*
  * Citadel setup utility
  *
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -1235,29 +1235,33 @@ int main(int argc, char *argv[])
 	/*
 	 * Create the administrator account.  It's ok if the command fails if this user already exists.
 	 */
-	progress(activity, 1, 5);
-	snprintf(buf, sizeof buf, "CREU %s|%s", admin_name, admin_pass);
-	serv_puts(buf);
-	progress(activity, 2, 5);
-	serv_gets(buf);
+	if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) {
+		progress(activity, 1, 5);
+		snprintf(buf, sizeof buf, "CREU %s|%s", admin_name, admin_pass);
+		serv_puts(buf);
+		progress(activity, 2, 5);
+		serv_gets(buf);
+	}
 	progress(activity, 3, 5);
 
 	/*
 	 * Assign the desired password and access level to the administrator account.
 	 */
-	snprintf(buf, sizeof buf, "AGUP %s", admin_name);
-	serv_puts(buf);
-	progress(activity, 4, 5);
-	serv_gets(buf);
-	if (buf[0] == '2') {
-		int admin_flags = extract_int(&buf[4], 2);
-		int admin_times_called = extract_int(&buf[4], 3);
-		int admin_msgs_posted = extract_int(&buf[4], 4);
-		snprintf(buf, sizeof buf, "ASUP %s|%s|%d|%d|%d|6",
-			admin_name, admin_pass, admin_flags, admin_times_called, admin_msgs_posted
-		);
+	if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) {
+		snprintf(buf, sizeof buf, "AGUP %s", admin_name);
 		serv_puts(buf);
+		progress(activity, 4, 5);
 		serv_gets(buf);
+		if (buf[0] == '2') {
+			int admin_flags = extract_int(&buf[4], 2);
+			int admin_times_called = extract_int(&buf[4], 3);
+			int admin_msgs_posted = extract_int(&buf[4], 4);
+			snprintf(buf, sizeof buf, "ASUP %s|%s|%d|%d|%d|6",
+				admin_name, admin_pass, admin_flags, admin_times_called, admin_msgs_posted
+			);
+			serv_puts(buf);
+			serv_gets(buf);
+		}
 	}
 	progress(activity, 5, 5);