diff options
| author | denis <denis@cvs.openbsd.org> | 2018-11-10 11:19:02 +0000 |
|---|---|---|
| committer | denis <denis@cvs.openbsd.org> | 2018-11-10 11:19:02 +0000 |
| commit | a6e22747a35127c258e750a9cab4fd5586a41b3f (patch) | |
| tree | 505fc05584b7add9fe3b7c9d3346ee38bee13c09 /usr.sbin | |
| parent | aa113a0f213d442d7f43f69dc137a1147e033bd8 (diff) | |
fix error message when querying a non-existent table
OK claudio@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 8 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index bf4232212ff..d501ca081c1 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.352 2018/11/04 14:34:00 claudio Exp $ */ +/* $OpenBSD: bgpd.h,v 1.353 2018/11/10 11:19:01 denis Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -509,7 +509,8 @@ enum ctl_results { CTL_RES_PENDING, CTL_RES_NOMEM, CTL_RES_BADPEER, - CTL_RES_BADSTATE + CTL_RES_BADSTATE, + CTL_RES_NOSUCHRIB }; /* needed for session.h parse prototype */ @@ -1414,7 +1415,8 @@ static const char * const ctl_res_strerror[] = { "previous reload still running", "out of memory", "not a cloned peer", - "peer still active, down peer first" + "peer still active, down peer first", + "no such RIB" }; static const char * const timernames[] = { diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 32f38c3eaaa..26b06cfa6ed 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.448 2018/11/08 09:59:45 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.449 2018/11/10 11:19:01 denis Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -2316,7 +2316,7 @@ rde_dump_ctx_new(struct ctl_show_rib_request *req, pid_t pid, rid = RIB_ADJ_OUT; } else if ((rid = rib_find(req->rib)) == RIB_NOTFOUND) { log_warnx("rde_dump_ctx_new: no such rib %s", req->rib); - error = CTL_RES_NOSUCHPEER; + error = CTL_RES_NOSUCHRIB; imsg_compose(ibuf_se_ctl, IMSG_CTL_RESULT, 0, pid, -1, &error, sizeof(error)); free(ctx); |