automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71337 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 2 insertions, 11 deletions

diff --git a/db.c b/db.c
index 6d9e2b620..f3ea4f9c6 100644
--- 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 f884a9d24..bddd2bc6a 100644
--- 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);