X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontrol.c;h=ef9a27fed4b764d0dc6c0948e6a85255101ae0db;hb=c749167bf53f218f691fc7e5af69520053319b7f;hp=8e0b487265003d7db54c9d884a850ef40843444f;hpb=769dfac89d383517c1cb40de963ee3253f2340e8;p=citadel.git

diff --git a/citadel/control.c b/citadel/control.c
index 8e0b48726..ef9a27fed 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -1,7 +1,7 @@
 /*
  * This module handles states which are global to the entire server.
  *
- * 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.
@@ -83,10 +83,10 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data)
 	}
 	cdb_free(cdbfr);
 	if (room_fixed) {
-		syslog(LOG_INFO, "Control record checking....Fixed room counter\n");
+		syslog(LOG_INFO, "control: fixed room counter");
 	}
 	if (message_fixed) {
-		syslog(LOG_INFO, "Control record checking....Fixed message count\n");
+		syslog(LOG_INFO, "control: fixed message count");
 	}
 	return;
 }
@@ -106,7 +106,7 @@ void control_find_user (struct ctdluser *EachUser, void *out_data)
 		user_fixed = 1;
 	}
 	if(user_fixed)
-		syslog(LOG_INFO, "Control record checking....Fixed user count\n");
+		syslog(LOG_INFO, "control: fixed user count");
 }
 
 
@@ -121,7 +121,7 @@ void migrate_legacy_control_record(void)
 
 	fp = fopen(file_citadel_control, "rb+");
 	if (fp != NULL) {
-		syslog(LOG_INFO, "Legacy format control record found -- importing to db");
+		syslog(LOG_INFO, "control: legacy format record found -- importing to db");
 		fread(&c, sizeof(struct legacy_ctrl_format), 1, fp);
 		
 		CtdlSetConfigLong(	"MMhighest",			c.MMhighest);
@@ -147,7 +147,7 @@ void migrate_legacy_control_record(void)
  */
 void check_control(void)
 {
-	syslog(LOG_INFO, "Sanity checking the recorded highest message, user, and room numbers\n");
+	syslog(LOG_INFO, "control: sanity checking the recorded highest message, user, and room numbers");
 	CtdlForEachRoom(control_find_highest, NULL);
 	ForEachUser(control_find_user, NULL);
 }
@@ -619,24 +619,29 @@ void cmd_conf(char *argbuf)
 		extract_token(confname, argbuf, 1, '|', sizeof confname);
 		unbuffer_output();
 		cprintf("%d %s\n", SEND_LISTING, confname);
-		confptr = CtdlReadMessageBody(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0);
+		confptr = CtdlReadMessageBody(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0);
 		CtdlPutSysConfig(confname, confptr);
 		free(confptr);
 	}
 
 	// CONF GETVAL - retrieve configuration variables from the database
-	else if (!strcasecmp(cmd, "GETVAL")) {
+	// CONF LOADVAL - same thing but can handle variables bigger than 1 KB
+	else if ( (!strcasecmp(cmd, "GETVAL")) || (!strcasecmp(cmd, "LOADVAL")) ) {
 		extract_token(confname, argbuf, 1, '|', sizeof confname);
 		char *v = CtdlGetConfigStr(confname);
-		if (v) {
+		if ( (v) && (!strcasecmp(cmd, "GETVAL")) ) {
 			cprintf("%d %s|\n", CIT_OK, v);
 		}
+		else if ( (v) && (!strcasecmp(cmd, "LOADVAL")) ) {
+			cprintf("%d %d\n", BINARY_FOLLOWS, strlen(v));
+			client_write(v, strlen(v));
+		}
 		else {
 			cprintf("%d |\n", ERROR);
 		}
 	}
 
-	// CONF PUTVAL - store configuration variables from the database
+	// CONF PUTVAL - store configuration variables in the database
 	else if (!strcasecmp(cmd, "PUTVAL")) {
 		if (num_tokens(argbuf, '|') < 3) {
 			cprintf("%d name and value required\n", ERROR);
@@ -649,6 +654,23 @@ void cmd_conf(char *argbuf)
 		}
 	}
 
+	// CONF STOREVAL - store configuration variables in the database bigger than 1 KB
+	else if (!strcasecmp(cmd, "STOREVAL")) {
+		if (num_tokens(argbuf, '|') < 3) {
+			cprintf("%d name and length required\n", ERROR);
+		}
+		else {
+			extract_token(confname, argbuf, 1, '|', sizeof confname);
+			int bytes = extract_int(argbuf, 2);
+			char *valbuf = malloc(bytes + 1);
+			cprintf("%d %d\n", SEND_BINARY, bytes);
+			client_read(valbuf, bytes);
+			valbuf[bytes+1] = 0;
+			CtdlSetConfigStr(confname, valbuf);
+			free(valbuf);
+		}
+	}
+
 	// CONF LISTVAL - list configuration variables in the database and their values
 	else if (!strcasecmp(cmd, "LISTVAL")) {
 		struct cdbdata *cdbcfg;
@@ -659,10 +681,12 @@ 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 != NULL) {
-			keylen = strlen(cdbcfg->ptr);
-			key = cdbcfg->ptr;
-			value = cdbcfg->ptr + keylen + 1;
-			cprintf("%s|%s\n", key, value);
+			if (cdbcfg->len < 1020) {
+				keylen = strlen(cdbcfg->ptr);
+				key = cdbcfg->ptr;
+				value = cdbcfg->ptr + keylen + 1;
+				cprintf("%s|%s\n", key, value);
+			}
 			cdb_free(cdbcfg);
 		}
 		cprintf("000\n");