X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fcontrol.c;h=b79689b08e12d68a5c27dc3209fc977fbb8a14f1;hp=fce46a00cefdbd317a1ca2b76f60f4cb437b7fe7;hb=e21b689461215d6012ff62d76c2da73d4ffeb33a;hpb=4df5a681fce2bd93f8b81e0873c0f173ca14616d

diff --git a/citadel/control.c b/citadel/control.c
index fce46a00c..b79689b08 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -308,10 +308,10 @@ void cmd_conf(char *argbuf)
 		cprintf("%d\n",		CtdlGetConfigInt("c_pftcpdict_port"));
 		cprintf("%d\n",		CtdlGetConfigInt("c_managesieve_port"));
 	        cprintf("%d\n",		CtdlGetConfigInt("c_auth_mode"));
-	        cprintf("%s\n",		CtdlGetConfigStr("c_funambol_host"));
-	        cprintf("%d\n",		CtdlGetConfigInt("c_funambol_port"));
-	        cprintf("%s\n",		CtdlGetConfigStr("c_funambol_source"));
-	        cprintf("%s\n",		CtdlGetConfigStr("c_funambol_auth"));
+	        cprintf("\n");
+	        cprintf("\n");
+	        cprintf("\n");
+	        cprintf("\n");
 		cprintf("%d\n",		CtdlGetConfigInt("c_rbl_at_greeting"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_master_user"));
 		cprintf("%s\n",		CtdlGetConfigStr("c_master_pass"));
@@ -518,16 +518,16 @@ void cmd_conf(char *argbuf)
 				CtdlSetConfigInt("c_auth_mode", atoi(buf));
 				break;
 			case 53:
-				CtdlSetConfigStr("c_funambol_host", buf);
+				/* niu */
 				break;
 			case 54:
-				CtdlSetConfigInt("c_funambol_port", atoi(buf));
+				/* niu */
 				break;
 			case 55:
-				CtdlSetConfigStr("c_funambol_source", buf);
+				/* niu */
 				break;
 			case 56:
-				CtdlSetConfigStr("c_funambol_auth", buf);
+				/* niu */
 				break;
 			case 57:
 				CtdlSetConfigInt("c_rbl_at_greeting", confbool(buf));
@@ -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, (int)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");