1 files changed, 76 insertions, 14 deletions
diff --git a/security/skip/files/patch-bz b/security/skip/files/patch-bz
index 33f2b30799e5..8636e69adc25 100644
--- a/security/skip/files/patch-bz
+++ b/security/skip/files/patch-bz
@@ -1,14 +1,76 @@
-diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/man/skipd.conf.4 skipsrc-1.0/skip/man/skipd.conf.4
---- skipsrc-1.0.orig/skip/man/skipd.conf.4	Fri Oct 25 13:12:57 1996
-+++ skipsrc-1.0/skip/man/skipd.conf.4	Wed Nov 26 20:10:30 1997
-@@ -85,9 +85,4 @@
- \fIskipd.conf\fP options may be set with the \fIskip_conf\fP command.
- .SH FILES
- .P
--.SH Solaris 2.x systems:
--/etc/opt/SUNWicg/skip/skipd.conf
--.P
--.SH Other systems:
--.P
--/etc/skip/skipd.conf
-+@@PREFIX@@/etc/skip/skipd.conf
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/keymgrd/skipd.C work.new/skip/keymgrd/skipd.C
+--- skipsrc-1.0.orig/skip/keymgrd/skipd.C	Fri Oct 25 13:12:54 1996
++++ work.new/skip/keymgrd/skipd.C	Mon Mar  8 21:33:38 1999
+@@ -48,6 +48,7 @@
+  * System includes
+  */
+ #include <skip_os.h>
++#include <err.h>
+ 
+ /*
+  * SKIP includes
+@@ -84,8 +85,9 @@
+ {
+ 	int c;
+ 	int errflag = 0;
++	int noFork = 0;
+ 
+-	while ((c = getopt(argc, argv, "vV?")) != EOF) {
++	while ((c = getopt(argc, argv, "nvV?")) != EOF) {
+ 		switch(c) {
+ 		case 'v':
+ 			verbose = 1;
+@@ -95,6 +97,9 @@
+ 			verbose = 2;
+ 			break;
+ 
++		case 'n':
++			noFork = 1;
++			break;
+ 		case '?':
+ 		default:
+ 			errflag++;
+@@ -106,34 +111,18 @@
+ 		exit(1);
+ 	}
+ 
++	if (!noFork)
+ 	{
+-		extern FILE *skip_log_fp;
+-
+-		skip_log_fp = fopen("/var/log/skipd.log", "w+");
++		extern int skip_log_syslog;
+ 
+-		// if open fails, skip_log will default to stdout/stderr
++		/* output to syslog */
++		openlog("skipd", 0, LOG_DAEMON);
++		skip_log_syslog = 1;
++
++		/* become a background daemon */
++		if (daemon(0, 0))
++			err(1, "daemon");
+ 	}
+-
+-
+-//  put ourselves into the background
+-
+-	switch (fork()) {
+-	case -1:
+-		skip_log(SKIP_ERROR, "fork failed");
+-		exit(1);
+-
+-	case 0:
+-		break;
+-
+-	default:
+-		exit(0);
+-	}
+-
+-	setsid();
+-
+-	freopen("/dev/null", "r", stdin);
+-	freopen("/dev/null", "w", stdout);
+-	freopen("/dev/null", "w", stderr);
+ 
+ 	skip_init();
+ 	skipd_loop();