Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 164243 Details for
Bug 205214
net-misc/dhcp-4.0 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
dhcp-4.0-no_isc_blurb.patch
dhcp-4.0-no_isc_blurb.patch (text/plain), 2.68 KB, created by
Tony Vroon (RETIRED)
on 2008-09-01 13:53:46 UTC
(
hide
)
Description:
dhcp-4.0-no_isc_blurb.patch
Filename:
MIME Type:
Creator:
Tony Vroon (RETIRED)
Created:
2008-09-01 13:53:46 UTC
Size:
2.68 KB
patch
obsolete
>diff -uNr dhcp-4.0.0.ORIG/client/dhclient.c dhcp-4.0.0/client/dhclient.c >--- dhcp-4.0.0.ORIG/client/dhclient.c 2008-09-01 13:38:38.000000000 +0100 >+++ dhcp-4.0.0/client/dhclient.c 2008-09-01 13:41:32.000000000 +0100 >@@ -80,6 +80,8 @@ > > static isc_result_t write_duid(struct data_string *duid); > >+extern int log_isc_blurb; >+ > int > main(int argc, char **argv) { > int fd; >@@ -323,6 +325,7 @@ > log_info ("%s", ""); > } else { > log_perror = 0; >+ log_isc_blurb = 0; > quiet_interface_discovery = 1; > } > >diff -uNr dhcp-4.0.0.ORIG/omapip/errwarn.c dhcp-4.0.0/omapip/errwarn.c >--- dhcp-4.0.0.ORIG/omapip/errwarn.c 2008-09-01 13:38:38.000000000 +0100 >+++ dhcp-4.0.0/omapip/errwarn.c 2008-09-01 13:39:17.000000000 +0100 >@@ -43,6 +43,8 @@ > int log_perror = 1; > #endif > int log_priority; >+int log_isc_blurb=1; >+ > void (*log_cleanup) (void); > > #define CVT_BUF_MAX 1023 >@@ -74,7 +76,9 @@ > write (STDERR_FILENO, "\n", 1); > } > >-#if !defined (NOMINUM) >+#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"); >@@ -92,7 +96,12 @@ > log_error ("the README file."); > log_error ("%s", ""); > log_error ("exiting."); >+ }else >+ { >+ log_error ("exiting."); >+ } > #endif >+ > if (log_cleanup) > (*log_cleanup) (); > exit (1); >diff -uNr dhcp-4.0.0.ORIG/relay/dhcrelay.c dhcp-4.0.0/relay/dhcrelay.c >--- dhcp-4.0.0.ORIG/relay/dhcrelay.c 2008-09-01 13:38:38.000000000 +0100 >+++ dhcp-4.0.0/relay/dhcrelay.c 2008-09-01 13:43:15.000000000 +0100 >@@ -97,6 +97,7 @@ > static char arr [] = "All rights reserved."; > static char message [] = "Internet Systems Consortium DHCP Relay Agent"; > static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/"; >+extern int log_isc_blurb; > > int > main(int argc, char **argv) { >@@ -163,6 +164,7 @@ > } else if (!strcmp (argv [i], "-q")) { > quiet = 1; > quiet_interface_discovery = 1; >+ log_isc_blurb = 0; > } else if (!strcmp (argv [i], "-a")) { > add_agent_options = 1; > } else if (!strcmp (argv [i], "-c")) { >diff -uNr dhcp-4.0.0.ORIG/server/dhcpd.c dhcp-4.0.0/server/dhcpd.c >--- dhcp-4.0.0.ORIG/server/dhcpd.c 2008-09-01 13:38:38.000000000 +0100 >+++ dhcp-4.0.0/server/dhcpd.c 2008-09-01 13:42:37.000000000 +0100 >@@ -61,6 +61,9 @@ > struct iaddr server_identifier; > int server_identifier_matched; > >+ >+extern int log_isc_blurb; >+ > #if defined (NSUPDATE) > > /* This stuff is always executed to figure the default values for certain >@@ -359,6 +362,7 @@ > lftest = 1; > log_perror = -1; > } else if (!strcmp (argv [i], "-q")) { >+ log_isc_blurb = 0; > quiet = 1; > quiet_interface_discovery = 1; > #ifdef DHCPv6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 205214
:
150152
|
164239
|
164240
|
164242
| 164243 |
164245