Additiona patch sent by MAINTAINER and forgot by me.

Submitted by:	Cyrille Lefevre <root@gits.dyndns.org>

5 files changed, 30 insertions, 15 deletions

diff --git a/net/isc-dhcp3-server/files/patch-dhclient.c b/net/isc-dhcp3-server/files/patch-dhclient.c
index b1f5599304aa..208c0dc23613 100644
--- a/net/isc-dhcp3-server/files/patch-dhclient.c
+++ b/net/isc-dhcp3-server/files/patch-dhclient.c
@@ -1,5 +1,5 @@
 --- client/dhclient.c.orig	Fri Mar 16 00:12:03 2001
-+++ client/dhclient.c	Thu Mar 22 02:49:59 2001
++++ client/dhclient.c	Thu Mar 22 14:57:19 2001
 @@ -78,6 +78,7 @@
  u_int16_t remote_port;
  int no_daemon;
@@ -56,13 +56,16 @@
  }
  
  isc_result_t find_class (struct class **c,
-@@ -1453,6 +1467,10 @@
+@@ -1453,6 +1467,13 @@
  	/* No leases were available, or what was available didn't work, so
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
 +	if (onetry) {
++		if (!quiet)
++			log_info ("Unable to obtain a lease on first try - %s.",
++				  
++				  "exiting");
 +		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
 +	}
  	log_info ("No working leases in persistent database - sleeping.");
  	script_init (client, "FAIL", (struct string_list *)0);
diff --git a/net/isc-dhcp3/files/patch-dhclient.c b/net/isc-dhcp3/files/patch-dhclient.c
index b1f5599304aa..208c0dc23613 100644
--- a/net/isc-dhcp3/files/patch-dhclient.c
+++ b/net/isc-dhcp3/files/patch-dhclient.c
@@ -1,5 +1,5 @@
 --- client/dhclient.c.orig	Fri Mar 16 00:12:03 2001
-+++ client/dhclient.c	Thu Mar 22 02:49:59 2001
++++ client/dhclient.c	Thu Mar 22 14:57:19 2001
 @@ -78,6 +78,7 @@
  u_int16_t remote_port;
  int no_daemon;
@@ -56,13 +56,16 @@
  }
  
  isc_result_t find_class (struct class **c,
-@@ -1453,6 +1467,10 @@
+@@ -1453,6 +1467,13 @@
  	/* No leases were available, or what was available didn't work, so
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
 +	if (onetry) {
++		if (!quiet)
++			log_info ("Unable to obtain a lease on first try - %s.",
++				  
++				  "exiting");
 +		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
 +	}
  	log_info ("No working leases in persistent database - sleeping.");
  	script_init (client, "FAIL", (struct string_list *)0);
diff --git a/net/isc-dhcp30-server/files/patch-dhclient.c b/net/isc-dhcp30-server/files/patch-dhclient.c
index b1f5599304aa..208c0dc23613 100644
--- a/net/isc-dhcp30-server/files/patch-dhclient.c
+++ b/net/isc-dhcp30-server/files/patch-dhclient.c
@@ -1,5 +1,5 @@
 --- client/dhclient.c.orig	Fri Mar 16 00:12:03 2001
-+++ client/dhclient.c	Thu Mar 22 02:49:59 2001
++++ client/dhclient.c	Thu Mar 22 14:57:19 2001
 @@ -78,6 +78,7 @@
  u_int16_t remote_port;
  int no_daemon;
@@ -56,13 +56,16 @@
  }
  
  isc_result_t find_class (struct class **c,
-@@ -1453,6 +1467,10 @@
+@@ -1453,6 +1467,13 @@
  	/* No leases were available, or what was available didn't work, so
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
 +	if (onetry) {
++		if (!quiet)
++			log_info ("Unable to obtain a lease on first try - %s.",
++				  
++				  "exiting");
 +		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
 +	}
  	log_info ("No working leases in persistent database - sleeping.");
  	script_init (client, "FAIL", (struct string_list *)0);
diff --git a/net/isc-dhcp31-server/files/patch-dhclient.c b/net/isc-dhcp31-server/files/patch-dhclient.c
index b1f5599304aa..208c0dc23613 100644
--- a/net/isc-dhcp31-server/files/patch-dhclient.c
+++ b/net/isc-dhcp31-server/files/patch-dhclient.c
@@ -1,5 +1,5 @@
 --- client/dhclient.c.orig	Fri Mar 16 00:12:03 2001
-+++ client/dhclient.c	Thu Mar 22 02:49:59 2001
++++ client/dhclient.c	Thu Mar 22 14:57:19 2001
 @@ -78,6 +78,7 @@
  u_int16_t remote_port;
  int no_daemon;
@@ -56,13 +56,16 @@
  }
  
  isc_result_t find_class (struct class **c,
-@@ -1453,6 +1467,10 @@
+@@ -1453,6 +1467,13 @@
  	/* No leases were available, or what was available didn't work, so
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
 +	if (onetry) {
++		if (!quiet)
++			log_info ("Unable to obtain a lease on first try - %s.",
++				  
++				  "exiting");
 +		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
 +	}
  	log_info ("No working leases in persistent database - sleeping.");
  	script_init (client, "FAIL", (struct string_list *)0);
diff --git a/net/isc-dhcp40-server/files/patch-dhclient.c b/net/isc-dhcp40-server/files/patch-dhclient.c
index b1f5599304aa..208c0dc23613 100644
--- a/net/isc-dhcp40-server/files/patch-dhclient.c
+++ b/net/isc-dhcp40-server/files/patch-dhclient.c
@@ -1,5 +1,5 @@
 --- client/dhclient.c.orig	Fri Mar 16 00:12:03 2001
-+++ client/dhclient.c	Thu Mar 22 02:49:59 2001
++++ client/dhclient.c	Thu Mar 22 14:57:19 2001
 @@ -78,6 +78,7 @@
  u_int16_t remote_port;
  int no_daemon;
@@ -56,13 +56,16 @@
  }
  
  isc_result_t find_class (struct class **c,
-@@ -1453,6 +1467,10 @@
+@@ -1453,6 +1467,13 @@
  	/* No leases were available, or what was available didn't work, so
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
 +	if (onetry) {
++		if (!quiet)
++			log_info ("Unable to obtain a lease on first try - %s.",
++				  
++				  "exiting");
 +		exit(2);
-+		log_info ("Unable to obtain a lease on first try - exiting.\n");
 +	}
  	log_info ("No working leases in persistent database - sleeping.");
  	script_init (client, "FAIL", (struct string_list *)0);