diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
| commit | 2d8270596a085e7a815cebaea21e17cba9e26111 (patch) | |
| tree | f9a559f654e7d704ecacc9dadedbe01868615610 /lib/agentx.c | |
| parent | 625e016d14073dfefb69c0fa36cddb81fbe034ed (diff) | |
| parent | 905c15079393987f8cfdd55c30e7e1a3248c8c48 (diff) | |
Merge remote-tracking branch 'frr/master' into newline-redux
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/agentx.c')
| -rw-r--r-- | lib/agentx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/agentx.c b/lib/agentx.c index a2e737fed0..30c03e6cfb 100644 --- a/lib/agentx.c +++ b/lib/agentx.c @@ -197,7 +197,7 @@ DEFUN (no_agentx, { if (!agentx_enabled) return CMD_SUCCESS; vty_out (vty, "SNMP AgentX support cannot be disabled once enabled\n"); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } void |