mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-09 17:06:28 +00:00
2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* daemon.c: (daemon) Replace perror with zlog_err. * vty.c: (vty_serv_un) Replace perror with zlog_err. * ripd.c: (rip_create_socket) Replace perror with zlog_err. * ioctl.c: (if_ioctl,if_ioctl_ipv6,if_get_flags) Replace perror with zlog_err. * ioctl_solaris.c: (if_ioctl,if_ioctl_ipv6) Replace perror with zlog_err.
This commit is contained in:
parent
656b4eeec1
commit
6a52d0d155
@ -1,3 +1,8 @@
|
|||||||
|
2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
||||||
|
|
||||||
|
* daemon.c: (daemon) Replace perror with zlog_err.
|
||||||
|
* vty.c: (vty_serv_un) Replace perror with zlog_err.
|
||||||
|
|
||||||
2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
||||||
|
|
||||||
* buffer.h: Fix comment on buffer_getstr to reflect that it now
|
* buffer.h: Fix comment on buffer_getstr to reflect that it now
|
||||||
|
@ -35,7 +35,7 @@ daemon (int nochdir, int noclose)
|
|||||||
/* In case of fork is error. */
|
/* In case of fork is error. */
|
||||||
if (pid < 0)
|
if (pid < 0)
|
||||||
{
|
{
|
||||||
perror ("fork");
|
zlog_err ("fork failed: %s", safe_strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ daemon (int nochdir, int noclose)
|
|||||||
|
|
||||||
if (pid == -1)
|
if (pid == -1)
|
||||||
{
|
{
|
||||||
perror ("setsid");
|
zlog_err ("setsid failed: %s", safe_strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1824,7 +1824,7 @@ vty_serv_un (const char *path)
|
|||||||
sock = socket (AF_UNIX, SOCK_STREAM, 0);
|
sock = socket (AF_UNIX, SOCK_STREAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
perror ("sock");
|
zlog_err("Cannot create unix stream socket: %s", safe_strerror(errno));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1841,7 +1841,7 @@ vty_serv_un (const char *path)
|
|||||||
ret = bind (sock, (struct sockaddr *) &serv, len);
|
ret = bind (sock, (struct sockaddr *) &serv, len);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
{
|
{
|
||||||
perror ("bind");
|
zlog_err("Cannot bind path %s: %s", path, safe_strerror(errno));
|
||||||
close (sock); /* Avoid sd leak. */
|
close (sock); /* Avoid sd leak. */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1849,7 +1849,7 @@ vty_serv_un (const char *path)
|
|||||||
ret = listen (sock, 5);
|
ret = listen (sock, 5);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
{
|
{
|
||||||
perror ("listen");
|
zlog_err("listen(fd %d) failed: %s", sock, safe_strerror(errno));
|
||||||
close (sock); /* Avoid sd leak. */
|
close (sock); /* Avoid sd leak. */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
||||||
|
|
||||||
|
* ripd.c: (rip_create_socket) Replace perror with zlog_err.
|
||||||
|
|
||||||
2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
||||||
|
|
||||||
* ripd.c: (rip_create_socket) Save errno before calling
|
* ripd.c: (rip_create_socket) Save errno before calling
|
||||||
|
@ -1985,7 +1985,7 @@ rip_create_socket ()
|
|||||||
sock = socket (AF_INET, SOCK_DGRAM, 0);
|
sock = socket (AF_INET, SOCK_DGRAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
perror ("socket");
|
zlog_err("Cannot create UDP socket: %s", safe_strerror(errno));
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2005-01-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
||||||
|
|
||||||
|
* ioctl.c: (if_ioctl,if_ioctl_ipv6,if_get_flags) Replace perror with
|
||||||
|
zlog_err.
|
||||||
|
* ioctl_solaris.c: (if_ioctl,if_ioctl_ipv6) Replace perror with
|
||||||
|
zlog_err.
|
||||||
|
|
||||||
2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
|
||||||
|
|
||||||
* if_ioctl_solaris.c: (interface_list_ioctl) Save errno before calling
|
* if_ioctl_solaris.c: (interface_list_ioctl) Save errno before calling
|
||||||
|
@ -54,9 +54,10 @@ if_ioctl (u_long request, caddr_t buffer)
|
|||||||
sock = socket (AF_INET, SOCK_DGRAM, 0);
|
sock = socket (AF_INET, SOCK_DGRAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
|
int save_errno = errno;
|
||||||
if (zserv_privs.change(ZPRIVS_LOWER))
|
if (zserv_privs.change(ZPRIVS_LOWER))
|
||||||
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
||||||
perror ("socket");
|
zlog_err("Cannot create UDP socket: %s", safe_strerror(save_errno));
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
if ((ret = ioctl (sock, request, buffer)) < 0)
|
if ((ret = ioctl (sock, request, buffer)) < 0)
|
||||||
@ -86,9 +87,11 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
|
|||||||
sock = socket (AF_INET6, SOCK_DGRAM, 0);
|
sock = socket (AF_INET6, SOCK_DGRAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
|
int save_errno = errno;
|
||||||
if (zserv_privs.change(ZPRIVS_LOWER))
|
if (zserv_privs.change(ZPRIVS_LOWER))
|
||||||
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
||||||
perror ("socket");
|
zlog_err("Cannot create IPv6 datagram socket: %s",
|
||||||
|
safe_strerror(save_errno));
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -343,7 +346,7 @@ if_get_flags (struct interface *ifp)
|
|||||||
ret = if_ioctl (SIOCGIFFLAGS, (caddr_t) &ifreq);
|
ret = if_ioctl (SIOCGIFFLAGS, (caddr_t) &ifreq);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
{
|
{
|
||||||
perror ("ioctl");
|
zlog_err("if_ioctl(SIOCGIFFLAGS) failed: %s", safe_strerror(errno));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,9 +55,10 @@ if_ioctl (u_long request, caddr_t buffer)
|
|||||||
sock = socket (AF_INET, SOCK_DGRAM, 0);
|
sock = socket (AF_INET, SOCK_DGRAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
|
int save_errno = errno;
|
||||||
if (zserv_privs.change(ZPRIVS_LOWER))
|
if (zserv_privs.change(ZPRIVS_LOWER))
|
||||||
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
||||||
perror ("socket");
|
zlog_err("Cannot create UDP socket: %s", safe_strerror(save_errno));
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,9 +93,11 @@ if_ioctl_ipv6 (u_long request, caddr_t buffer)
|
|||||||
sock = socket (AF_INET6, SOCK_DGRAM, 0);
|
sock = socket (AF_INET6, SOCK_DGRAM, 0);
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
{
|
{
|
||||||
|
int save_errno = errno;
|
||||||
if (zserv_privs.change(ZPRIVS_LOWER))
|
if (zserv_privs.change(ZPRIVS_LOWER))
|
||||||
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
||||||
perror ("socket");
|
zlog_err("Cannot create IPv6 datagram socket: %s",
|
||||||
|
safe_strerror(save_errno));
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user