diff options
| author |   claudio <claudio@openbsd.org> | 2005-07-18 11:41:15 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2005-07-18 11:41:15 +0000 |
| commit | 4640accab44dfcc8693df78fd035d52ad8e2bccf (patch) | |
| tree | fbea44fd2f8bf2a0fdc869aa3de4dadb29233dab | |
| parent | add cvs_noexec in cvs_req_globalopt() swtich case 'n'; (diff) | |
| download | wireguard-openbsd-4640accab44dfcc8693df78fd035d52ad8e2bccf.tar.xz wireguard-openbsd-4640accab44dfcc8693df78fd035d52ad8e2bccf.zip | |
minor nits in session.c, add an additional nconf == NULL check and switch
some fatal()s to fatalx(). All done by dlg@. OK henning@
| -rw-r--r-- | usr.sbin/bgpd/session.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 5aa00eee3b6..23c37e6a752 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.229 2005/07/01 13:38:14 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.230 2005/07/18 11:41:15 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -2131,6 +2131,8 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) case IMSG_RECONF_LISTENER: if (idx != PFD_PIPE_MAIN) fatalx("reconf request not from parent"); + if (nconf == NULL) + fatalx("IMSG_RECONF_LISTENER but no config"); nla = imsg.data; TAILQ_FOREACH(la, conf->listen_addrs, entry) if (!la_cmp(la, nla)) @@ -2138,7 +2140,8 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) if (la == NULL) { if (nla->reconf != RECONF_REINIT) - fatal("king bula sez: expected REINIT"); + fatalx("king bula sez: " + "expected REINIT"); if ((nla->fd = imsg_get_fd(ibuf)) == -1) log_warnx("expected to receive fd for " @@ -2157,7 +2160,7 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) entry); } else { if (nla->reconf != RECONF_KEEP) - fatal("king bula sez: expected KEEP"); + fatalx("king bula sez: expected KEEP"); la->reconf = RECONF_KEEP; } |