Attachment #164243 for bug #205214

Lines 80-85 Link Here

(-)dhcp-4.0.0.ORIG/client/dhclient.c (+3 lines)
80		80
81	static isc_result_t write_duid(struct data_string *duid);	81	static isc_result_t write_duid(struct data_string *duid);
82		82
		83	extern int log_isc_blurb;
		84
83	int	85	int
84	main(int argc, char **argv) {	86	main(int argc, char **argv) {
85	int fd;	87	int fd;
Lines 323-328 Link Here
323	log_info ("%s", "");	325	log_info ("%s", "");
324	} else {	326	} else {
325	log_perror = 0;	327	log_perror = 0;
		328	log_isc_blurb = 0;
326	quiet_interface_discovery = 1;	329	quiet_interface_discovery = 1;
327	}	330	}
328		331

Lines 43-48 Link Here

(-)dhcp-4.0.0.ORIG/omapip/errwarn.c (-1 / +10 lines)
43	int log_perror = 1;	43	int log_perror = 1;
44	#endif	44	#endif
45	int log_priority;	45	int log_priority;
		46	int log_isc_blurb=1;
		47
46	void (*log_cleanup) (void);	48	void (*log_cleanup) (void);
47		49
48	#define CVT_BUF_MAX 1023	50	#define CVT_BUF_MAX 1023
Lines 74-80 Link Here
74	write (STDERR_FILENO, "\n", 1);	76	write (STDERR_FILENO, "\n", 1);
75	}	77	}
76		78
77	#if !defined (NOMINUM)	79	#if !defined(NOMINUM)
		80	if ( log_isc_blurb )
		81	{
78	log_error ("%s", "");	82	log_error ("%s", "");
79	log_error ("If you did not get this software from ftp.isc.org, please");	83	log_error ("If you did not get this software from ftp.isc.org, please");
80	log_error ("get the latest from ftp.isc.org and install that before");	84	log_error ("get the latest from ftp.isc.org and install that before");
Lines 92-98 Link Here
92	log_error ("the README file.");	96	log_error ("the README file.");
93	log_error ("%s", "");	97	log_error ("%s", "");
94	log_error ("exiting.");	98	log_error ("exiting.");
		99	}else
		100	{
		101	log_error ("exiting.");
		102	}
95	#endif	103	#endif
		104
96	if (log_cleanup)	105	if (log_cleanup)
97	(*log_cleanup) ();	106	(*log_cleanup) ();
98	exit (1);	107	exit (1);

Lines 97-102 Link Here

(-)dhcp-4.0.0.ORIG/relay/dhcrelay.c (+2 lines)
97	static char arr [] = "All rights reserved.";	97	static char arr [] = "All rights reserved.";
98	static char message [] = "Internet Systems Consortium DHCP Relay Agent";	98	static char message [] = "Internet Systems Consortium DHCP Relay Agent";
99	static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/";	99	static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/";
		100	extern int log_isc_blurb;
100		101
101	int	102	int
102	main(int argc, char **argv) {	103	main(int argc, char **argv) {
Lines 163-168 Link Here
163	} else if (!strcmp (argv [i], "-q")) {	164	} else if (!strcmp (argv [i], "-q")) {
164	quiet = 1;	165	quiet = 1;
165	quiet_interface_discovery = 1;	166	quiet_interface_discovery = 1;
		167	log_isc_blurb = 0;
166	} else if (!strcmp (argv [i], "-a")) {	168	} else if (!strcmp (argv [i], "-a")) {
167	add_agent_options = 1;	169	add_agent_options = 1;
168	} else if (!strcmp (argv [i], "-c")) {	170	} else if (!strcmp (argv [i], "-c")) {

Lines 61-66 Link Here

(-)dhcp-4.0.0.ORIG/server/dhcpd.c (+4 lines)
61	struct iaddr server_identifier;	61	struct iaddr server_identifier;
62	int server_identifier_matched;	62	int server_identifier_matched;
63		63
		64
		65	extern int log_isc_blurb;
		66
64	#if defined (NSUPDATE)	67	#if defined (NSUPDATE)
65		68
66	/* This stuff is always executed to figure the default values for certain	69	/* This stuff is always executed to figure the default values for certain
Lines 359-364 Link Here
359	lftest = 1;	362	lftest = 1;
360	log_perror = -1;	363	log_perror = -1;
361	} else if (!strcmp (argv [i], "-q")) {	364	} else if (!strcmp (argv [i], "-q")) {
		365	log_isc_blurb = 0;
362	quiet = 1;	366	quiet = 1;
363	quiet_interface_discovery = 1;	367	quiet_interface_discovery = 1;
364	#ifdef DHCPv6	368	#ifdef DHCPv6

Return to bug 205214