automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@71337 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/db.c b/db.c
index 6d9e2b620ecede52186ab01caae590006a5955ec..f3ea4f9c6ce23fa6279c2bd7c810d5f9885cccb5 100644 (file)
--- a/db.c
+++ b/db.c
@@ -531,12 +531,8 @@ static int manager_dbput(struct mansession *s, struct message *m)
                astman_send_error(s, m, "No key specified");
                return 0;
        }
-       if (!strlen(val)) {
-               astman_send_error(s, m, "No val specified");
-               return 0;
-       }
 
-       res = ast_db_put(family, key, val);
+       res = ast_db_put(family, key, val ? val : "");
        if (res) {
                astman_send_error(s, m, "Failed to update entry");
        } else {

diff --git a/manager.c b/manager.c
index f884a9d2445d8dc5c63abf33aff0f41e21ef2c6e..bddd2bc6a09f9505f5c5ba2482453b4619452cc4 100644 (file)
--- a/manager.c
+++ b/manager.c
@@ -692,11 +692,6 @@ static int action_setvar(struct mansession *s, 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) {
@@ -705,7 +700,7 @@ static int action_setvar(struct mansession *s, struct message *m)
                }
        }
        
-       pbx_builtin_setvar_helper(c, varname, varval);
+       pbx_builtin_setvar_helper(c, varname, varval ? varval : "");
          
        if (c)
                ast_mutex_unlock(&c->lock);