summaryrefslogtreecommitdiffstats
path: root/openbsc/src/libctrl/control_cmd.c
diff options
context:
space:
mode:
authorDaniel Willmann <daniel@totalueberwachung.de>2011-07-28 21:38:51 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2011-08-22 23:45:56 +0200
commit9cc771bd3dcf7b9102486ca613da3e5c1fa78a16 (patch)
tree7c839cbb6f8c006d45a5c63843ecc0349c4d0424 /openbsc/src/libctrl/control_cmd.c
parent5763093285a8edfbf3b1e149d835484462ec4327 (diff)
libctrl: Don't overwrite error reply if the verify function sets one
Diffstat (limited to 'openbsc/src/libctrl/control_cmd.c')
-rw-r--r--openbsc/src/libctrl/control_cmd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openbsc/src/libctrl/control_cmd.c b/openbsc/src/libctrl/control_cmd.c
index 818c0d570..7a75e0e22 100644
--- a/openbsc/src/libctrl/control_cmd.c
+++ b/openbsc/src/libctrl/control_cmd.c
@@ -137,7 +137,9 @@ int ctrl_cmd_exec(vector vline, struct ctrl_cmd *command, vector node, void *dat
if (cmd_el->verify) {
if ((ret = cmd_el->verify(command, command->value, data))) {
ret = CTRL_CMD_ERROR;
- command->reply = "Value failed verification.";
+ /* If verify() set an appropriate error message, don't change it. */
+ if (!command->reply)
+ command->reply = "Value failed verification.";
goto out;
}
} else if (cmd_el->param) {