rpms/dhcp/devel dhcp-4.0.0-port-validation.patch,1.1,1.2

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20297

Modified Files:
	dhcp-4.0.0-port-validation.patch 
Log Message:
* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-26
- Validate port numbers for dhclient, dhcpd, and dhcrelay to ensure
  that are within the correct range (#438149)


dhcp-4.0.0-port-validation.patch:

Index: dhcp-4.0.0-port-validation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-4.0.0-port-validation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-4.0.0-port-validation.patch	1 Oct 2008 01:41:46 -0000	1.1
+++ dhcp-4.0.0-port-validation.patch	1 Oct 2008 01:58:39 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up dhcp-4.0.0/client/dhclient.c.port dhcp-4.0.0/client/dhclient.c
---- dhcp-4.0.0/client/dhclient.c.port	2008-09-30 14:28:01.000000000 -1000
-+++ dhcp-4.0.0/client/dhclient.c	2008-09-30 15:32:04.000000000 -1000
+--- dhcp-4.0.0/client/dhclient.c.port	2008-09-30 15:56:35.000000000 -1000
++++ dhcp-4.0.0/client/dhclient.c	2008-09-30 15:56:52.000000000 -1000
 @@ -218,7 +218,7 @@ int main(int argc, char **argv, char **e
  		} else if (!strcmp (argv [i], "-p")) {
  			if (++i == argc)
@@ -11,13 +11,12 @@
  			       ntohs (local_port));
  		} else if (!strcmp (argv [i], "-d")) {
 diff -up dhcp-4.0.0/common/inet.c.port dhcp-4.0.0/common/inet.c
---- dhcp-4.0.0/common/inet.c.port	2008-09-30 15:30:11.000000000 -1000
-+++ dhcp-4.0.0/common/inet.c	2008-09-30 15:36:13.000000000 -1000
-@@ -603,3 +603,21 @@ piaddrcidr(const struct iaddr *addr, uns
- 
+--- dhcp-4.0.0/common/inet.c.port	2007-07-12 20:43:41.000000000 -1000
++++ dhcp-4.0.0/common/inet.c	2008-09-30 15:57:20.000000000 -1000
+@@ -604,3 +604,20 @@ piaddrcidr(const struct iaddr *addr, uns
  	return ret;
  }
-+
+ 
 +/* Check the port number specified */
 +u_int16_t
 +validate_port(char *port) {
@@ -36,8 +35,8 @@
 +	return htons(local_port);
 +}
 diff -up dhcp-4.0.0/includes/dhcpd.h.port dhcp-4.0.0/includes/dhcpd.h
---- dhcp-4.0.0/includes/dhcpd.h.port	2008-09-30 14:28:01.000000000 -1000
-+++ dhcp-4.0.0/includes/dhcpd.h	2008-09-30 15:30:36.000000000 -1000
+--- dhcp-4.0.0/includes/dhcpd.h.port	2008-09-30 15:56:35.000000000 -1000
++++ dhcp-4.0.0/includes/dhcpd.h	2008-09-30 15:56:52.000000000 -1000
 @@ -2432,6 +2432,7 @@ isc_result_t free_iaddrcidrnetlist(struc
  const char *piaddr PROTO ((struct iaddr));
  char *piaddrmask(struct iaddr *, struct iaddr *);
@@ -48,7 +47,7 @@
  extern int nowait;
 diff -up dhcp-4.0.0/relay/dhcrelay.c.port dhcp-4.0.0/relay/dhcrelay.c
 --- dhcp-4.0.0/relay/dhcrelay.c.port	2007-11-30 11:51:43.000000000 -1000
-+++ dhcp-4.0.0/relay/dhcrelay.c	2008-09-30 15:34:24.000000000 -1000
++++ dhcp-4.0.0/relay/dhcrelay.c	2008-09-30 15:56:52.000000000 -1000
 @@ -141,7 +141,7 @@ main(int argc, char **argv) {
  		if (!strcmp (argv [i], "-p")) {
  			if (++i == argc)
@@ -59,8 +58,8 @@
  			       ntohs (local_port));
  		} else if (!strcmp (argv [i], "-d")) {
 diff -up dhcp-4.0.0/server/dhcpd.c.port dhcp-4.0.0/server/dhcpd.c
---- dhcp-4.0.0/server/dhcpd.c.port	2008-09-30 14:28:00.000000000 -1000
-+++ dhcp-4.0.0/server/dhcpd.c	2008-09-30 15:34:01.000000000 -1000
+--- dhcp-4.0.0/server/dhcpd.c.port	2008-09-30 15:56:34.000000000 -1000
++++ dhcp-4.0.0/server/dhcpd.c	2008-09-30 15:56:52.000000000 -1000
 @@ -257,15 +257,7 @@ main(int argc, char **argv) {
  		if (!strcmp (argv [i], "-p")) {
  			if (++i == argc)