summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryasuoka <yasuoka@openbsd.org>2014-07-12 19:34:31 +0000
committeryasuoka <yasuoka@openbsd.org>2014-07-12 19:34:31 +0000
commit74d2d36c8736bcaf133d5001a21eddd84795c610 (patch)
tree37b2c24d11260f443fead95267ef83bd1058cc1e
parentIn openssl_startup(), call SSL_library_init() and SSL_load_error_strings(). (diff)
downloadwireguard-openbsd-74d2d36c8736bcaf133d5001a21eddd84795c610.tar.xz
wireguard-openbsd-74d2d36c8736bcaf133d5001a21eddd84795c610.zip
Fix error in previous.
-rw-r--r--usr.sbin/npppd/npppd/privsep.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/npppd/npppd/privsep.c b/usr.sbin/npppd/npppd/privsep.c
index c1bf824945b..6977644a2ac 100644
--- a/usr.sbin/npppd/npppd/privsep.c
+++ b/usr.sbin/npppd/npppd/privsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: privsep.c,v 1.10 2014/07/12 14:04:18 yasuoka Exp $ */
+/* $OpenBSD: privsep.c,v 1.11 2014/07/12 19:34:31 yasuoka Exp $ */
/*
* Copyright (c) 2010 Yasuoka Masahiko <yasuoka@openbsd.org>
@@ -542,11 +542,11 @@ privsep_common_resp(void)
static void
privsep_priv_main(int sock)
{
- struct imsgbuf imsg;
+ struct imsgbuf ibuf;
- imsg_init(&imsg, sock);
- privsep_priv_dispatch_imsg(&imsg);
- imsg_clear(&imsg);
+ imsg_init(&ibuf, sock);
+ privsep_priv_dispatch_imsg(&ibuf);
+ imsg_clear(&ibuf);
close(sock);
exit(EXIT_SUCCESS);
@@ -930,12 +930,12 @@ imsg_read_and_get(struct imsgbuf *ibuf, struct imsg *imsg)
ssize_t n;
for (;;) {
- if ((n = imsg_read(&privsep_ibuf)) <= 0) {
+ if ((n = imsg_read(ibuf)) <= 0) {
if (n == 0 && (errno == EAGAIN || errno == EINTR))
continue;
return (-1);
}
- if ((n = imsg_get(&privsep_ibuf, imsg)) < 0)
+ if ((n = imsg_get(ibuf, imsg)) < 0)
return (-1);
if (n == 0)
continue;