diff options
| author | Ricardo Mestre <mestre@cvs.openbsd.org> | 2017-08-31 06:50:57 +0000 |
|---|---|---|
| committer | Ricardo Mestre <mestre@cvs.openbsd.org> | 2017-08-31 06:50:57 +0000 |
| commit | 006c1b8973e8278b0a4b2ec6ec968b3fb8fdcdac (patch) | |
| tree | d376e55c18aee76b8fd01aa4a55b78e5065a18f8 /sbin/nfsd/nfsd.c | |
| parent | f1471c317695454d15fe00f0aca9ce372c286701 (diff) | |
Unbreak DEBUG on nfsd(8) by changing the syslog macro. With this change a few
of the syslog calls also needed to change since fprintf(3) doesn't know about
%m and in these cases strerror(3) was added.
Caught with cppcheck
"looks good" to otto@
Diffstat (limited to 'sbin/nfsd/nfsd.c')
| -rw-r--r-- | sbin/nfsd/nfsd.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c index 057b5d583e8..73508290882 100644 --- a/sbin/nfsd/nfsd.c +++ b/sbin/nfsd/nfsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsd.c,v 1.36 2016/06/07 01:29:38 tedu Exp $ */ +/* $OpenBSD: nfsd.c,v 1.37 2017/08/31 06:50:56 mestre Exp $ */ /* $NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft Exp $ */ /* @@ -64,7 +64,11 @@ /* Global defs */ #ifdef DEBUG -#define syslog(e, s) fprintf(stderr,(s)) +#define syslog(e, s, ...) \ +do { \ + fprintf(stderr, (s), ##__VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) int debug = 1; #else int debug = 0; @@ -163,13 +167,15 @@ main(int argc, char *argv[]) if (udpflag && (!pmap_set(RPCPROG_NFS, 2, IPPROTO_UDP, NFS_PORT) || !pmap_set(RPCPROG_NFS, 3, IPPROTO_UDP, NFS_PORT))) { - syslog(LOG_ERR, "can't register with portmap for UDP (%m)."); + syslog(LOG_ERR, "can't register with portmap for UDP (%s).", + strerror(errno)); return (1); } if (tcpflag && (!pmap_set(RPCPROG_NFS, 2, IPPROTO_TCP, NFS_PORT) || !pmap_set(RPCPROG_NFS, 3, IPPROTO_TCP, NFS_PORT))) { - syslog(LOG_ERR, "can't register with portmap for TCP (%m)."); + syslog(LOG_ERR, "can't register with portmap for TCP (%s).", + strerror(errno)); return (1); } return (0); @@ -182,7 +188,7 @@ main(int argc, char *argv[]) for (i = 0; i < nfsdcnt; i++) { switch (fork()) { case -1: - syslog(LOG_ERR, "fork: %m"); + syslog(LOG_ERR, "fork: %s", strerror(errno)); return (1); case 0: break; @@ -193,7 +199,7 @@ main(int argc, char *argv[]) setproctitle("server"); nsd.nsd_nfsd = NULL; if (nfssvc(NFSSVC_NFSD, &nsd) < 0) { - syslog(LOG_ERR, "nfssvc: %m"); + syslog(LOG_ERR, "nfssvc: %s", strerror(errno)); return (1); } return (0); @@ -240,7 +246,7 @@ main(int argc, char *argv[]) } if (setsockopt(tcpsock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) - syslog(LOG_ERR, "setsockopt SO_REUSEADDR: %m"); + syslog(LOG_ERR, "setsockopt SO_REUSEADDR: %s", strerror(errno)); memset(&inetaddr, 0, sizeof inetaddr); inetaddr.sin_family = AF_INET; inetaddr.sin_addr.s_addr = INADDR_ANY; @@ -284,7 +290,7 @@ main(int argc, char *argv[]) if (connect_type_cnt > 1) { ret = poll(&pfd, 1, INFTIM); if (ret < 1) { - syslog(LOG_ERR, "poll failed: %m"); + syslog(LOG_ERR, "poll failed: %s", strerror(errno)); return (1); } @@ -297,14 +303,14 @@ main(int argc, char *argv[]) if (errno == EWOULDBLOCK || errno == EINTR || errno == ECONNABORTED) continue; - syslog(LOG_ERR, "accept failed: %m"); + syslog(LOG_ERR, "accept failed: %s", strerror(errno)); return (1); } memset(inetpeer.sin_zero, 0, sizeof(inetpeer.sin_zero)); if (setsockopt(msgsock, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0) syslog(LOG_ERR, - "setsockopt SO_KEEPALIVE: %m"); + "setsockopt SO_KEEPALIVE: %s", strerror(errno)); nfsdargs.sock = msgsock; nfsdargs.name = (caddr_t)&inetpeer; nfsdargs.namelen = sizeof(inetpeer); |