d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if rpcbind is already running and print a warning.

Browse Source 
Fixes segfault if rpcbind is started up a second time.

Solution has been taken from mountd(8).

Reviewed by:	phk
Approved by:	re (rwatson)
This commit is contained in:
Martin Blapp 2002-12-10 08:47:18 +00:00
parent 11c419e165
commit b1c56f9c37
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=107725
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/rpcbind/rpcbind.c
View File

@ -61,6 +61,7 @@ static char sccsid[] = "@(#)rpcbind.c 1.35 89/04/21 Copyr 1984 Sun Micro";
#include <netinet/in.h>
#endif
#include <arpa/inet.h>
#include <fcntl.h>
#include <netdb.h>
#include <stdio.h>
#include <netconfig.h>
@ -82,6 +83,8 @@ rpcblist_ptr list_rbl; /* A list of version 3/4 rpcbind services */
/* who to suid to if -s is given */
#define RUN_AS "daemon"
#define RPCBINDDLOCK "/var/run/rpcbind.lock"
int runasdaemon = 0;
int insecure = 0;
int oldstyle_local = 0;
@ -90,6 +93,7 @@ int verboselog = 0;
char **hosts = NULL;
int nhosts = 0;
int on = 1;
int rpcbindlockfd;
#ifdef WARMSTART
/* Local Variable */
@ -123,6 +127,14 @@ main(int argc, char *argv[])
parseargs(argc, argv);
/* Check that another rpcbind isn't already running. */
if ((rpcbindlockfd = (open(RPCBINDDLOCK,
O_RDONLY|O_CREAT, 0444))) == -1)
err(1, "%s", RPCBINDDLOCK);
if(flock(rpcbindlockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK)
errx(1, "another rpcbind is already running. Aborting");
getrlimit(RLIMIT_NOFILE, &rl);
if (rl.rlim_cur < 128) {
if (rl.rlim_max <= 128)
@ -647,6 +659,7 @@ rbllist_add(rpcprog_t prog, rpcvers_t vers, struct netconfig *nconf,
static void
terminate(int dummy __unused)
{
close(rpcbindlockfd);
#ifdef WARMSTART
syslog(LOG_ERR,
"rpcbind terminating on signal. Restart with \"rpcbind -w\"");