OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 19-Feb-2003 13:57:06
Branch: HEAD Handle: 2003021912570401
Added files:
openpkg-src/dhcpd dhcpd.patch
Modified files:
openpkg-src/dhcpd dhcpd.spec
openpkg-web news.txt
Log:
towards SA-2003.012-dhcpd; CAN-2003-0039
Summary:
Revision Changes Path
1.3 +53 -0 openpkg-src/dhcpd/dhcpd.patch
1.34 +3 -1 openpkg-src/dhcpd/dhcpd.spec
1.3358 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.patch
============================================================================
$ cvs diff -u -r0 -r1.3 dhcpd.patch
--- /dev/null 2003-02-19 13:57:06.000000000 +0100
+++ dhcpd.patch 2003-02-19 13:57:06.000000000 +0100
@@ -0,0 +1,53 @@
+--- relay/dhcrelay.c-orig Sat Apr 27 05:34:20 2002
++++ relay/dhcrelay.c Wed Feb 19 12:44:19 2003
+@@ -88,6 +88,7 @@
+ did not match any known circuit ID. */
+ int missing_circuit_id = 0; /* Circuit ID option in matching RAI option
+ was missing. */
++int max_hop_count = 4; /* Maximum hop count */
+
+ /* Maximum size of a packet with agent options added. */
+ int dhcp_max_agent_option_packet_length = 576;
+@@ -182,6 +183,15 @@
+ quiet_interface_discovery = 1;
+ } else if (!strcmp (argv [i], "-a")) {
+ add_agent_options = 1;
++ } else if (!strcmp (argv [i], "-c")) {
++ int hcount;
++ if (++i == argc)
++ usage ();
++ hcount = atoi(argv[i]);
++ if (hcount <= 16)
++ max_hop_count = hcount;
++ else
++ usage ();
+ } else if (!strcmp (argv [i], "-A")) {
+ if (++i == argc)
+ usage ();
+@@ -425,6 +435,17 @@
+ packet -> giaddr = ip -> primary_address;
+ if (packet -> hops != 255)
+ packet -> hops = packet -> hops + 1;
++
++ /* ftp://ftp.rfc-editor.org/in-notes/rfc1542.txt
++ * 4.1.1 BOOTREQUEST Messages
++ * The relay agent MUST silently discard BOOTREQUEST messages whose
++ * 'hops' field exceeds the value 16. A configuration option SHOULD be
++ * provided to set this threshold to a smaller value if desired by the
++ * network manager. The default setting for a configurable threshold
++ * SHOULD be 4.
++ */
++ if (packet -> hops >= max_hop_count)
++ return;
+
+ /* Otherwise, it's a BOOTREQUEST, so forward it to all the
+ servers. */
+@@ -470,7 +470,7 @@
+ static void usage ()
+ {
+ log_fatal ("Usage: dhcrelay [-p <port>] [-d] [-D] [-i %s%s%s",
+- "interface]\n ",
++ "interface] [-c max_hop_count]\n ",
+ "[-q] [-a] [-A length] [-m append|replace|forward|discard]\n",
+ " [server1 [... serverN]]");
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 30 Jan 2003 10:06:53 -0000 1.33
+++ openpkg-src/dhcpd/dhcpd.spec 19 Feb 2003 12:57:05 -0000 1.34
@@ -33,12 +33,13 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc11
-Release: 20030116
+Release: 20030219
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
Source1: dhcpd.conf
Source2: rc.dhcpd
+Patch0: dhcpd.patch
# build information
Prefix: %{l_prefix}
@@ -53,6 +54,7 @@
%prep
%setup -q -n dhcp-%{version}
+ %patch
%build
( echo 'CC = %{l_cc}'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3357 -r1.3358 news.txt
--- openpkg-web/news.txt 19 Feb 2003 10:04:05 -0000 1.3357
+++ openpkg-web/news.txt 19 Feb 2003 12:57:04 -0000 1.3358
@@ -1,3 +1,4 @@
+19-Feb-2003: Upgraded package: P<dhcpd-3.0.1rc11-20030219>
19-Feb-2003: Upgraded package: P<majordomo-1.94.5-20030219>
19-Feb-2003: Upgraded package: P<vim-6.1.342-20030219>
19-Feb-2003: Upgraded package: P<tidy-20030217-20030219>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
