- Save parent pid and check current pid against it upon entry to

terminate(). This makes doubly sure we don't trip the SIGTERM handler
  in a child process. Suggested by: phk.

- It's int main(argc, argv), not void main(argc, argv), gosh darn it.

This commit is contained in:

Bill Paul

1997-01-12 02:48:09 +00:00

parent 9880dddc9e

commit 24ec979b41

1 changed files with 10 additions and 1 deletions

									
										usr.sbin/ypbind/ypbind.c
									
		+10
		-1
	
												View File
												
				@@ -112,6 +112,7 @@ static struct _dom_binding *broad_domain;

				#define YPSET_ALL	2

				int ypsetmode = YPSET_NO;

				int ypsecuremode = 0;

				int ppid;

				/*

				 * Special restricted mode variables: when in restricted mode, only the

				@@ -349,6 +350,9 @@ int sig;

					struct _dom_binding *ypdb;

					char path[MAXPATHLEN];

					if (ppid != getpid())

						exit(0);

					for(ypdb=ypbindlist; ypdb; ypdb=ypdb->dom_pnext) {

						close(ypdb->dom_lockfd);

						if (ypdb->dom_broadcast_pid)

				@@ -363,7 +367,7 @@ int sig;

					exit(0);

				}

				void

				int

				main(argc, argv)

				int argc;

				char **argv;

				@@ -466,6 +470,8 @@ char **argv;

					signal(SIGCHLD, reaper);

					signal(SIGTERM, terminate);

					ppid = getpid(); /* Remember who we are. */

					openlog(argv[0], LOG_PID, LOG_DAEMON);

					/* Kick off the default domain */

				@@ -497,6 +503,9 @@ char **argv;

							break;

						}

					}

					/* NOTREACHED */

					exit(1);

				}

				void