rpms/dhcp/FC-3 dhcp-3.0.1-dhclient-no_isc_blurb.patch,NONE,1.1

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv18479

Added Files:
	dhcp-3.0.1-dhclient-no_isc_blurb.patch 
Log Message:
dhclient should not generate ISC blurb on errors with -q option

dhcp-3.0.1-dhclient-no_isc_blurb.patch:
 client/dhclient.c |    3 +++
 omapip/errwarn.c  |    5 +++++
 2 files changed, 8 insertions(+)

--- NEW FILE dhcp-3.0.1-dhclient-no_isc_blurb.patch ---
--- dhcp-3.0.1/client/dhclient.c.no_isc_blurb	2005-06-09 19:17:28.000000000 -0400
+++ dhcp-3.0.1/client/dhclient.c	2005-06-09 19:33:06.000000000 -0400
@@ -79,6 +79,8 @@
 
 void do_release(struct client_state *);
 
+extern int log_isc_blurb;
+
 int main (argc, argv, envp)
 	int argc;
 	char **argv, **envp;
@@ -175,6 +177,7 @@
 		} else if (!strcmp (argv [i], "-q")) {
 			quiet = 1;
 			quiet_interface_discovery = 1;
+			log_isc_blurb = 0;
 		} else if (!strcmp (argv [i], "-s")) {
 			if (++i == argc)
 				usage ();
--- dhcp-3.0.1/omapip/errwarn.c.no_isc_blurb	2004-06-17 16:54:39.000000000 -0400
+++ dhcp-3.0.1/omapip/errwarn.c	2005-06-09 19:32:01.000000000 -0400
@@ -45,6 +45,8 @@
 int log_perror = 1;
 #endif
 int log_priority;
+int log_isc_blurb = 1;
+
 void (*log_cleanup) (void);
 
 #define CVT_BUF_MAX 1023
@@ -77,6 +79,8 @@
   }
 
 #if !defined (NOMINUM)
+  if ( log_isc_blurb )
+  {
   log_error ("%s", "");
   log_error ("If you did not get this software from ftp.isc.org, please");
   log_error ("get the latest from ftp.isc.org and install that before");
@@ -94,6 +98,7 @@
   log_error ("the README file.");
   log_error ("%s", "");
   log_error ("exiting.");
+  }
 #endif
   if (log_cleanup)
 	  (*log_cleanup) ();