From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 24 Jun 2007 17:42:39 +0000 (+0000)
Subject: Merged revisions 71289 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c0627c4f0245b162c368bce151f86fc4467be8;p=thirdparty%2Fasterisk.git

Merged revisions 71289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71289 | tilghman | 2007-06-24 12:39:34 -0500 (Sun, 24 Jun 2007) | 10 lines

Merged revisions 71288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71288 | tilghman | 2007-06-24 12:32:21 -0500 (Sun, 24 Jun 2007) | 2 lines

Issue 10043 - There is a legitimate need to be able to set variables to the empty string.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/db.c b/main/db.c
index c733ef9dce..a088a803ff 100644
--- a/main/db.c
+++ b/main/db.c
@@ -538,12 +538,8 @@ static int manager_dbput(struct mansession *s, const struct message *m)
 		astman_send_error(s, m, "No key specified");
 		return 0;
 	}
-	if (ast_strlen_zero(val)) {
-		astman_send_error(s, m, "No val specified");
-		return 0;
-	}
 
-	res = ast_db_put(family, key, val);
+	res = ast_db_put(family, key, S_OR(val, ""));
 	if (res) {
 		astman_send_error(s, m, "Failed to update entry");
 	} else {
diff --git a/main/manager.c b/main/manager.c
index c6b36ca7f5..ec6e2d968c 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1554,11 +1554,6 @@ static int action_setvar(struct mansession *s, const struct message *m)
 		return 0;
 	}
 
-	if (ast_strlen_zero(varval)) {
-		astman_send_error(s, m, "No value specified");
-		return 0;
-	}
-
 	if (!ast_strlen_zero(name)) {
 		c = ast_get_channel_by_name_locked(name);
 		if (!c) {
@@ -1567,7 +1562,7 @@ static int action_setvar(struct mansession *s, const struct message *m)
 		}
 	}
 
-	pbx_builtin_setvar_helper(c, varname, varval);
+	pbx_builtin_setvar_helper(c, varname, S_OR(varval, ""));
 
 	if (c)
 		ast_channel_unlock(c);