diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-01-12 18:34:28 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-01-12 18:34:28 +0000 |
| commit | 368ecf13bf81d00b5b50d71a849116addf59a3bb (patch) | |
| tree | c3d54f91be0e9cde208679cf12fb01987aef508a /main | |
| parent | 7d606d87bfb7eeacda9fcc3575f9383d29731d2e (diff) | |
AMI: Revert non-backwards compatible changes from earlier commit.
* Reverted the change to astman_send_listack() to not use the listflag
parameter and always set the value to "Start" so the start capitalization
is consistent. Unfortunately changing the case of a returned value is not
a backward compatible change so for now FAXSessions is going to have to
remain inconsistent with all of the other AMI list actions.
* Reverted the minor protocol error fix in action_getconfig() when no
requested categories are found. Each line needs to be formatted as
"Header: text".
Caught by the testsuite.
ASTERISK-24049
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@430528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c index 3e4146146..29a8a83e9 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2913,7 +2913,7 @@ static void astman_start_ack(struct mansession *s, const struct message *m) void astman_send_listack(struct mansession *s, const struct message *m, char *msg, char *listflag) { - astman_send_response_full(s, m, "Success", msg, "Start"); + astman_send_response_full(s, m, "Success", msg, listflag); } void astman_send_list_complete_start(struct mansession *s, const struct message *m, const char *event_name, int count) @@ -3358,7 +3358,7 @@ static int action_getconfig(struct mansession *s, const struct message *m) } if (!ast_strlen_zero(category) && catcount == 0) { /* TODO: actually, a config with no categories doesn't even get loaded */ - astman_append(s, "Error: No categories found\r\n"); + astman_append(s, "No categories found\r\n"); } ast_config_destroy(cfg); @@ -3396,7 +3396,7 @@ static int action_listcategories(struct mansession *s, const struct message *m) } if (catcount == 0) { /* TODO: actually, a config with no categories doesn't even get loaded */ - astman_append(s, "Error: No categories found\r\n"); + astman_append(s, "Error: no categories found\r\n"); } ast_config_destroy(cfg); |