summaryrefslogtreecommitdiff
path: root/main/manager.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2007-06-24 17:42:39 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2007-06-24 17:42:39 +0000
commitd6c0627c4f0245b162c368bce151f86fc4467be8 (patch)
treee704e343f6a52142ffeb02441d7e8f951bf7d9a7 /main/manager.c
parent0296bd9957bf95dba534d6aecfae18650b31a201 (diff)
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
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/main/manager.c b/main/manager.c
index c6b36ca7f..ec6e2d968 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);