X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver%2Fcontrol.c;h=a6ff329016082ac1886caa9a5a154d0a2d7d353e;hb=d383bc5305bc266d8ca34e61753bc47f7a2a83d4;hp=51e9f7d60a64f58f12743d606f2803fa851c9675;hpb=ba196da6b1ae7bdd2e72558ff35fe17d8597d141;p=citadel.git

diff --git a/citadel/server/control.c b/citadel/server/control.c
index 51e9f7d60..a6ff32901 100644
--- a/citadel/server/control.c
+++ b/citadel/server/control.c
@@ -1,7 +1,7 @@
 //
 // This module handles states which are global to the entire server.
 //
-// Copyright (c) 1987-2023 by the citadel.org team
+// Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
@@ -226,7 +226,7 @@ void cmd_conf(char *argbuf) {
 		cprintf("%s\n",		CtdlGetConfigStr("c_nodename"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_fqdn"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_humannode"));
-		cprintf("xxx\n");	// placeholder -- field no longer in use
+		cprintf("xxx\n");
 		cprintf("%d\n",		CtdlGetConfigInt("c_creataide"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_sleeping"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_initax"));
@@ -238,7 +238,7 @@ void cmd_conf(char *argbuf) {
 		cprintf("%s\n",		CtdlGetConfigStr("c_site_location"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_sysadm"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_maxsessions"));
-		cprintf("xxx\n");	// placeholder -- field no longer in use
+		cprintf("xxx\n");
 		cprintf("%d\n",		CtdlGetConfigInt("c_userpurge"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_roompurge"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_logpages"));
@@ -253,7 +253,7 @@ void cmd_conf(char *argbuf) {
 		cprintf("%d\n",		CtdlGetConfigInt("c_imap_port"));
 		cprintf("%ld\n",	CtdlGetConfigLong("c_net_freq"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_disable_newu"));
-		cprintf("1\n");		// niu
+		cprintf("1\n");
 		cprintf("%d\n",		CtdlGetConfigInt("c_purge_hour"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_ldap_host"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_ldap_port"));
@@ -570,13 +570,14 @@ void cmd_conf(char *argbuf) {
 			len = strlen(confptr);
 			cprintf("%d %s\n", LISTING_FOLLOWS, confname);
 			client_write(confptr, len);
-			if ((len > 0) && (confptr[len - 1] != 10))
+			if ((len > 0) && (confptr[len - 1] != 10)) {
 				client_write("\n", 1);
+			}
 			cprintf("000\n");
 			free(confptr);
-		} else {
-			cprintf("%d No such configuration.\n",
-				ERROR + ILLEGAL_VALUE);
+		}
+		else {
+			cprintf("%d No such configuration.\n", ERROR + ILLEGAL_VALUE);
 		}
 	}
 
@@ -646,7 +647,7 @@ void cmd_conf(char *argbuf) {
 	
 		cprintf("%d all configuration variables\n", LISTING_FOLLOWS);
 		cdb_rewind(CDB_CONFIG);
-		while (cdbcfg = cdb_next_item(CDB_CONFIG), cdbcfg.val.ptr!=NULL) {		// always read to the end
+		while (cdbcfg = cdb_next_item(CDB_CONFIG), cdbcfg.val.ptr!=NULL) {	// MUST read to the end
 			if (cdbcfg.val.len < 1020) {
 				keylen = strlen(cdbcfg.val.ptr);
 				key = cdbcfg.val.ptr;
@@ -717,8 +718,7 @@ void cmd_gvdn(char *argbuf) {
 		StrBufExtract_NextToken(CfgToken, Line, &PPos, '|');
 		if (GetHash(CfgNameHash, SKEY(CfgToken), &vptr) && (vptr != NULL)) {
 			pCfg = (ConfType *) vptr;
-			if (pCfg->Type <= min)
-			{
+			if (pCfg->Type <= min) {
 				Put(List, SKEY(Cfg), Cfg, HFreeStrBuf);
 				Cfg = NULL;
 			}
@@ -748,8 +748,9 @@ char *ctdl_module_init_control(void) {
 		int i;
 
 		CfgNameHash = NewHash(1, NULL);
-		for (i = 0; CfgNames[i].Name.Key != NULL; i++)
+		for (i = 0; CfgNames[i].Name.Key != NULL; i++) {
 			Put(CfgNameHash, CKEY(CfgNames[i].Name), &CfgNames[i], reference_free_handler);
+		}
 
 		CtdlRegisterProtoHook(cmd_gvdn, "GVDN", "get valid domain names");
 		CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration");