Attachment 1215 Details for Bug 8346 – патч на dhcp-3.0.1rc14-owl-alt-drop_priv.patch

[patch] патч на dhcp-3.0.1rc14-owl-alt-drop_priv.patch

patch.patch (text/plain), 2.09 KB, created by Alex Moskalenko on 2005-10-26 15:16:56 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Moskalenko

Created: 2005-10-26 15:16:56 MSD

Size: 2.09 KB

patch

obsolete

>--- dhcp-3.0.1rc14-owl-alt-drop_priv.patch.orig	2005-10-26 13:36:37 +0400
>+++ dhcp-3.0.1rc14-owl-alt-drop_priv.patch	2005-10-26 13:55:00 +0400
>@@ -219,7 +219,7 @@
>  
>  static void usage PROTO ((void));
>  
>-@@ -195,6 +201,32 @@
>+@@ -193,6 +199,32 @@
>  	omapi_object_dereference (&listener, MDL);
>  }
>  
>@@ -252,7 +252,7 @@
>  int main (argc, argv, envp)
>  	int argc;
>  	char **argv, **envp;
>-@@ -228,6 +260,9 @@
>+@@ -226,6 +258,9 @@
>  	char *traceoutfile = (char *)0;
>  #endif
>  
>@@ -262,7 +262,7 @@
>  	/* Make sure we have stdin, stdout and stderr. */
>  	status = open ("/dev/null", O_RDWR);
>  	if (status == 0)
>-@@ -254,6 +289,7 @@
>+@@ -252,6 +287,7 @@
>  	dhcp_common_objects_setup ();
>  
>  	/* Initially, log errors to stderr as well as to syslogd. */
>@@ -270,7 +270,7 @@
>  #ifdef SYSLOG_4_2
>  	openlog ("dhcpd", LOG_NDELAY);
>  	log_priority = DHCPD_LOG_FACILITY;
>-@@ -322,6 +358,14 @@
>+@@ -320,6 +356,14 @@
>  		} else if (!strcmp (argv [i], "-q")) {
>  			quiet = 1;
>  			quiet_interface_discovery = 1;
>@@ -285,7 +285,7 @@
>  		} else if (!strcmp (argv [i], "--version")) {
>  			log_info ("isc-dhcpd-%s", DHCP_VERSION);
>  			exit (0);
>-@@ -497,12 +541,6 @@
>+@@ -495,12 +539,6 @@
>  
>  	group_write_hook = group_writer;
>  
>@@ -298,7 +298,15 @@
>  	/* Discover all the network interfaces and initialize them. */
>  	discover_interfaces (DISCOVER_SERVER);
>  
>-@@ -556,6 +594,11 @@
>+@@ -521,7 +559,6 @@
>+ #if defined (TRACING)
>+ 	trace_seed_stash (trace_srandom, seed + cur_time);
>+ #endif
>+-	postdb_startup ();
>+ 
>+ #ifndef DEBUG
>+ 	if (daemon) {
>+@@ -554,6 +591,11 @@
>  			log_fatal ("There's already a DHCP server running.");
>  	}
>  
>@@ -310,7 +318,7 @@
>  	/* If we were requested to log to stdout on the command line,
>  	   keep doing so; otherwise, stop. */
>  	if (log_perror == -1)
>-@@ -584,7 +627,16 @@
>+@@ -582,7 +624,17 @@
>  			close (i);
>  			pidfilewritten = 1;
>  		}
>@@ -323,11 +331,12 @@
> +
> +	if (lftest)
> +		exit (0);
>++	postdb_startup ();
> +	
>  #endif /* !DEBUG */
>  
>  #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
>-@@ -877,8 +929,9 @@
>+@@ -875,8 +927,9 @@
>  	log_info (copyright);
>  	log_info (arr);
>

Actions: View | Diff

Attachments on bug 8346: 1215 | 1216 | 1217