summaryrefslogtreecommitdiffstats
path: root/zebra/ioctl_solaris.c
diff options
context:
space:
mode:
authorajs <ajs>2005-01-29 17:07:40 +0000
committerajs <ajs>2005-01-29 17:07:40 +0000
commit12634f509562dae34e02ae010603f24a22aa1361 (patch)
tree513fd0223df8660139e74e4dcbeef7da5bc12b78 /zebra/ioctl_solaris.c
parent11f42e102c92152e519b828216d96c262a12020c (diff)
downloadquagga-12634f509562dae34e02ae010603f24a22aa1361.tar.bz2
quagga-12634f509562dae34e02ae010603f24a22aa1361.tar.xz
2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* if_ioctl_solaris.c: (interface_list_ioctl) Save errno before calling zserv_privs.change. * ioctl{,_solaris}.c: (if_ioctl,if_ioctl_ipv6) Save errno before calling zserv_privs.change. * ipforward_solaris.c: (solaris_nd) Save errno before calling zserv_privs.change. * irdp_main.c: (irdp_sock_init) Save errno before calling zserv_privs.change. [backport candidate]
Diffstat (limited to 'zebra/ioctl_solaris.c')
-rw-r--r--zebra/ioctl_solaris.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c
index 8ebd0f41..5ec327ac 100644
--- a/zebra/ioctl_solaris.c
+++ b/zebra/ioctl_solaris.c
@@ -46,8 +46,8 @@ int
if_ioctl (u_long request, caddr_t buffer)
{
int sock;
- int ret = 0;
- int err = 0;
+ int ret;
+ int err;
if (zserv_privs.change(ZPRIVS_RAISE))
zlog (NULL, LOG_ERR, "Can't raise privileges");
@@ -61,15 +61,12 @@ if_ioctl (u_long request, caddr_t buffer)
exit (1);
}
- ret = ioctl (sock, request, buffer);
+ if ((ret = ioctl (sock, request, buffer)) < 0)
+ err = errno;
if (zserv_privs.change(ZPRIVS_LOWER))
zlog (NULL, LOG_ERR, "Can't lower privileges");
- if (ret < 0)
- {
- err = errno;
- }
close (sock);
if (ret < 0)
@@ -86,8 +83,8 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
{
#ifdef HAVE_IPV6
int sock;
- int ret = 0;
- int err = 0;
+ int ret;
+ int err;
if (zserv_privs.change(ZPRIVS_RAISE))
zlog (NULL, LOG_ERR, "Can't raise privileges");
@@ -101,15 +98,12 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
exit (1);
}
- ret = ioctl (sock, request, buffer);
+ if ((ret = ioctl (sock, request, buffer)) < 0)
+ err = errno;
if (zserv_privs.change(ZPRIVS_LOWER))
zlog (NULL, LOG_ERR, "Can't lower privileges");
- if (ret < 0)
- {
- err = errno;
- }
close (sock);
if (ret < 0)