e1c19e6ccb
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1996 6952d904-891a-0410-993b-d76249ca496b
104 lines
2.8 KiB
Diff
104 lines
2.8 KiB
Diff
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
Date: 2010-02-14
|
|
Initial Package Version:
|
|
Origin: gentoo patch dhcp-4.1-no_isc_blurb.patch
|
|
Upstream Status:
|
|
Description:
|
|
|
|
diff -Naur dhcp-4.1.1.orig/client/dhclient.c dhcp-4.1.1/client/dhclient.c
|
|
--- dhcp-4.1.1.orig/client/dhclient.c 2010-02-14 07:43:04.825799868 +0000
|
|
+++ dhcp-4.1.1/client/dhclient.c 2010-02-14 07:43:20.842552286 +0000
|
|
@@ -89,6 +89,8 @@
|
|
|
|
static isc_result_t write_duid(struct data_string *duid);
|
|
|
|
+extern int log_isc_blurb;
|
|
+
|
|
int
|
|
main(int argc, char **argv) {
|
|
int fd;
|
|
@@ -387,6 +389,7 @@
|
|
log_info("%s", "");
|
|
} else {
|
|
log_perror = 0;
|
|
+ log_isc_blurb = 0;
|
|
quiet_interface_discovery = 1;
|
|
}
|
|
|
|
diff -Naur dhcp-4.1.1.orig/omapip/errwarn.c dhcp-4.1.1/omapip/errwarn.c
|
|
--- dhcp-4.1.1.orig/omapip/errwarn.c 2010-02-14 07:43:04.815800563 +0000
|
|
+++ dhcp-4.1.1/omapip/errwarn.c 2010-02-14 07:43:20.842552286 +0000
|
|
@@ -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 @@
|
|
IGNORE_RET (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 -Naur dhcp-4.1.1.orig/relay/dhcrelay.c dhcp-4.1.1/relay/dhcrelay.c
|
|
--- dhcp-4.1.1.orig/relay/dhcrelay.c 2010-02-14 07:43:04.821800048 +0000
|
|
+++ dhcp-4.1.1/relay/dhcrelay.c 2010-02-14 07:43:44.269801278 +0000
|
|
@@ -133,6 +133,7 @@
|
|
"Internet Systems Consortium DHCP Relay Agent";
|
|
static const char url[] =
|
|
"For info, please visit https://www.isc.org/software/dhcp/";
|
|
+extern int log_isc_blurb;
|
|
|
|
#ifdef DHCPv6
|
|
#define DHCRELAY_USAGE \
|
|
@@ -222,6 +223,7 @@
|
|
} else if (!strcmp(argv[i], "-q")) {
|
|
quiet = 1;
|
|
quiet_interface_discovery = 1;
|
|
+ log_isc_blurb = 0;
|
|
} else if (!strcmp(argv[i], "-p")) {
|
|
if (++i == argc)
|
|
usage();
|
|
diff -Naur dhcp-4.1.1.orig/server/dhcpd.c dhcp-4.1.1/server/dhcpd.c
|
|
--- dhcp-4.1.1.orig/server/dhcpd.c 2010-02-14 07:43:04.841800124 +0000
|
|
+++ dhcp-4.1.1/server/dhcpd.c 2010-02-14 07:43:20.844551951 +0000
|
|
@@ -63,6 +63,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
|
|
@@ -360,6 +363,7 @@
|
|
lftest = 1;
|
|
log_perror = -1;
|
|
} else if (!strcmp (argv [i], "-q")) {
|
|
+ log_isc_blurb = 0;
|
|
quiet = 1;
|
|
quiet_interface_discovery = 1;
|
|
#ifdef DHCPv6
|