SOURCES: sysklogd-security.patch - reverted; changing patch order ...

[glen]

Author: glen                         Date: Mon Aug  1 16:10:09 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted; changing patch order makes it apply cleanly

---- Files affected:
SOURCES:
   sysklogd-security.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/sysklogd-security.patch
diff -u SOURCES/sysklogd-security.patch:1.2 SOURCES/sysklogd-security.patch:1.3
--- SOURCES/sysklogd-security.patch:1.2	Mon Aug  1 18:06:34 2005
+++ SOURCES/sysklogd-security.patch	Mon Aug  1 18:10:04 2005
@@ -117,6 +117,20 @@
  		    case 'i':		/* Reload module symbols. */
  			SignalDaemon(SIGUSR1);
  			return(0);
+@@ -1161,6 +1193,13 @@
+ 	if (symbol_lookup) {
+ 		InitKsyms(symfile);
+ 		InitMsyms();
++	}
++
++	/* Drop privileges if a user name was specified on the command line */
++	if (drop_privileges) {
++		setgroups(0, NULL);
++		setgid(server_gid);
++		setuid(server_uid);
+ 	}
+ 
+         /* The main loop. */
 diff -Nur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
 --- sysklogd-1.4.1.orig/sysklogd.8	Sun Mar 11 20:35:51 2001
 +++ sysklogd-1.4.1/sysklogd.8	Fri Mar 16 14:40:16 2001
@@ -238,19 +252,3 @@
  	exit(1);
  }
  
---- ./klogd.c~	2005-08-01 18:53:54.000000000 +0300
-+++ ./klogd.c	2005-08-01 19:04:26.000000000 +0300
-@@ -1204,6 +1204,13 @@
- 		}
- 	}
- 
-+	/* Drop privileges if a user name was specified on the command line */
-+	if (drop_privileges) {
-+		setgroups(0, NULL);
-+		setgid(server_gid);
-+		setuid(server_uid);
-+	}
-+
-         /* The main loop. */
- 	while (1)
- 	{
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sysklogd-security.patch?r1=1.2&r2=1.3&f=u