X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fsrc%2Ftuiconfig.c;h=d89ab9ccf3c31baee83dd5ba24186d3550527032;hb=d4d8a13594b84a4a051066cd6c9856d194f63783;hp=e1fccd2a2cab44a9befb762b8114669c0c5f358e;hpb=8d3afbc0bdec3d74be81dc385502d29a8a34a16c;p=citadel.git

diff --git a/textclient/src/tuiconfig.c b/textclient/src/tuiconfig.c
index e1fccd2a2..d89ab9ccf 100644
--- a/textclient/src/tuiconfig.c
+++ b/textclient/src/tuiconfig.c
@@ -383,11 +383,10 @@ void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
 	keyopt(" <1> localhost      (Alias for this computer)\n");
 	keyopt(" <2> smart host     (Forward all outbound mail to this host)\n");
 	keyopt(" <3> fallback host  (Send mail to this host only if direct delivery fails)\n");
-	keyopt(" <4> directory      (Consult the Global Address Book)\n");
-	keyopt(" <5> SpamAssassin   (Address of SpamAssassin server)\n");
-	keyopt(" <6> RBL            (domain suffix of spam hunting RBL)\n");
-	keyopt(" <7> masq domains   (Domains as which users are allowed to masquerade)\n");
-	keyopt(" <8> ClamAV         (Address of ClamAV clamd server)\n");
+	keyopt(" <4> SpamAssassin   (Address of SpamAssassin server)\n");
+	keyopt(" <5> RBL            (domain suffix of spam hunting RBL)\n");
+	keyopt(" <6> masq domains   (Domains as which users are allowed to masquerade)\n");
+	keyopt(" <7> ClamAV         (Address of ClamAV clamd server)\n");
 	sel = intprompt("Which one", 1, 1, 8);
 	switch(sel) {
 		case 1:	strcpy(buf, "localhost");
@@ -396,15 +395,13 @@ void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
 			return;
 		case 3:	strcpy(buf, "fallbackhost");
 			return;
-		case 4:	strcpy(buf, "directory");
+		case 4:	strcpy(buf, "spamassassin");
 			return;
-		case 5:	strcpy(buf, "spamassassin");
+		case 5:	strcpy(buf, "rbl");
 			return;
-		case 6:	strcpy(buf, "rbl");
+		case 6:	strcpy(buf, "masqdomain");
 			return;
-		case 7:	strcpy(buf, "masqdomain");
-			return;
-		case 8:	strcpy(buf, "clamav");
+		case 7:	strcpy(buf, "clamav");
 			return;
 	}
 }
@@ -430,6 +427,13 @@ void do_internet_configuration(CtdlIPC *ipc)
 		while (!IsEmptyStr(resp)) {
 			extract_token(buf, resp, 0, '\n', sizeof buf);
 			remove_token(resp, 0, '\n');
+
+			// VILE SLEAZY HACK: replace obsolete "directory" domains with "localhost"
+			char *d = strstr(buf, "|directory");
+			if (d != NULL) {
+				strcpy(d, "|localhost");
+			}
+
 			++num_recs;
 			if (num_recs == 1) recs = malloc(sizeof(char *));
 			else recs = realloc(recs, (sizeof(char *)) * num_recs);
@@ -460,29 +464,29 @@ void do_internet_configuration(CtdlIPC *ipc)
 		ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
 		switch(ch) {
 			case 'a':
-				newprompt("Enter host name: ",
-					buf, 50);
+				newprompt("Enter host name: ", buf, 50);
 				striplt(buf);
 				if (!IsEmptyStr(buf)) {
 					++num_recs;
-					if (num_recs == 1)
+					if (num_recs == 1) {
 						recs = malloc(sizeof(char *));
-					else recs = realloc(recs,
-						(sizeof(char *)) * num_recs);
+					}
+					else {
+						recs = realloc(recs, (sizeof(char *)) * num_recs);
+					}
 					strcat(buf, "|");
-					get_inet_rec_type(ipc,
-							&buf[strlen(buf)]);
+					get_inet_rec_type(ipc, &buf[strlen(buf)]);
 					recs[num_recs-1] = strdup(buf);
 				}
 				modified = 1;
 				break;
 			case 'd':
-				i = intprompt("Delete which one",
-					1, 1, num_recs) - 1;
+				i = intprompt("Delete which one", 1, 1, num_recs) - 1;
 				free(recs[i]);
 				--num_recs;
-				for (j=i; j<num_recs; ++j)
+				for (j=i; j<num_recs; ++j) {
 					recs[j] = recs[j+1];
+				}
 				modified = 1;
 				break;
 			case 's':