Page MenuHomeFreeBSD
Files F144636449

D46442.1775936782.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D46442.1775936782.diff
View Options

diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -550,18 +550,24 @@
nfsd_exit(1);
}
nconf_udp = getnetconfigent("udp");
- if (nconf_udp == NULL)
- err(1, "getnetconfigent udp failed");
+ if (nconf_udp == NULL) {
+ syslog(LOG_ERR, "getnetconfigent udp failed");
+ nfsd_exit(1);
+ }
nb_udp.buf = ai_udp->ai_addr;
nb_udp.len = nb_udp.maxlen = ai_udp->ai_addrlen;
if (nfs_minvers == NFS_VER2)
if (!rpcb_set(NFS_PROGRAM, 2, nconf_udp,
- &nb_udp))
- err(1, "rpcb_set udp failed");
+ &nb_udp)) {
+ syslog(LOG_ERR, "rpcb_set udp failed");
+ nfsd_exit(1);
+ }
if (nfs_minvers <= NFS_VER3)
if (!rpcb_set(NFS_PROGRAM, 3, nconf_udp,
- &nb_udp))
- err(1, "rpcb_set udp failed");
+ &nb_udp)) {
+ syslog(LOG_ERR, "rpcb_set udp failed");
+ nfsd_exit(1);
+ }
freeaddrinfo(ai_udp);
}
}
@@ -624,20 +630,26 @@
nfsd_exit(1);
}
nconf_udp6 = getnetconfigent("udp6");
- if (nconf_udp6 == NULL)
- err(1, "getnetconfigent udp6 failed");
+ if (nconf_udp6 == NULL) {
+ syslog(LOG_ERR, "getnetconfigent udp6 failed");
+ nfsd_exit(1);
+ }
nb_udp6.buf = ai_udp6->ai_addr;
nb_udp6.len = nb_udp6.maxlen = ai_udp6->ai_addrlen;
if (nfs_minvers == NFS_VER2)
if (!rpcb_set(NFS_PROGRAM, 2, nconf_udp6,
- &nb_udp6))
- err(1,
+ &nb_udp6)) {
+ syslog(LOG_ERR,
"rpcb_set udp6 failed");
+ nfsd_exit(1);
+ }
if (nfs_minvers <= NFS_VER3)
if (!rpcb_set(NFS_PROGRAM, 3, nconf_udp6,
- &nb_udp6))
- err(1,
+ &nb_udp6)) {
+ syslog(LOG_ERR,
"rpcb_set udp6 failed");
+ nfsd_exit(1);
+ }
freeaddrinfo(ai_udp6);
}
}
@@ -696,18 +708,24 @@
nfsd_exit(1);
}
nconf_tcp = getnetconfigent("tcp");
- if (nconf_tcp == NULL)
- err(1, "getnetconfigent tcp failed");
+ if (nconf_tcp == NULL) {
+ syslog(LOG_ERR, "getnetconfigent tcp failed");
+ nfsd_exit(1);
+ }
nb_tcp.buf = ai_tcp->ai_addr;
nb_tcp.len = nb_tcp.maxlen = ai_tcp->ai_addrlen;
if (nfs_minvers == NFS_VER2)
if (!rpcb_set(NFS_PROGRAM, 2, nconf_tcp,
- &nb_tcp))
- err(1, "rpcb_set tcp failed");
+ &nb_tcp)) {
+ syslog(LOG_ERR, "rpcb_set tcp failed");
+ nfsd_exit(1);
+ }
if (nfs_minvers <= NFS_VER3)
if (!rpcb_set(NFS_PROGRAM, 3, nconf_tcp,
- &nb_tcp))
- err(1, "rpcb_set tcp failed");
+ &nb_tcp)) {
+ syslog(LOG_ERR, "rpcb_set tcp failed");
+ nfsd_exit(1);
+ }
freeaddrinfo(ai_tcp);
}
}
@@ -774,18 +792,24 @@
nfsd_exit(1);
}
nconf_tcp6 = getnetconfigent("tcp6");
- if (nconf_tcp6 == NULL)
- err(1, "getnetconfigent tcp6 failed");
+ if (nconf_tcp6 == NULL) {
+ syslog(LOG_ERR, "getnetconfigent tcp6 failed");
+ nfsd_exit(1);
+ }
nb_tcp6.buf = ai_tcp6->ai_addr;
nb_tcp6.len = nb_tcp6.maxlen = ai_tcp6->ai_addrlen;
if (nfs_minvers == NFS_VER2)
if (!rpcb_set(NFS_PROGRAM, 2, nconf_tcp6,
- &nb_tcp6))
- err(1, "rpcb_set tcp6 failed");
+ &nb_tcp6)) {
+ syslog(LOG_ERR, "rpcb_set tcp6 failed");
+ nfsd_exit(1);
+ }
if (nfs_minvers <= NFS_VER3)
if (!rpcb_set(NFS_PROGRAM, 3, nconf_tcp6,
- &nb_tcp6))
- err(1, "rpcb_set tcp6 failed");
+ &nb_tcp6)) {
+ syslog(LOG_ERR, "rpcb_set tcp6 failed");
+ nfsd_exit(1);
+ }
freeaddrinfo(ai_tcp6);
}
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 7:46 PM (15 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28326220
Default Alt Text
D46442.1775936782.diff (3 KB)

Event Timeline