summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-10-10 23:10:11 +0000
committerTerry Wilson <twilson@digium.com>2011-10-10 23:10:11 +0000
commit15fd1e375cd9c047cbad8d60798e9abdc4a64daa (patch)
treefeb071ca0047f5b8dd859f460fa78b82f17597c5
parentcf8db2413254449cb17d22607ab423e7f01ef3d3 (diff)
Return error when no rows are deleted for AMI DBDelTree
(closes issue AST-654) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340224 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--UPGRADE.txt4
-rw-r--r--main/db.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 05df0a1c4..292497fd2 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -36,6 +36,10 @@ Configuration Files:
- dnsmgr.conf
- dsp.conf
+AMI:
+ - DBDelTree now correctly returns an error when 0 rows are deleted just as
+ the DBDel action does.
+
SIP
===
- A new option "tonezone" for setting default tonezone for the channel driver
diff --git a/main/db.c b/main/db.c
index 67a8ccdb7..0a996f846 100644
--- a/main/db.c
+++ b/main/db.c
@@ -840,7 +840,7 @@ static int manager_dbdeltree(struct mansession *s, const struct message *m)
else
res = ast_db_deltree(family, NULL);
- if (res < 0)
+ if (res <= 0)
astman_send_error(s, m, "Database entry not found");
else
astman_send_ack(s, m, "Key tree deleted successfully");