rpms/dhcp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Forgot to actually include <errno.h> (#438149)

Browse Source
This commit is contained in:
David Cantrell 2008-10-01 02:28:51 +00:00
parent b28d5a6d44
commit b0d88d60b3
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dhcp-4.0.0-port-validation.patch
View File

@ -1,6 +1,6 @@
diff -up dhcp-4.0.0/client/dhclient.c.port dhcp-4.0.0/client/dhclient.c 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 15:56:35.000000000 -1000 --- dhcp-4.0.0/client/dhclient.c.port 2008-09-30 16:27:28.000000000 -1000
+++ dhcp-4.0.0/client/dhclient.c 2008-09-30 15:56:52.000000000 -1000 +++ dhcp-4.0.0/client/dhclient.c 2008-09-30 16:27:28.000000000 -1000
@@ -218,7 +218,7 @@ int main(int argc, char **argv, char **e @@ -218,7 +218,7 @@ int main(int argc, char **argv, char **e
} else if (!strcmp (argv [i], "-p")) { } else if (!strcmp (argv [i], "-p")) {
if (++i == argc) if (++i == argc)
@ -12,7 +12,7 @@ diff -up dhcp-4.0.0/client/dhclient.c.port dhcp-4.0.0/client/dhclient.c
} else if (!strcmp (argv [i], "-d")) { } else if (!strcmp (argv [i], "-d")) {
diff -up dhcp-4.0.0/common/inet.c.port dhcp-4.0.0/common/inet.c 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 2007-07-12 20:43:41.000000000 -1000 --- 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 +++ dhcp-4.0.0/common/inet.c 2008-09-30 16:27:28.000000000 -1000
@@ -604,3 +604,20 @@ piaddrcidr(const struct iaddr *addr, uns @@ -604,3 +604,20 @@ piaddrcidr(const struct iaddr *addr, uns
return ret; return ret;
} }
@ -35,19 +35,19 @@ diff -up dhcp-4.0.0/common/inet.c.port dhcp-4.0.0/common/inet.c
+ return htons(local_port); + return htons(local_port);
+} +}
diff -up dhcp-4.0.0/includes/dhcpd.h.port dhcp-4.0.0/includes/dhcpd.h 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 15:56:35.000000000 -1000 --- dhcp-4.0.0/includes/dhcpd.h.port 2008-09-30 16:27:28.000000000 -1000
+++ dhcp-4.0.0/includes/dhcpd.h 2008-09-30 15:56:52.000000000 -1000 +++ dhcp-4.0.0/includes/dhcpd.h 2008-09-30 16:27:54.000000000 -1000
@@ -2432,6 +2432,7 @@ isc_result_t free_iaddrcidrnetlist(struc @@ -64,6 +64,7 @@
const char *piaddr PROTO ((struct iaddr)); #endif
char *piaddrmask(struct iaddr *, struct iaddr *);
char *piaddrcidr(const struct iaddr *, unsigned int);
+u_int16_t validate_port(char *);
/* dhclient.c */ #include <setjmp.h>
extern int nowait; +#include <errno.h>
#include "cdefs.h"
#include "osdep.h"
diff -up dhcp-4.0.0/relay/dhcrelay.c.port dhcp-4.0.0/relay/dhcrelay.c 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.port 2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.0.0/relay/dhcrelay.c 2008-09-30 15:56:52.000000000 -1000 +++ dhcp-4.0.0/relay/dhcrelay.c 2008-09-30 16:27:28.000000000 -1000
@@ -141,7 +141,7 @@ main(int argc, char **argv) { @@ -141,7 +141,7 @@ main(int argc, char **argv) {
if (!strcmp (argv [i], "-p")) { if (!strcmp (argv [i], "-p")) {
if (++i == argc) if (++i == argc)
@ -58,8 +58,8 @@ diff -up dhcp-4.0.0/relay/dhcrelay.c.port dhcp-4.0.0/relay/dhcrelay.c
ntohs (local_port)); ntohs (local_port));
} else if (!strcmp (argv [i], "-d")) { } else if (!strcmp (argv [i], "-d")) {
diff -up dhcp-4.0.0/server/dhcpd.c.port dhcp-4.0.0/server/dhcpd.c 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 15:56:34.000000000 -1000 --- dhcp-4.0.0/server/dhcpd.c.port 2008-09-30 16:27:28.000000000 -1000
+++ dhcp-4.0.0/server/dhcpd.c 2008-09-30 15:56:52.000000000 -1000 +++ dhcp-4.0.0/server/dhcpd.c 2008-09-30 16:27:28.000000000 -1000
@@ -257,15 +257,7 @@ main(int argc, char **argv) { @@ -257,15 +257,7 @@ main(int argc, char **argv) {
if (!strcmp (argv [i], "-p")) { if (!strcmp (argv [i], "-p")) {
if (++i == argc) if (++i == argc)

5
dhcp.spec
View File

@ -4,7 +4,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
Name: dhcp Name: dhcp
Version: 4.0.0 Version: 4.0.0
Release: 27%{?dist} Release: 28%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -445,6 +445,9 @@ fi
%{_libdir}/libdhcp4client.so %{_libdir}/libdhcp4client.so
%changelog %changelog
* Tue Sep 30 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-28
- Forgot to actually include <errno.h> (#438149)
* Tue Sep 30 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-27 * Tue Sep 30 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-27
- Fix patch fuzziness and include errno.h in includes/dhcpd.h (#438149) - Fix patch fuzziness and include errno.h in includes/dhcpd.h (#438149)