Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bail out cleanly if kernel nfs server support is missing, instead of

Browse Source 
dumping core.
This commit is contained in:
dholland 2008-01-13 16:39:07 +00:00
parent b0fbe32ddf
commit c6fda077dc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/mountd/mountd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mountd.c,v 1.112 2007/01/16 17:32:04 hubertf Exp $ */ /* $NetBSD: mountd.c,v 1.113 2008/01/13 16:39:07 dholland Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else #else
__RCSID("$NetBSD: mountd.c,v 1.112 2007/01/16 17:32:04 hubertf Exp $"); __RCSID("$NetBSD: mountd.c,v 1.113 2008/01/13 16:39:07 dholland Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -229,6 +229,7 @@ static int countones __P((struct sockaddr *));
static int get_isoaddr __P((const char *, size_t, char *, struct grouplist *)); static int get_isoaddr __P((const char *, size_t, char *, struct grouplist *));
#endif #endif
static void bind_resv_port __P((int, sa_family_t, in_port_t)); static void bind_resv_port __P((int, sa_family_t, in_port_t));
static void no_nfs(int);
static struct exportlist *exphead; static struct exportlist *exphead;
static struct mountlist *mlhead; static struct mountlist *mlhead;
static struct grouplist *grphead; static struct grouplist *grphead;
@ -336,6 +337,7 @@ main(argc, argv)
else else
exname = _PATH_EXPORTS; exname = _PATH_EXPORTS;
openlog("mountd", LOG_PID | (debug ? LOG_PERROR : 0), LOG_DAEMON); openlog("mountd", LOG_PID | (debug ? LOG_PERROR : 0), LOG_DAEMON);
(void)signal(SIGSYS, no_nfs);
s = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); s = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
if (s < 0) if (s < 0)
@ -2618,3 +2620,11 @@ bind_resv_port(int sock, sa_family_t family, in_port_t port)
if (bindresvport_sa(sock, sa) == -1) if (bindresvport_sa(sock, sa) == -1)
syslog(LOG_ERR, "Cannot bind to reserved port %d (%m)", port); syslog(LOG_ERR, "Cannot bind to reserved port %d (%m)", port);
} }
/* ARGSUSED */
static void
no_nfs(int sig)
{
syslog(LOG_ERR, "kernel NFS support not present; exiting");
exit(1);
}