4.2.5rc1
This commit is contained in:
parent
344e2934be
commit
c72a792150
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,3 +15,4 @@
|
|||||||
/dhcp-4.2.4.tar.gz
|
/dhcp-4.2.4.tar.gz
|
||||||
/dhcp-4.2.4-P1.tar.gz
|
/dhcp-4.2.4-P1.tar.gz
|
||||||
/dhcp-4.2.4-P2.tar.gz
|
/dhcp-4.2.4-P2.tar.gz
|
||||||
|
/dhcp-4.2.5rc1.tar.gz
|
||||||
|
@ -1,94 +0,0 @@
|
|||||||
diff -up dhcp-4.2.2/client/Makefile.am.sharedlib dhcp-4.2.2/client/Makefile.am
|
|
||||||
--- dhcp-4.2.2/client/Makefile.am.sharedlib 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
+++ dhcp-4.2.2/client/Makefile.am 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
|
||||||
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
|
|
||||||
scripts/netbsd scripts/nextstep scripts/openbsd \
|
|
||||||
scripts/solaris scripts/openwrt
|
|
||||||
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
||||||
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
||||||
$(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
|
|
||||||
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
|
||||||
EXTRA_DIST = $(man_MANS)
|
|
||||||
diff -up dhcp-4.2.2/configure.ac.sharedlib dhcp-4.2.2/configure.ac
|
|
||||||
--- dhcp-4.2.2/configure.ac.sharedlib 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
+++ dhcp-4.2.2/configure.ac 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
@@ -30,7 +30,8 @@ fi
|
|
||||||
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
|
||||||
|
|
||||||
-AC_PROG_RANLIB
|
|
||||||
+# Use libtool to simplify building of shared libraries
|
|
||||||
+AC_PROG_LIBTOOL
|
|
||||||
AC_CONFIG_HEADERS([includes/config.h])
|
|
||||||
|
|
||||||
# we sometimes need to know byte order for building packets
|
|
||||||
diff -up dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib dhcp-4.2.2/dhcpctl/Makefile.am
|
|
||||||
--- dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib 2011-10-09 20:07:39.000000000 +0200
|
|
||||||
+++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
@@ -1,15 +1,15 @@
|
|
||||||
bin_PROGRAMS = omshell
|
|
||||||
-lib_LIBRARIES = libdhcpctl.a
|
|
||||||
+lib_LTLIBRARIES = libdhcpctl.la
|
|
||||||
noinst_PROGRAMS = cltest
|
|
||||||
man_MANS = omshell.1 dhcpctl.3
|
|
||||||
EXTRA_DIST = $(man_MANS)
|
|
||||||
|
|
||||||
omshell_SOURCES = omshell.c
|
|
||||||
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
||||||
+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
|
||||||
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
||||||
|
|
||||||
-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
|
|
||||||
+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
|
|
||||||
|
|
||||||
cltest_SOURCES = cltest.c
|
|
||||||
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
|
||||||
+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
|
||||||
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
||||||
diff -up dhcp-4.2.2/omapip/Makefile.am.sharedlib dhcp-4.2.2/omapip/Makefile.am
|
|
||||||
--- dhcp-4.2.2/omapip/Makefile.am.sharedlib 2011-10-09 20:07:39.000000000 +0200
|
|
||||||
+++ dhcp-4.2.2/omapip/Makefile.am 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
-lib_LIBRARIES = libomapi.a
|
|
||||||
+lib_LTLIBRARIES = libomapi.la
|
|
||||||
noinst_PROGRAMS = svtest
|
|
||||||
|
|
||||||
-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
|
||||||
+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
|
||||||
errwarn.c listener.c dispatch.c generic.c support.c \
|
|
||||||
handle.c message.c convert.c hash.c auth.c inet_addr.c \
|
|
||||||
array.c trace.c toisc.c iscprint.c isclib.c
|
|
||||||
@@ -10,5 +10,5 @@ man_MANS = omapi.3
|
|
||||||
EXTRA_DIST = $(man_MANS)
|
|
||||||
|
|
||||||
svtest_SOURCES = test.c
|
|
||||||
-svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
||||||
+svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
||||||
|
|
||||||
diff -up dhcp-4.2.2/relay/Makefile.am.sharedlib dhcp-4.2.2/relay/Makefile.am
|
|
||||||
--- dhcp-4.2.2/relay/Makefile.am.sharedlib 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
+++ dhcp-4.2.2/relay/Makefile.am 2011-10-09 20:07:40.000000000 +0200
|
|
||||||
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
|
||||||
|
|
||||||
sbin_PROGRAMS = dhcrelay
|
|
||||||
dhcrelay_SOURCES = dhcrelay.c
|
|
||||||
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
||||||
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
||||||
$(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
|
|
||||||
man_MANS = dhcrelay.8
|
|
||||||
EXTRA_DIST = $(man_MANS)
|
|
||||||
diff -up dhcp-4.2.2/server/Makefile.am.sharedlib dhcp-4.2.2/server/Makefile.am
|
|
||||||
--- dhcp-4.2.2/server/Makefile.am.sharedlib 2011-10-09 20:07:39.000000000 +0200
|
|
||||||
+++ dhcp-4.2.2/server/Makefile.am 2011-10-09 20:08:26.000000000 +0200
|
|
||||||
@@ -7,8 +7,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
|
||||||
dhcpv6.c mdb6.c ldap.c ldap_casa.c
|
|
||||||
|
|
||||||
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
|
||||||
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
|
||||||
- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
||||||
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
|
||||||
+ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
|
||||||
|
|
||||||
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
|
||||||
EXTRA_DIST = $(man_MANS)
|
|
@ -1,41 +0,0 @@
|
|||||||
diff -up dhcp-4.2.4-P1/client/dhclient.c.dhclient6-leases_semicolon dhcp-4.2.4-P1/client/dhclient.c
|
|
||||||
--- dhcp-4.2.4-P1/client/dhclient.c.dhclient6-leases_semicolon 2012-07-25 15:20:22.187164614 +0200
|
|
||||||
+++ dhcp-4.2.4-P1/client/dhclient.c 2012-07-25 15:20:26.648152028 +0200
|
|
||||||
@@ -3236,10 +3236,21 @@ void write_lease_option (struct option_c
|
|
||||||
}
|
|
||||||
if (evaluate_option_cache (&ds, packet, lease, client_state,
|
|
||||||
in_options, cfg_options, scope, oc, MDL)) {
|
|
||||||
- fprintf(leaseFile, "%soption %s%s%s %s;\n", preamble,
|
|
||||||
- name, dot, oc->option->name,
|
|
||||||
- pretty_print_option(oc->option, ds.data, ds.len,
|
|
||||||
- 1, 1));
|
|
||||||
+ /* The option name */
|
|
||||||
+ fprintf(leaseFile, "%soption %s%s%s", preamble,
|
|
||||||
+ name, dot, oc->option->name);
|
|
||||||
+
|
|
||||||
+ /* The option value if there is one */
|
|
||||||
+ if ((oc->option->format == NULL) ||
|
|
||||||
+ (oc->option->format[0] != 'Z')) {
|
|
||||||
+ fprintf(leaseFile, " %s",
|
|
||||||
+ pretty_print_option(oc->option, ds.data,
|
|
||||||
+ ds.len, 1, 1));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* The closing semi-colon and newline */
|
|
||||||
+ fprintf(leaseFile, ";\n");
|
|
||||||
+
|
|
||||||
data_string_forget (&ds, MDL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff -up dhcp-4.2.4-P1/common/parse.c.dhclient6-leases_semicolon dhcp-4.2.4-P1/common/parse.c
|
|
||||||
--- dhcp-4.2.4-P1/common/parse.c.dhclient6-leases_semicolon 2012-07-25 15:10:39.683557386 +0200
|
|
||||||
+++ dhcp-4.2.4-P1/common/parse.c 2012-07-25 15:16:50.826762985 +0200
|
|
||||||
@@ -5772,7 +5772,7 @@ int parse_option_decl (oc, cfile)
|
|
||||||
goto alloc;
|
|
||||||
|
|
||||||
case 'Z': /* Zero-length option */
|
|
||||||
- token = next_token(&val, (unsigned *)0, cfile);
|
|
||||||
+ token = peek_token(&val, (unsigned *)0, cfile);
|
|
||||||
if (token != SEMI) {
|
|
||||||
parse_warn(cfile,
|
|
||||||
"semicolon expected.");
|
|
@ -90,7 +90,7 @@ diff -up dhcp-4.2.4b1/common/lpf.c.PPP dhcp-4.2.4b1/common/lpf.c
|
|||||||
+++ dhcp-4.2.4b1/common/lpf.c 2012-04-16 17:37:23.256618582 +0200
|
+++ dhcp-4.2.4b1/common/lpf.c 2012-04-16 17:37:23.256618582 +0200
|
||||||
@@ -503,6 +503,22 @@ get_hw_addr(const char *name, struct har
|
@@ -503,6 +503,22 @@ get_hw_addr(const char *name, struct har
|
||||||
hw->hbuf[0] = HTYPE_FDDI;
|
hw->hbuf[0] = HTYPE_FDDI;
|
||||||
memcpy(&hw->hbuf[1], sa->sa_data, 16);
|
memcpy(&hw->hbuf[1], sa->sa_data, 6);
|
||||||
break;
|
break;
|
||||||
+#if defined(ARPHRD_PPP)
|
+#if defined(ARPHRD_PPP)
|
||||||
+ case ARPHRD_PPP:
|
+ case ARPHRD_PPP:
|
@ -458,10 +458,10 @@ diff -up dhcp-4.2.4-P2/common/lpf.c.lpf-ib dhcp-4.2.4-P2/common/lpf.c
|
|||||||
+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
|
+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
|
||||||
break;
|
break;
|
||||||
case ARPHRD_FDDI:
|
case ARPHRD_FDDI:
|
||||||
hw->hlen = 17;
|
hw->hlen = 7;
|
||||||
hw->hbuf[0] = HTYPE_FDDI;
|
hw->hbuf[0] = HTYPE_FDDI;
|
||||||
- memcpy(&hw->hbuf[1], sa->sa_data, 16);
|
- memcpy(&hw->hbuf[1], sa->sa_data, 6);
|
||||||
+ memcpy(&hw->hbuf[1], sll->sll_addr, 16);
|
+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
|
||||||
+ break;
|
+ break;
|
||||||
+ case ARPHRD_INFINIBAND:
|
+ case ARPHRD_INFINIBAND:
|
||||||
+ /* For Infiniband, save the broadcast address and store
|
+ /* For Infiniband, save the broadcast address and store
|
@ -1,9 +1,9 @@
|
|||||||
diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.conf.5
|
diff -up dhcp-4.2.5b1/client/dhclient.conf.5.man dhcp-4.2.5b1/client/dhclient.conf.5
|
||||||
--- dhcp-4.2.1b1/client/dhclient.conf.5.man 2010-09-15 01:03:56.000000000 +0200
|
--- dhcp-4.2.5b1/client/dhclient.conf.5.man 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.1b1/client/dhclient.conf.5 2011-01-27 18:22:56.000000000 +0100
|
+++ dhcp-4.2.5b1/client/dhclient.conf.5 2012-12-17 12:49:52.818451301 +0100
|
||||||
@@ -186,7 +186,8 @@ responding to the client send the client
|
@@ -202,7 +202,8 @@ responding to the client send the client
|
||||||
options. Only the option names should be specified in the request
|
options. Only the option names should be specified in the request
|
||||||
statement - not option parameters. By default, the DHCPv4 client
|
statement - not option parameters. By default, the DHCPv4 client
|
||||||
requests the subnet-mask, broadcast-address, time-offset, routers,
|
requests the subnet-mask, broadcast-address, time-offset, routers,
|
||||||
-domain-name, domain-name-servers and host-name options while the DHCPv6
|
-domain-name, domain-name-servers and host-name options while the DHCPv6
|
||||||
+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
|
+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
|
||||||
@ -11,7 +11,7 @@ diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.co
|
|||||||
client requests the dhcp6 name-servers and domain-search options. Note
|
client requests the dhcp6 name-servers and domain-search options. Note
|
||||||
that if you enter a \'request\' statement, you over-ride these defaults
|
that if you enter a \'request\' statement, you over-ride these defaults
|
||||||
and these options will not be requested.
|
and these options will not be requested.
|
||||||
@@ -672,6 +673,17 @@ know the DHCP service(s) anycast MAC add
|
@@ -688,6 +689,17 @@ know the DHCP service(s) anycast MAC add
|
||||||
client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
|
client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
|
||||||
in a similar manner to the \fBhardware\fR statement.
|
in a similar manner to the \fBhardware\fR statement.
|
||||||
.PP
|
.PP
|
||||||
@ -28,8 +28,8 @@ diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.co
|
|||||||
+.PP
|
+.PP
|
||||||
.SH SAMPLE
|
.SH SAMPLE
|
||||||
The following configuration file is used on a laptop running NetBSD
|
The following configuration file is used on a laptop running NetBSD
|
||||||
1.3. The laptop has an IP alias of 192.5.5.213, and has one
|
1.3. The laptop has an IP alias of 192.5.5.213, and has one
|
||||||
@@ -697,7 +709,7 @@ interface "ep0" {
|
@@ -713,7 +725,7 @@ interface "ep0" {
|
||||||
supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
|
supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
|
||||||
prepend domain-name-servers 127.0.0.1;
|
prepend domain-name-servers 127.0.0.1;
|
||||||
request subnet-mask, broadcast-address, time-offset, routers,
|
request subnet-mask, broadcast-address, time-offset, routers,
|
||||||
@ -38,10 +38,10 @@ diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.co
|
|||||||
require subnet-mask, domain-name-servers;
|
require subnet-mask, domain-name-servers;
|
||||||
script "CLIENTBINDIR/dhclient-script";
|
script "CLIENTBINDIR/dhclient-script";
|
||||||
media "media 10baseT/UTP", "media 10base2/BNC";
|
media "media 10baseT/UTP", "media 10base2/BNC";
|
||||||
diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-script.8
|
diff -up dhcp-4.2.5b1/client/dhclient-script.8.man dhcp-4.2.5b1/client/dhclient-script.8
|
||||||
--- dhcp-4.2.1b1/client/dhclient-script.8.man 2010-07-06 21:03:11.000000000 +0200
|
--- dhcp-4.2.5b1/client/dhclient-script.8.man 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.1b1/client/dhclient-script.8 2011-01-27 18:24:44.000000000 +0100
|
+++ dhcp-4.2.5b1/client/dhclient-script.8 2012-12-17 12:47:48.410130998 +0100
|
||||||
@@ -47,7 +47,7 @@ customizations are needed, they should b
|
@@ -48,7 +48,7 @@ customizations are needed, they should b
|
||||||
exit hooks provided (see HOOKS for details). These hooks will allow the
|
exit hooks provided (see HOOKS for details). These hooks will allow the
|
||||||
user to override the default behaviour of the client in creating a
|
user to override the default behaviour of the client in creating a
|
||||||
.B /etc/resolv.conf
|
.B /etc/resolv.conf
|
||||||
@ -50,7 +50,7 @@ diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-
|
|||||||
.PP
|
.PP
|
||||||
No standard client script exists for some operating systems, even though
|
No standard client script exists for some operating systems, even though
|
||||||
the actual client may work, so a pioneering user may well need to create
|
the actual client may work, so a pioneering user may well need to create
|
||||||
@@ -91,6 +91,26 @@ present. The
|
@@ -92,6 +92,26 @@ present. The
|
||||||
.B ETCDIR/dhclient-exit-hooks
|
.B ETCDIR/dhclient-exit-hooks
|
||||||
script can modify the valid of exit_status to change the exit status
|
script can modify the valid of exit_status to change the exit status
|
||||||
of dhclient-script.
|
of dhclient-script.
|
||||||
@ -77,10 +77,10 @@ diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-
|
|||||||
.SH OPERATION
|
.SH OPERATION
|
||||||
When dhclient needs to invoke the client configuration script, it
|
When dhclient needs to invoke the client configuration script, it
|
||||||
defines a set of variables in the environment, and then invokes
|
defines a set of variables in the environment, and then invokes
|
||||||
diff -up dhcp-4.2.1b1/common/dhcp-options.5.man dhcp-4.2.1b1/common/dhcp-options.5
|
diff -up dhcp-4.2.5b1/common/dhcp-options.5.man dhcp-4.2.5b1/common/dhcp-options.5
|
||||||
--- dhcp-4.2.1b1/common/dhcp-options.5.man 2010-07-13 22:56:56.000000000 +0200
|
--- dhcp-4.2.5b1/common/dhcp-options.5.man 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.1b1/common/dhcp-options.5 2011-01-27 18:25:57.000000000 +0100
|
+++ dhcp-4.2.5b1/common/dhcp-options.5 2012-12-17 12:47:48.411130985 +0100
|
||||||
@@ -913,6 +913,21 @@ classless IP routing - it does not inclu
|
@@ -914,6 +914,21 @@ classless IP routing - it does not inclu
|
||||||
classless IP routing is now the most widely deployed routing standard,
|
classless IP routing is now the most widely deployed routing standard,
|
||||||
this option is virtually useless, and is not implemented by any of the
|
this option is virtually useless, and is not implemented by any of the
|
||||||
popular DHCP clients, for example the Microsoft DHCP client.
|
popular DHCP clients, for example the Microsoft DHCP client.
|
||||||
@ -102,9 +102,9 @@ diff -up dhcp-4.2.1b1/common/dhcp-options.5.man dhcp-4.2.1b1/common/dhcp-options
|
|||||||
.RE
|
.RE
|
||||||
.PP
|
.PP
|
||||||
.nf
|
.nf
|
||||||
diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
|
diff -up dhcp-4.2.5b1/server/dhcpd.conf.5.man dhcp-4.2.5b1/server/dhcpd.conf.5
|
||||||
--- dhcp-4.2.1b1/server/dhcpd.conf.5.man 2010-07-06 21:03:12.000000000 +0200
|
--- dhcp-4.2.5b1/server/dhcpd.conf.5.man 2012-12-05 02:17:39.000000000 +0100
|
||||||
+++ dhcp-4.2.1b1/server/dhcpd.conf.5 2011-01-27 18:29:12.000000000 +0100
|
+++ dhcp-4.2.5b1/server/dhcpd.conf.5 2012-12-17 12:50:52.117650542 +0100
|
||||||
@@ -519,6 +519,9 @@ pool {
|
@@ -519,6 +519,9 @@ pool {
|
||||||
};
|
};
|
||||||
.fi
|
.fi
|
||||||
@ -127,7 +127,7 @@ diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
|
|||||||
max-response-delay 60;
|
max-response-delay 60;
|
||||||
max-unacked-updates 10;
|
max-unacked-updates 10;
|
||||||
mclt 3600;
|
mclt 3600;
|
||||||
@@ -1305,7 +1308,7 @@ the zone containing PTR records - for IS
|
@@ -1318,7 +1321,7 @@ the zone containing PTR records - for IS
|
||||||
.PP
|
.PP
|
||||||
.nf
|
.nf
|
||||||
key DHCP_UPDATER {
|
key DHCP_UPDATER {
|
||||||
@ -136,7 +136,7 @@ diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
|
|||||||
secret pRP5FapFoJ95JEL06sv4PQ==;
|
secret pRP5FapFoJ95JEL06sv4PQ==;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1328,7 +1331,7 @@ dhcpd.conf file:
|
@@ -1341,7 +1344,7 @@ dhcpd.conf file:
|
||||||
.PP
|
.PP
|
||||||
.nf
|
.nf
|
||||||
key DHCP_UPDATER {
|
key DHCP_UPDATER {
|
||||||
@ -145,10 +145,10 @@ diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
|
|||||||
secret pRP5FapFoJ95JEL06sv4PQ==;
|
secret pRP5FapFoJ95JEL06sv4PQ==;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -2540,7 +2543,8 @@ statement
|
@@ -2555,7 +2558,8 @@ statement
|
||||||
The \fInext-server\fR statement is used to specify the host address of
|
The \fInext-server\fR statement is used to specify the host address of
|
||||||
the server from which the initial boot file (specified in the
|
the server from which the initial boot file (specified in the
|
||||||
\fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
|
\fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
|
||||||
-be a numeric IP address or a domain name.
|
-be a numeric IP address or a domain name.
|
||||||
+be a numeric IP address or a domain name. If no \fInext-server\fR statement
|
+be a numeric IP address or a domain name. If no \fInext-server\fR statement
|
||||||
+applies to a given client, the address 0.0.0.0 is used.
|
+applies to a given client, the address 0.0.0.0 is used.
|
@ -1,7 +1,7 @@
|
|||||||
diff -up dhcp-4.2.2/client/Makefile.am.rh637017 dhcp-4.2.2/client/Makefile.am
|
diff -up dhcp-4.2.5b1/client/Makefile.am.remove-bind dhcp-4.2.5b1/client/Makefile.am
|
||||||
--- dhcp-4.2.2/client/Makefile.am.rh637017 2010-09-15 00:32:36.000000000 +0200
|
--- dhcp-4.2.5b1/client/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.2/client/Makefile.am 2011-08-11 17:28:58.923897561 +0200
|
+++ dhcp-4.2.5b1/client/Makefile.am 2012-12-17 16:20:58.692538252 +0100
|
||||||
@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
||||||
scripts/netbsd scripts/nextstep scripts/openbsd \
|
scripts/netbsd scripts/nextstep scripts/openbsd \
|
||||||
scripts/solaris scripts/openwrt
|
scripts/solaris scripts/openwrt
|
||||||
dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
@ -10,22 +10,24 @@ diff -up dhcp-4.2.2/client/Makefile.am.rh637017 dhcp-4.2.2/client/Makefile.am
|
|||||||
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
diff -up dhcp-4.2.2/common/tests/Makefile.am.rh637017 dhcp-4.2.2/common/tests/Makefile.am
|
diff -up dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind dhcp-4.2.5b1/common/tests/Makefile.am
|
||||||
--- dhcp-4.2.2/common/tests/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
|
--- dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.2/common/tests/Makefile.am 2011-08-11 17:33:45.258637236 +0200
|
+++ dhcp-4.2.5b1/common/tests/Makefile.am 2012-12-17 16:20:58.693538239 +0100
|
||||||
@@ -6,6 +6,5 @@ TESTS = test_alloc
|
@@ -13,8 +13,8 @@ ATF_TESTS += alloc_unittest
|
||||||
|
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
|
||||||
test_alloc_SOURCES = test_alloc.c
|
alloc_unittest_LDADD = $(ATF_LDFLAGS)
|
||||||
test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
|
alloc_unittest_LDADD += ../libdhcp.a \
|
||||||
- ../../omapip/libomapi.a ../../bind/lib/libdns.a \
|
- ../../omapip/libomapi.a ../../bind/lib/libdns.a \
|
||||||
- ../../bind/lib/libisc.a
|
- ../../bind/lib/libisc.a
|
||||||
-
|
|
||||||
+ ../../omapip/libomapi.a \
|
+ ../../omapip/libomapi.a \
|
||||||
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
|
|
||||||
--- dhcp-4.2.2/configure.ac.rh637017 2011-07-20 02:32:18.000000000 +0200
|
check: $(ATF_TESTS)
|
||||||
+++ dhcp-4.2.2/configure.ac 2011-08-11 17:28:58.924897535 +0200
|
atf-run | atf-report
|
||||||
@@ -512,20 +512,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
|
diff -up dhcp-4.2.5b1/configure.ac.remove-bind dhcp-4.2.5b1/configure.ac
|
||||||
|
--- dhcp-4.2.5b1/configure.ac.remove-bind 2012-12-05 02:18:44.000000000 +0100
|
||||||
|
+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:20:58.693538239 +0100
|
||||||
|
@@ -581,20 +581,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
|
||||||
libbind=
|
libbind=
|
||||||
AC_ARG_WITH(libbind,
|
AC_ARG_WITH(libbind,
|
||||||
AC_HELP_STRING([--with-libbind=PATH],
|
AC_HELP_STRING([--with-libbind=PATH],
|
||||||
@ -68,7 +70,7 @@ diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
|
|||||||
|
|
||||||
# OpenLDAP support.
|
# OpenLDAP support.
|
||||||
AC_ARG_WITH(ldap,
|
AC_ARG_WITH(ldap,
|
||||||
@@ -562,7 +579,7 @@ fi
|
@@ -631,7 +648,7 @@ fi
|
||||||
CFLAGS="$CFLAGS $STD_CWARNINGS"
|
CFLAGS="$CFLAGS $STD_CWARNINGS"
|
||||||
|
|
||||||
# Try to add the bind include directory
|
# Try to add the bind include directory
|
||||||
@ -77,9 +79,9 @@ diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
|
|||||||
|
|
||||||
AC_C_FLEXIBLE_ARRAY_MEMBER
|
AC_C_FLEXIBLE_ARRAY_MEMBER
|
||||||
|
|
||||||
diff -up dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 dhcp-4.2.2/dhcpctl/Makefile.am
|
diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.2.5b1/dhcpctl/Makefile.am
|
||||||
--- dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
|
--- dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
|
||||||
+++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-08-11 17:28:58.924897535 +0200
|
+++ dhcp-4.2.5b1/dhcpctl/Makefile.am 2012-12-17 16:20:58.693538239 +0100
|
||||||
@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
|
@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
omshell_SOURCES = omshell.c
|
omshell_SOURCES = omshell.c
|
||||||
@ -94,12 +96,12 @@ diff -up dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 dhcp-4.2.2/dhcpctl/Makefile.am
|
|||||||
- ../bind/lib/libdns.a ../bind/lib/libisc.a
|
- ../bind/lib/libdns.a ../bind/lib/libisc.a
|
||||||
\ No newline at end of file
|
\ No newline at end of file
|
||||||
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
|
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
diff -up dhcp-4.2.2/Makefile.am.rh637017 dhcp-4.2.2/Makefile.am
|
diff -up dhcp-4.2.5b1/Makefile.am.remove-bind dhcp-4.2.5b1/Makefile.am
|
||||||
--- dhcp-4.2.2/Makefile.am.rh637017 2010-03-25 00:30:38.000000000 +0100
|
--- dhcp-4.2.5b1/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.2/Makefile.am 2011-08-11 17:28:58.925897509 +0200
|
+++ dhcp-4.2.5b1/Makefile.am 2012-12-17 16:20:58.693538239 +0100
|
||||||
@@ -21,7 +21,13 @@ EXTRA_DIST = RELNOTES LICENSE \
|
@@ -22,7 +22,13 @@ EXTRA_DIST = RELNOTES LICENSE \
|
||||||
util/bindvar.sh \
|
bind/Makefile bind/bind.tar.gz bind/version.tmp \
|
||||||
bind/Makefile bind/bind.tar.gz bind/version.tmp
|
common/tests/Atffile server/tests/Atffile
|
||||||
|
|
||||||
-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
|
-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
|
||||||
+if BUNDLED_BIND
|
+if BUNDLED_BIND
|
||||||
@ -112,9 +114,9 @@ diff -up dhcp-4.2.2/Makefile.am.rh637017 dhcp-4.2.2/Makefile.am
|
|||||||
|
|
||||||
nobase_include_HEADERS = dhcpctl/dhcpctl.h
|
nobase_include_HEADERS = dhcpctl/dhcpctl.h
|
||||||
|
|
||||||
diff -up dhcp-4.2.2/omapip/Makefile.am.rh637017 dhcp-4.2.2/omapip/Makefile.am
|
diff -up dhcp-4.2.5b1/omapip/Makefile.am.remove-bind dhcp-4.2.5b1/omapip/Makefile.am
|
||||||
--- dhcp-4.2.2/omapip/Makefile.am.rh637017 2010-02-12 01:13:54.000000000 +0100
|
--- dhcp-4.2.5b1/omapip/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
|
||||||
+++ dhcp-4.2.2/omapip/Makefile.am 2011-08-11 17:28:58.939897149 +0200
|
+++ dhcp-4.2.5b1/omapip/Makefile.am 2012-12-17 16:20:58.693538239 +0100
|
||||||
@@ -10,5 +10,5 @@ man_MANS = omapi.3
|
@@ -10,5 +10,5 @@ man_MANS = omapi.3
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
@ -122,9 +124,9 @@ diff -up dhcp-4.2.2/omapip/Makefile.am.rh637017 dhcp-4.2.2/omapip/Makefile.am
|
|||||||
-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
|
-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
|
||||||
+svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
+svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
diff -up dhcp-4.2.2/relay/Makefile.am.rh637017 dhcp-4.2.2/relay/Makefile.am
|
diff -up dhcp-4.2.5b1/relay/Makefile.am.remove-bind dhcp-4.2.5b1/relay/Makefile.am
|
||||||
--- dhcp-4.2.2/relay/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
|
--- dhcp-4.2.5b1/relay/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
|
||||||
+++ dhcp-4.2.2/relay/Makefile.am 2011-08-11 17:28:58.940897123 +0200
|
+++ dhcp-4.2.5b1/relay/Makefile.am 2012-12-17 16:20:58.694538225 +0100
|
||||||
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
||||||
sbin_PROGRAMS = dhcrelay
|
sbin_PROGRAMS = dhcrelay
|
||||||
dhcrelay_SOURCES = dhcrelay.c
|
dhcrelay_SOURCES = dhcrelay.c
|
||||||
@ -134,10 +136,10 @@ diff -up dhcp-4.2.2/relay/Makefile.am.rh637017 dhcp-4.2.2/relay/Makefile.am
|
|||||||
man_MANS = dhcrelay.8
|
man_MANS = dhcrelay.8
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
diff -up dhcp-4.2.2/server/Makefile.am.rh637017 dhcp-4.2.2/server/Makefile.am
|
diff -up dhcp-4.2.5b1/server/Makefile.am.remove-bind dhcp-4.2.5b1/server/Makefile.am
|
||||||
--- dhcp-4.2.2/server/Makefile.am.rh637017 2010-03-24 22:49:47.000000000 +0100
|
--- dhcp-4.2.5b1/server/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
|
||||||
+++ dhcp-4.2.2/server/Makefile.am 2011-08-11 17:28:58.944897021 +0200
|
+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:20:58.694538225 +0100
|
||||||
@@ -8,8 +8,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
@@ -14,8 +14,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
||||||
|
|
||||||
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
||||||
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
@ -147,3 +149,16 @@ diff -up dhcp-4.2.2/server/Makefile.am.rh637017 dhcp-4.2.2/server/Makefile.am
|
|||||||
|
|
||||||
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
diff -up dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind dhcp-4.2.5b1/server/tests/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
|
||||||
|
+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:26:01.093346768 +0100
|
||||||
|
@@ -18,8 +18,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
||||||
|
../ldap.c ../ldap_casa.c ../dhcpd.c
|
||||||
|
|
||||||
|
DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
|
||||||
|
- $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libdns.a \
|
||||||
|
- $(top_builddir)/bind/lib/libisc.a
|
||||||
|
+ $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
ATF_TESTS =
|
||||||
|
TESTS =
|
@ -1,6 +1,6 @@
|
|||||||
diff -up dhcp-4.2.4b1/client/clparse.c.rfc3442 dhcp-4.2.4b1/client/clparse.c
|
diff -up dhcp-4.2.5b1/client/clparse.c.rfc3442 dhcp-4.2.5b1/client/clparse.c
|
||||||
--- dhcp-4.2.4b1/client/clparse.c.rfc3442 2012-04-16 17:34:27.546079944 +0200
|
--- dhcp-4.2.5b1/client/clparse.c.rfc3442 2012-12-17 13:23:34.387564654 +0100
|
||||||
+++ dhcp-4.2.4b1/client/clparse.c 2012-04-16 17:34:27.605079118 +0200
|
+++ dhcp-4.2.5b1/client/clparse.c 2012-12-17 13:23:34.437563996 +0100
|
||||||
@@ -37,7 +37,7 @@
|
@@ -37,7 +37,7 @@
|
||||||
|
|
||||||
struct client_config top_level_config;
|
struct client_config top_level_config;
|
||||||
@ -35,10 +35,10 @@ diff -up dhcp-4.2.4b1/client/clparse.c.rfc3442 dhcp-4.2.4b1/client/clparse.c
|
|||||||
for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
|
for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
|
||||||
if (default_requested_options[code] == NULL)
|
if (default_requested_options[code] == NULL)
|
||||||
log_fatal("Unable to find option definition for "
|
log_fatal("Unable to find option definition for "
|
||||||
diff -up dhcp-4.2.4b1/common/dhcp-options.5.rfc3442 dhcp-4.2.4b1/common/dhcp-options.5
|
diff -up dhcp-4.2.5b1/common/dhcp-options.5.rfc3442 dhcp-4.2.5b1/common/dhcp-options.5
|
||||||
--- dhcp-4.2.4b1/common/dhcp-options.5.rfc3442 2012-04-16 17:34:27.537080070 +0200
|
--- dhcp-4.2.5b1/common/dhcp-options.5.rfc3442 2012-12-17 13:23:34.376564797 +0100
|
||||||
+++ dhcp-4.2.4b1/common/dhcp-options.5 2012-04-16 17:34:27.606079104 +0200
|
+++ dhcp-4.2.5b1/common/dhcp-options.5 2012-12-17 13:25:18.435141385 +0100
|
||||||
@@ -115,6 +115,26 @@ hexadecimal, separated by colons. For
|
@@ -116,6 +116,26 @@ hexadecimal, separated by colons. For e
|
||||||
or
|
or
|
||||||
option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
|
option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
|
||||||
.fi
|
.fi
|
||||||
@ -64,8 +64,8 @@ diff -up dhcp-4.2.4b1/common/dhcp-options.5.rfc3442 dhcp-4.2.4b1/common/dhcp-opt
|
|||||||
+.fi
|
+.fi
|
||||||
.SH SETTING OPTION VALUES USING EXPRESSIONS
|
.SH SETTING OPTION VALUES USING EXPRESSIONS
|
||||||
Sometimes it's helpful to be able to set the value of a DHCP option
|
Sometimes it's helpful to be able to set the value of a DHCP option
|
||||||
based on some value that the client has sent. To do this, you can
|
based on some value that the client has sent. To do this, you can
|
||||||
@@ -931,6 +951,29 @@ dhclient-script will create routes:
|
@@ -932,6 +952,29 @@ dhclient-script will create routes:
|
||||||
.RE
|
.RE
|
||||||
.PP
|
.PP
|
||||||
.nf
|
.nf
|
||||||
@ -95,9 +95,9 @@ diff -up dhcp-4.2.4b1/common/dhcp-options.5.rfc3442 dhcp-4.2.4b1/common/dhcp-opt
|
|||||||
.B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
|
.B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
|
||||||
[\fB,\fR \fIip-address\fR...]\fB;\fR
|
[\fB,\fR \fIip-address\fR...]\fB;\fR
|
||||||
.fi
|
.fi
|
||||||
diff -up dhcp-4.2.4b1/common/inet.c.rfc3442 dhcp-4.2.4b1/common/inet.c
|
diff -up dhcp-4.2.5b1/common/inet.c.rfc3442 dhcp-4.2.5b1/common/inet.c
|
||||||
--- dhcp-4.2.4b1/common/inet.c.rfc3442 2011-05-11 02:47:22.000000000 +0200
|
--- dhcp-4.2.5b1/common/inet.c.rfc3442 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.4b1/common/inet.c 2012-04-16 17:34:27.607079090 +0200
|
+++ dhcp-4.2.5b1/common/inet.c 2012-12-17 13:23:34.440563957 +0100
|
||||||
@@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
|
@@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
|
||||||
return ISC_R_SUCCESS;
|
return ISC_R_SUCCESS;
|
||||||
}
|
}
|
||||||
@ -159,10 +159,10 @@ diff -up dhcp-4.2.4b1/common/inet.c.rfc3442 dhcp-4.2.4b1/common/inet.c
|
|||||||
/* piaddr() turns an iaddr structure into a printable address. */
|
/* piaddr() turns an iaddr structure into a printable address. */
|
||||||
/* XXX: should use a const pointer rather than passing the structure */
|
/* XXX: should use a const pointer rather than passing the structure */
|
||||||
const char *
|
const char *
|
||||||
diff -up dhcp-4.2.4b1/common/options.c.rfc3442 dhcp-4.2.4b1/common/options.c
|
diff -up dhcp-4.2.5b1/common/options.c.rfc3442 dhcp-4.2.5b1/common/options.c
|
||||||
--- dhcp-4.2.4b1/common/options.c.rfc3442 2012-03-20 01:31:53.000000000 +0100
|
--- dhcp-4.2.5b1/common/options.c.rfc3442 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.4b1/common/options.c 2012-04-16 17:34:27.608079076 +0200
|
+++ dhcp-4.2.5b1/common/options.c 2012-12-17 13:29:38.961536040 +0100
|
||||||
@@ -706,7 +706,11 @@ cons_options(struct packet *inpacket, st
|
@@ -713,7 +713,11 @@ cons_options(struct packet *inpacket, st
|
||||||
* packet.
|
* packet.
|
||||||
*/
|
*/
|
||||||
priority_list[priority_len++] = DHO_SUBNET_MASK;
|
priority_list[priority_len++] = DHO_SUBNET_MASK;
|
||||||
@ -175,15 +175,15 @@ diff -up dhcp-4.2.4b1/common/options.c.rfc3442 dhcp-4.2.4b1/common/options.c
|
|||||||
priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
|
priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
|
||||||
priority_list[priority_len++] = DHO_HOST_NAME;
|
priority_list[priority_len++] = DHO_HOST_NAME;
|
||||||
priority_list[priority_len++] = DHO_FQDN;
|
priority_list[priority_len++] = DHO_FQDN;
|
||||||
@@ -1683,6 +1687,7 @@ const char *pretty_print_option (option,
|
@@ -1694,6 +1698,7 @@ const char *pretty_print_option (option,
|
||||||
const unsigned char *dp = data;
|
|
||||||
char comma;
|
|
||||||
unsigned long tval;
|
unsigned long tval;
|
||||||
+ unsigned int octets = 0;
|
isc_boolean_t a_array = ISC_FALSE;
|
||||||
|
int len_used;
|
||||||
|
+ unsigned int octets = 0;
|
||||||
|
|
||||||
if (emit_commas)
|
if (emit_commas)
|
||||||
comma = ',';
|
comma = ',';
|
||||||
@@ -1691,6 +1696,7 @@ const char *pretty_print_option (option,
|
@@ -1702,6 +1707,7 @@ const char *pretty_print_option (option,
|
||||||
|
|
||||||
memset (enumbuf, 0, sizeof enumbuf);
|
memset (enumbuf, 0, sizeof enumbuf);
|
||||||
|
|
||||||
@ -191,7 +191,7 @@ diff -up dhcp-4.2.4b1/common/options.c.rfc3442 dhcp-4.2.4b1/common/options.c
|
|||||||
/* Figure out the size of the data. */
|
/* Figure out the size of the data. */
|
||||||
for (l = i = 0; option -> format [i]; i++, l++) {
|
for (l = i = 0; option -> format [i]; i++, l++) {
|
||||||
if (l >= sizeof(fmtbuf) - 1)
|
if (l >= sizeof(fmtbuf) - 1)
|
||||||
@@ -1840,6 +1846,33 @@ const char *pretty_print_option (option,
|
@@ -1876,6 +1882,33 @@ const char *pretty_print_option (option,
|
||||||
if (numhunk < 0)
|
if (numhunk < 0)
|
||||||
numhunk = 1;
|
numhunk = 1;
|
||||||
|
|
||||||
@ -224,8 +224,8 @@ diff -up dhcp-4.2.4b1/common/options.c.rfc3442 dhcp-4.2.4b1/common/options.c
|
|||||||
+
|
+
|
||||||
/* Cycle through the array (or hunk) printing the data. */
|
/* Cycle through the array (or hunk) printing the data. */
|
||||||
for (i = 0; i < numhunk; i++) {
|
for (i = 0; i < numhunk; i++) {
|
||||||
for (j = 0; j < numelem; j++) {
|
if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
|
||||||
@@ -1978,6 +2011,20 @@ const char *pretty_print_option (option,
|
@@ -2031,6 +2064,20 @@ const char *pretty_print_option (option,
|
||||||
strcpy(op, piaddr(iaddr));
|
strcpy(op, piaddr(iaddr));
|
||||||
dp += 4;
|
dp += 4;
|
||||||
break;
|
break;
|
||||||
@ -246,9 +246,9 @@ diff -up dhcp-4.2.4b1/common/options.c.rfc3442 dhcp-4.2.4b1/common/options.c
|
|||||||
case '6':
|
case '6':
|
||||||
iaddr.len = 16;
|
iaddr.len = 16;
|
||||||
memcpy(iaddr.iabuf, dp, 16);
|
memcpy(iaddr.iabuf, dp, 16);
|
||||||
diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
|
diff -up dhcp-4.2.5b1/common/parse.c.rfc3442 dhcp-4.2.5b1/common/parse.c
|
||||||
--- dhcp-4.2.4b1/common/parse.c.rfc3442 2012-04-16 17:34:27.577079510 +0200
|
--- dhcp-4.2.5b1/common/parse.c.rfc3442 2012-12-17 13:23:34.408564378 +0100
|
||||||
+++ dhcp-4.2.4b1/common/parse.c 2012-04-16 17:34:27.610079048 +0200
|
+++ dhcp-4.2.5b1/common/parse.c 2012-12-17 13:23:34.444563905 +0100
|
||||||
@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
|
@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -289,7 +289,7 @@ diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
|
|||||||
* Return true if every character in the string is hexadecimal.
|
* Return true if every character in the string is hexadecimal.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
@@ -704,8 +737,10 @@ unsigned char *parse_numeric_aggregate (
|
@@ -719,8 +752,10 @@ unsigned char *parse_numeric_aggregate (
|
||||||
if (count) {
|
if (count) {
|
||||||
token = peek_token (&val, (unsigned *)0, cfile);
|
token = peek_token (&val, (unsigned *)0, cfile);
|
||||||
if (token != separator) {
|
if (token != separator) {
|
||||||
@ -301,7 +301,7 @@ diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
|
|||||||
if (token != RBRACE && token != LBRACE)
|
if (token != RBRACE && token != LBRACE)
|
||||||
token = next_token (&val,
|
token = next_token (&val,
|
||||||
(unsigned *)0,
|
(unsigned *)0,
|
||||||
@@ -1628,6 +1663,9 @@ int parse_option_code_definition (cfile,
|
@@ -1660,6 +1695,9 @@ int parse_option_code_definition (cfile,
|
||||||
case IP_ADDRESS:
|
case IP_ADDRESS:
|
||||||
type = 'I';
|
type = 'I';
|
||||||
break;
|
break;
|
||||||
@ -311,7 +311,7 @@ diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
|
|||||||
case IP6_ADDRESS:
|
case IP6_ADDRESS:
|
||||||
type = '6';
|
type = '6';
|
||||||
break;
|
break;
|
||||||
@@ -5375,6 +5413,15 @@ int parse_option_token (rv, cfile, fmt,
|
@@ -5418,6 +5456,15 @@ int parse_option_token (rv, cfile, fmt,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -327,7 +327,7 @@ diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
|
|||||||
case '6': /* IPv6 address. */
|
case '6': /* IPv6 address. */
|
||||||
if (!parse_ip6_addr(cfile, &addr)) {
|
if (!parse_ip6_addr(cfile, &addr)) {
|
||||||
return 0;
|
return 0;
|
||||||
@@ -5635,6 +5682,13 @@ int parse_option_decl (oc, cfile)
|
@@ -5695,6 +5742,13 @@ int parse_option_decl (oc, cfile)
|
||||||
goto exit;
|
goto exit;
|
||||||
len = ip_addr.len;
|
len = ip_addr.len;
|
||||||
dp = ip_addr.iabuf;
|
dp = ip_addr.iabuf;
|
||||||
@ -341,9 +341,9 @@ diff -up dhcp-4.2.4b1/common/parse.c.rfc3442 dhcp-4.2.4b1/common/parse.c
|
|||||||
|
|
||||||
alloc:
|
alloc:
|
||||||
if (hunkix + len > sizeof hunkbuf) {
|
if (hunkix + len > sizeof hunkbuf) {
|
||||||
diff -up dhcp-4.2.4b1/common/tables.c.rfc3442 dhcp-4.2.4b1/common/tables.c
|
diff -up dhcp-4.2.5b1/common/tables.c.rfc3442 dhcp-4.2.5b1/common/tables.c
|
||||||
--- dhcp-4.2.4b1/common/tables.c.rfc3442 2012-04-16 17:34:27.566079664 +0200
|
--- dhcp-4.2.5b1/common/tables.c.rfc3442 2012-12-17 13:23:34.398564508 +0100
|
||||||
+++ dhcp-4.2.4b1/common/tables.c 2012-04-16 17:34:27.611079034 +0200
|
+++ dhcp-4.2.5b1/common/tables.c 2012-12-17 13:23:34.445563891 +0100
|
||||||
@@ -52,6 +52,7 @@ HASH_FUNCTIONS (option_code, const unsig
|
@@ -52,6 +52,7 @@ HASH_FUNCTIONS (option_code, const unsig
|
||||||
Format codes:
|
Format codes:
|
||||||
|
|
||||||
@ -352,7 +352,7 @@ diff -up dhcp-4.2.4b1/common/tables.c.rfc3442 dhcp-4.2.4b1/common/tables.c
|
|||||||
6 - IPv6 address
|
6 - IPv6 address
|
||||||
l - 32-bit signed integer
|
l - 32-bit signed integer
|
||||||
L - 32-bit unsigned integer
|
L - 32-bit unsigned integer
|
||||||
@@ -209,6 +210,7 @@ static struct option dhcp_options[] = {
|
@@ -210,6 +211,7 @@ static struct option dhcp_options[] = {
|
||||||
{ "default-url", "t", &dhcp_universe, 114, 1 },
|
{ "default-url", "t", &dhcp_universe, 114, 1 },
|
||||||
{ "subnet-selection", "I", &dhcp_universe, 118, 1 },
|
{ "subnet-selection", "I", &dhcp_universe, 118, 1 },
|
||||||
{ "domain-search", "D", &dhcp_universe, 119, 1 },
|
{ "domain-search", "D", &dhcp_universe, 119, 1 },
|
||||||
@ -360,10 +360,10 @@ diff -up dhcp-4.2.4b1/common/tables.c.rfc3442 dhcp-4.2.4b1/common/tables.c
|
|||||||
{ "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
|
{ "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
|
||||||
{ "vivso", "Evendor.", &dhcp_universe, 125, 1 },
|
{ "vivso", "Evendor.", &dhcp_universe, 125, 1 },
|
||||||
#if 0
|
#if 0
|
||||||
diff -up dhcp-4.2.4b1/includes/dhcpd.h.rfc3442 dhcp-4.2.4b1/includes/dhcpd.h
|
diff -up dhcp-4.2.5b1/includes/dhcpd.h.rfc3442 dhcp-4.2.5b1/includes/dhcpd.h
|
||||||
--- dhcp-4.2.4b1/includes/dhcpd.h.rfc3442 2012-04-16 17:34:27.543079986 +0200
|
--- dhcp-4.2.5b1/includes/dhcpd.h.rfc3442 2012-12-17 13:23:34.382564719 +0100
|
||||||
+++ dhcp-4.2.4b1/includes/dhcpd.h 2012-04-16 17:34:27.613079006 +0200
|
+++ dhcp-4.2.5b1/includes/dhcpd.h 2012-12-17 13:23:34.446563877 +0100
|
||||||
@@ -2666,6 +2666,7 @@ isc_result_t range2cidr(struct iaddrcidr
|
@@ -2678,6 +2678,7 @@ isc_result_t range2cidr(struct iaddrcidr
|
||||||
const struct iaddr *lo, const struct iaddr *hi);
|
const struct iaddr *lo, const struct iaddr *hi);
|
||||||
isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
|
isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
|
||||||
const char *piaddr (struct iaddr);
|
const char *piaddr (struct iaddr);
|
||||||
@ -371,7 +371,7 @@ diff -up dhcp-4.2.4b1/includes/dhcpd.h.rfc3442 dhcp-4.2.4b1/includes/dhcpd.h
|
|||||||
char *piaddrmask(struct iaddr *, struct iaddr *);
|
char *piaddrmask(struct iaddr *, struct iaddr *);
|
||||||
char *piaddrcidr(const struct iaddr *, unsigned int);
|
char *piaddrcidr(const struct iaddr *, unsigned int);
|
||||||
u_int16_t validate_port(char *);
|
u_int16_t validate_port(char *);
|
||||||
@@ -2873,6 +2874,7 @@ void parse_client_lease_declaration (str
|
@@ -2887,6 +2888,7 @@ void parse_client_lease_declaration (str
|
||||||
int parse_option_decl (struct option_cache **, struct parse *);
|
int parse_option_decl (struct option_cache **, struct parse *);
|
||||||
void parse_string_list (struct parse *, struct string_list **, int);
|
void parse_string_list (struct parse *, struct string_list **, int);
|
||||||
int parse_ip_addr (struct parse *, struct iaddr *);
|
int parse_ip_addr (struct parse *, struct iaddr *);
|
||||||
@ -379,9 +379,9 @@ diff -up dhcp-4.2.4b1/includes/dhcpd.h.rfc3442 dhcp-4.2.4b1/includes/dhcpd.h
|
|||||||
int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
|
int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
|
||||||
void parse_reject_statement (struct parse *, struct client_config *);
|
void parse_reject_statement (struct parse *, struct client_config *);
|
||||||
|
|
||||||
diff -up dhcp-4.2.4b1/includes/dhcp.h.rfc3442 dhcp-4.2.4b1/includes/dhcp.h
|
diff -up dhcp-4.2.5b1/includes/dhcp.h.rfc3442 dhcp-4.2.5b1/includes/dhcp.h
|
||||||
--- dhcp-4.2.4b1/includes/dhcp.h.rfc3442 2012-02-16 22:09:14.000000000 +0100
|
--- dhcp-4.2.5b1/includes/dhcp.h.rfc3442 2012-10-23 21:02:13.000000000 +0200
|
||||||
+++ dhcp-4.2.4b1/includes/dhcp.h 2012-04-16 17:34:27.613079006 +0200
|
+++ dhcp-4.2.5b1/includes/dhcp.h 2012-12-17 13:23:34.446563877 +0100
|
||||||
@@ -163,6 +163,7 @@ struct dhcp_packet {
|
@@ -163,6 +163,7 @@ struct dhcp_packet {
|
||||||
#define DHO_ASSOCIATED_IP 92
|
#define DHO_ASSOCIATED_IP 92
|
||||||
#define DHO_SUBNET_SELECTION 118 /* RFC3011! */
|
#define DHO_SUBNET_SELECTION 118 /* RFC3011! */
|
||||||
@ -390,9 +390,9 @@ diff -up dhcp-4.2.4b1/includes/dhcp.h.rfc3442 dhcp-4.2.4b1/includes/dhcp.h
|
|||||||
#define DHO_VIVCO_SUBOPTIONS 124
|
#define DHO_VIVCO_SUBOPTIONS 124
|
||||||
#define DHO_VIVSO_SUBOPTIONS 125
|
#define DHO_VIVSO_SUBOPTIONS 125
|
||||||
|
|
||||||
diff -up dhcp-4.2.4b1/includes/dhctoken.h.rfc3442 dhcp-4.2.4b1/includes/dhctoken.h
|
diff -up dhcp-4.2.5b1/includes/dhctoken.h.rfc3442 dhcp-4.2.5b1/includes/dhctoken.h
|
||||||
--- dhcp-4.2.4b1/includes/dhctoken.h.rfc3442 2012-04-16 17:34:27.000000000 +0200
|
--- dhcp-4.2.5b1/includes/dhctoken.h.rfc3442 2012-12-17 13:23:34.348565167 +0100
|
||||||
+++ dhcp-4.2.4b1/includes/dhctoken.h 2012-04-16 17:35:15.028414805 +0200
|
+++ dhcp-4.2.5b1/includes/dhctoken.h 2012-12-17 13:23:34.446563877 +0100
|
||||||
@@ -365,7 +365,8 @@ enum dhcp_token {
|
@@ -365,7 +365,8 @@ enum dhcp_token {
|
||||||
PRIMARY6 = 666,
|
PRIMARY6 = 666,
|
||||||
SECONDARY6 = 667,
|
SECONDARY6 = 667,
|
@ -1,7 +1,7 @@
|
|||||||
diff -up dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 dhcp-4.2.3-P2/common/dhcp-options.5
|
diff -up dhcp-4.2.5b1/common/dhcp-options.5.rfc5970 dhcp-4.2.5b1/common/dhcp-options.5
|
||||||
--- dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 2012-03-21 19:39:47.572002389 +0100
|
--- dhcp-4.2.5b1/common/dhcp-options.5.rfc5970 2012-12-17 13:43:44.000000000 +0100
|
||||||
+++ dhcp-4.2.3-P2/common/dhcp-options.5 2012-03-21 19:39:47.670001164 +0100
|
+++ dhcp-4.2.5b1/common/dhcp-options.5 2012-12-17 13:45:18.777638579 +0100
|
||||||
@@ -1770,7 +1770,48 @@ The \fBlq-relay-data\fR option is used i
|
@@ -1771,7 +1771,48 @@ The \fBlq-relay-data\fR option is used i
|
||||||
The \fBlq-client-link\fR option is used internally by for lease query.
|
The \fBlq-client-link\fR option is used internally by for lease query.
|
||||||
.RE
|
.RE
|
||||||
.PP
|
.PP
|
||||||
@ -16,7 +16,7 @@ diff -up dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 dhcp-4.2.3-P2/common/dhcp-o
|
|||||||
+boot file. Used primarily for UEFI network booting, it contains an RFC3986
|
+boot file. Used primarily for UEFI network booting, it contains an RFC3986
|
||||||
+compliant URI which the client may use to boot an operating system. This option
|
+compliant URI which the client may use to boot an operating system. This option
|
||||||
+is defined in RFC5970
|
+is defined in RFC5970
|
||||||
+.RE
|
.RE
|
||||||
+.PP
|
+.PP
|
||||||
+
|
+
|
||||||
+.B option
|
+.B option
|
||||||
@ -31,7 +31,7 @@ diff -up dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 dhcp-4.2.3-P2/common/dhcp-o
|
|||||||
+the requesting client. These values corespond to the values available to the
|
+the requesting client. These values corespond to the values available to the
|
||||||
+dhcpv4 option architecture-type, as defined in RFC4578, section 2.1.
|
+dhcpv4 option architecture-type, as defined in RFC4578, section 2.1.
|
||||||
+This option is defined in RFC5970
|
+This option is defined in RFC5970
|
||||||
.RE
|
+ .RE
|
||||||
+.PP
|
+.PP
|
||||||
+
|
+
|
||||||
+.B option
|
+.B option
|
||||||
@ -49,11 +49,11 @@ diff -up dhcp-4.2.3-P2/common/dhcp-options.5.rfc5970 dhcp-4.2.3-P2/common/dhcp-o
|
|||||||
+.PP
|
+.PP
|
||||||
.SH DEFINING NEW OPTIONS
|
.SH DEFINING NEW OPTIONS
|
||||||
The Internet Systems Consortium DHCP client and server provide the
|
The Internet Systems Consortium DHCP client and server provide the
|
||||||
capability to define new options. Each DHCP option has a name, a
|
capability to define new options. Each DHCP option has a name, a
|
||||||
diff -up dhcp-4.2.3-P2/common/tables.c.rfc5970 dhcp-4.2.3-P2/common/tables.c
|
diff -up dhcp-4.2.5b1/common/tables.c.rfc5970 dhcp-4.2.5b1/common/tables.c
|
||||||
--- dhcp-4.2.3-P2/common/tables.c.rfc5970 2012-03-21 19:39:47.577002328 +0100
|
--- dhcp-4.2.5b1/common/tables.c.rfc5970 2012-12-17 13:43:44.204939024 +0100
|
||||||
+++ dhcp-4.2.3-P2/common/tables.c 2012-03-21 19:39:47.670001164 +0100
|
+++ dhcp-4.2.5b1/common/tables.c 2012-12-17 13:43:44.286937948 +0100
|
||||||
@@ -461,6 +461,18 @@ static struct option dhcpv6_options[] =
|
@@ -463,6 +463,18 @@ static struct option dhcpv6_options[] =
|
||||||
{ "lq-relay-data", "6X", &dhcpv6_universe, 47, 1 },
|
{ "lq-relay-data", "6X", &dhcpv6_universe, 47, 1 },
|
||||||
{ "lq-client-link", "6A", &dhcpv6_universe, 48, 1 },
|
{ "lq-client-link", "6A", &dhcpv6_universe, 48, 1 },
|
||||||
|
|
||||||
@ -72,9 +72,9 @@ diff -up dhcp-4.2.3-P2/common/tables.c.rfc5970 dhcp-4.2.3-P2/common/tables.c
|
|||||||
{ NULL, NULL, NULL, 0, 0 }
|
{ NULL, NULL, NULL, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
diff -up dhcp-4.2.3-P2/includes/dhcp6.h.rfc5970 dhcp-4.2.3-P2/includes/dhcp6.h
|
diff -up dhcp-4.2.5b1/includes/dhcp6.h.rfc5970 dhcp-4.2.5b1/includes/dhcp6.h
|
||||||
--- dhcp-4.2.3-P2/includes/dhcp6.h.rfc5970 2010-02-17 21:33:55.000000000 +0100
|
--- dhcp-4.2.5b1/includes/dhcp6.h.rfc5970 2012-12-04 20:45:42.000000000 +0100
|
||||||
+++ dhcp-4.2.3-P2/includes/dhcp6.h 2012-03-21 19:39:47.671001151 +0100
|
+++ dhcp-4.2.5b1/includes/dhcp6.h 2012-12-17 13:43:44.286937948 +0100
|
||||||
@@ -75,6 +75,11 @@
|
@@ -75,6 +75,11 @@
|
||||||
#define D6O_CLT_TIME 46 /* RFC5007 */
|
#define D6O_CLT_TIME 46 /* RFC5007 */
|
||||||
#define D6O_LQ_RELAY_DATA 47 /* RFC5007 */
|
#define D6O_LQ_RELAY_DATA 47 /* RFC5007 */
|
@ -1,7 +1,7 @@
|
|||||||
diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
diff -up dhcp-4.2.5b1/client/dhc6.c.sendDecline dhcp-4.2.5b1/client/dhc6.c
|
||||||
--- dhcp-4.2.1-P1/client/dhc6.c.sendDecline 2010-09-10 22:27:11.000000000 +0200
|
--- dhcp-4.2.5b1/client/dhc6.c.sendDecline 2012-12-05 02:17:38.000000000 +0100
|
||||||
+++ dhcp-4.2.1-P1/client/dhc6.c 2011-06-17 14:19:48.992099868 +0200
|
+++ dhcp-4.2.5b1/client/dhc6.c 2012-12-17 13:21:16.922444939 +0100
|
||||||
@@ -95,6 +95,8 @@ void do_select6(void *input);
|
@@ -96,6 +96,8 @@ void do_select6(void *input);
|
||||||
void do_refresh6(void *input);
|
void do_refresh6(void *input);
|
||||||
static void do_release6(void *input);
|
static void do_release6(void *input);
|
||||||
static void start_bound(struct client_state *client);
|
static void start_bound(struct client_state *client);
|
||||||
@ -10,7 +10,7 @@ diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
|||||||
static void start_informed(struct client_state *client);
|
static void start_informed(struct client_state *client);
|
||||||
void informed_handler(struct packet *packet, struct client_state *client);
|
void informed_handler(struct packet *packet, struct client_state *client);
|
||||||
void bound_handler(struct packet *packet, struct client_state *client);
|
void bound_handler(struct packet *packet, struct client_state *client);
|
||||||
@@ -2075,6 +2077,7 @@ start_release6(struct client_state *clie
|
@@ -2080,6 +2082,7 @@ start_release6(struct client_state *clie
|
||||||
cancel_timeout(do_select6, client);
|
cancel_timeout(do_select6, client);
|
||||||
cancel_timeout(do_refresh6, client);
|
cancel_timeout(do_refresh6, client);
|
||||||
cancel_timeout(do_release6, client);
|
cancel_timeout(do_release6, client);
|
||||||
@ -18,7 +18,7 @@ diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
|||||||
client->state = S_STOPPED;
|
client->state = S_STOPPED;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -2708,6 +2711,7 @@ dhc6_check_reply(struct client_state *cl
|
@@ -2713,6 +2716,7 @@ dhc6_check_reply(struct client_state *cl
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case S_STOPPED:
|
case S_STOPPED:
|
||||||
@ -26,7 +26,7 @@ diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
|||||||
action = dhc6_stop_action;
|
action = dhc6_stop_action;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -2809,6 +2813,7 @@ dhc6_check_reply(struct client_state *cl
|
@@ -2814,6 +2818,7 @@ dhc6_check_reply(struct client_state *cl
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case S_STOPPED:
|
case S_STOPPED:
|
||||||
@ -34,7 +34,7 @@ diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
|||||||
/* Nothing critical to do at this stage. */
|
/* Nothing critical to do at this stage. */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -3799,17 +3804,23 @@ reply_handler(struct packet *packet, str
|
@@ -3804,17 +3809,23 @@ reply_handler(struct packet *packet, str
|
||||||
cancel_timeout(do_select6, client);
|
cancel_timeout(do_select6, client);
|
||||||
cancel_timeout(do_refresh6, client);
|
cancel_timeout(do_refresh6, client);
|
||||||
cancel_timeout(do_release6, client);
|
cancel_timeout(do_release6, client);
|
||||||
@ -66,9 +66,9 @@ diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4336,7 +4347,11 @@ start_bound(struct client_state *client)
|
@@ -4342,7 +4353,11 @@ start_bound(struct client_state *client)
|
||||||
oldia, oldaddr);
|
|
||||||
dhc6_marshall_values("new_", client, lease, ia, addr);
|
dhc6_marshall_values("new_", client, lease, ia, addr);
|
||||||
|
script_write_requested6(client);
|
||||||
|
|
||||||
- script_go(client);
|
- script_go(client);
|
||||||
+ // when script returns 3, DAD failed
|
+ // when script returns 3, DAD failed
|
||||||
@ -79,7 +79,7 @@ diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* XXX: maybe we should loop on the old values instead? */
|
/* XXX: maybe we should loop on the old values instead? */
|
||||||
@@ -4382,6 +4397,149 @@ start_bound(struct client_state *client)
|
@@ -4390,6 +4405,149 @@ start_bound(struct client_state *client)
|
||||||
dhc6_check_times(client);
|
dhc6_check_times(client);
|
||||||
}
|
}
|
||||||
|
|
120
dhcp-4.2.5-sharedlib.patch
Normal file
120
dhcp-4.2.5-sharedlib.patch
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
diff -up dhcp-4.2.5b1/client/Makefile.am.sharedlib dhcp-4.2.5b1/client/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/client/Makefile.am.sharedlib 2012-12-17 16:26:53.350623790 +0100
|
||||||
|
+++ dhcp-4.2.5b1/client/Makefile.am 2012-12-17 16:26:53.384623342 +0100
|
||||||
|
@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
||||||
|
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
|
||||||
|
scripts/netbsd scripts/nextstep scripts/openbsd \
|
||||||
|
scripts/solaris scripts/openwrt
|
||||||
|
-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
|
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
||||||
|
$(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
|
||||||
|
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
||||||
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
diff -up dhcp-4.2.5b1/common/tests/Makefile.am.sharedlib dhcp-4.2.5b1/common/tests/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/common/tests/Makefile.am.sharedlib 2012-12-17 16:26:53.271624835 +0100
|
||||||
|
+++ dhcp-4.2.5b1/common/tests/Makefile.am 2012-12-17 16:26:53.384623342 +0100
|
||||||
|
@@ -13,7 +13,7 @@ ATF_TESTS += alloc_unittest
|
||||||
|
alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
|
||||||
|
alloc_unittest_LDADD = $(ATF_LDFLAGS)
|
||||||
|
alloc_unittest_LDADD += ../libdhcp.a \
|
||||||
|
- ../../omapip/libomapi.a \
|
||||||
|
+ ../../omapip/libomapi.la \
|
||||||
|
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
check: $(ATF_TESTS)
|
||||||
|
diff -up dhcp-4.2.5b1/configure.ac.sharedlib dhcp-4.2.5b1/configure.ac
|
||||||
|
--- dhcp-4.2.5b1/configure.ac.sharedlib 2012-12-17 16:26:53.350623790 +0100
|
||||||
|
+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:26:53.384623342 +0100
|
||||||
|
@@ -37,7 +37,8 @@ fi
|
||||||
|
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
|
||||||
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
||||||
|
-AC_PROG_RANLIB
|
||||||
|
+# Use libtool to simplify building of shared libraries
|
||||||
|
+AC_PROG_LIBTOOL
|
||||||
|
AC_CONFIG_HEADERS([includes/config.h])
|
||||||
|
|
||||||
|
# we sometimes need to know byte order for building packets
|
||||||
|
diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.sharedlib dhcp-4.2.5b1/dhcpctl/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/dhcpctl/Makefile.am.sharedlib 2012-12-17 16:26:53.271624835 +0100
|
||||||
|
+++ dhcp-4.2.5b1/dhcpctl/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
||||||
|
@@ -1,15 +1,15 @@
|
||||||
|
bin_PROGRAMS = omshell
|
||||||
|
-lib_LIBRARIES = libdhcpctl.a
|
||||||
|
+lib_LTLIBRARIES = libdhcpctl.la
|
||||||
|
noinst_PROGRAMS = cltest
|
||||||
|
man_MANS = omshell.1 dhcpctl.3
|
||||||
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
|
omshell_SOURCES = omshell.c
|
||||||
|
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
|
+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
||||||
|
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
|
||||||
|
+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
|
||||||
|
|
||||||
|
cltest_SOURCES = cltest.c
|
||||||
|
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
|
+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
|
||||||
|
$(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
diff -up dhcp-4.2.5b1/omapip/Makefile.am.sharedlib dhcp-4.2.5b1/omapip/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/omapip/Makefile.am.sharedlib 2012-12-17 16:26:53.272624822 +0100
|
||||||
|
+++ dhcp-4.2.5b1/omapip/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
-lib_LIBRARIES = libomapi.a
|
||||||
|
+lib_LTLIBRARIES = libomapi.la
|
||||||
|
noinst_PROGRAMS = svtest
|
||||||
|
|
||||||
|
-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
||||||
|
+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
|
||||||
|
errwarn.c listener.c dispatch.c generic.c support.c \
|
||||||
|
handle.c message.c convert.c hash.c auth.c inet_addr.c \
|
||||||
|
array.c trace.c toisc.c iscprint.c isclib.c
|
||||||
|
@@ -10,5 +10,5 @@ man_MANS = omapi.3
|
||||||
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
|
svtest_SOURCES = test.c
|
||||||
|
-svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
+svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
diff -up dhcp-4.2.5b1/relay/Makefile.am.sharedlib dhcp-4.2.5b1/relay/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/relay/Makefile.am.sharedlib 2012-12-17 16:26:53.351623777 +0100
|
||||||
|
+++ dhcp-4.2.5b1/relay/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
||||||
|
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
|
||||||
|
|
||||||
|
sbin_PROGRAMS = dhcrelay
|
||||||
|
dhcrelay_SOURCES = dhcrelay.c
|
||||||
|
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
|
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
||||||
|
$(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
|
||||||
|
man_MANS = dhcrelay.8
|
||||||
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
diff -up dhcp-4.2.5b1/server/Makefile.am.sharedlib dhcp-4.2.5b1/server/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/server/Makefile.am.sharedlib 2012-12-17 16:26:53.272624822 +0100
|
||||||
|
+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:26:53.385623329 +0100
|
||||||
|
@@ -13,8 +13,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
|
||||||
|
dhcpv6.c mdb6.c ldap.c ldap_casa.c
|
||||||
|
|
||||||
|
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
||||||
|
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
|
||||||
|
- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
||||||
|
+ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
||||||
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
diff -up dhcp-4.2.5b1/server/tests/Makefile.am.sharedlib dhcp-4.2.5b1/server/tests/Makefile.am
|
||||||
|
--- dhcp-4.2.5b1/server/tests/Makefile.am.sharedlib 2012-12-17 16:26:53.000000000 +0100
|
||||||
|
+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:28:25.898349545 +0100
|
||||||
|
@@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
||||||
|
../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \
|
||||||
|
../ldap.c ../ldap_casa.c ../dhcpd.c
|
||||||
|
|
||||||
|
-DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
|
||||||
|
- $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
|
||||||
|
+ $(top_builddir)/dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
ATF_TESTS =
|
||||||
|
TESTS =
|
@ -1,7 +1,7 @@
|
|||||||
diff -up dhcp-4.2.4b1/configure.ac.systemtap dhcp-4.2.4b1/configure.ac
|
diff -up dhcp-4.2.5b1/configure.ac.systemtap dhcp-4.2.5b1/configure.ac
|
||||||
--- dhcp-4.2.4b1/configure.ac.systemtap 2012-04-16 17:46:10.913227143 +0200
|
--- dhcp-4.2.5b1/configure.ac.systemtap 2012-12-17 16:56:40.563881316 +0100
|
||||||
+++ dhcp-4.2.4b1/configure.ac 2012-04-16 17:46:10.947226667 +0200
|
+++ dhcp-4.2.5b1/configure.ac 2012-12-17 16:56:40.597880870 +0100
|
||||||
@@ -504,6 +504,35 @@ else
|
@@ -554,6 +554,35 @@ else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -37,18 +37,18 @@ diff -up dhcp-4.2.4b1/configure.ac.systemtap dhcp-4.2.4b1/configure.ac
|
|||||||
# Solaris needs some libraries for functions
|
# Solaris needs some libraries for functions
|
||||||
AC_SEARCH_LIBS(socket, [socket])
|
AC_SEARCH_LIBS(socket, [socket])
|
||||||
AC_SEARCH_LIBS(inet_ntoa, [nsl])
|
AC_SEARCH_LIBS(inet_ntoa, [nsl])
|
||||||
@@ -650,6 +679,7 @@ AC_OUTPUT([
|
@@ -701,6 +730,7 @@ AC_OUTPUT([
|
||||||
relay/Makefile
|
|
||||||
server/Makefile
|
|
||||||
tests/Makefile
|
tests/Makefile
|
||||||
|
server/tests/Makefile
|
||||||
|
doc/devel/doxyfile
|
||||||
+ tapset/Makefile
|
+ tapset/Makefile
|
||||||
])
|
])
|
||||||
|
|
||||||
sh util/bindvar.sh
|
sh util/bindvar.sh
|
||||||
diff -up dhcp-4.2.4b1/Makefile.am.systemtap dhcp-4.2.4b1/Makefile.am
|
diff -up dhcp-4.2.5b1/Makefile.am.systemtap dhcp-4.2.5b1/Makefile.am
|
||||||
--- dhcp-4.2.4b1/Makefile.am.systemtap 2012-04-16 17:46:10.791228851 +0200
|
--- dhcp-4.2.5b1/Makefile.am.systemtap 2012-12-17 16:56:40.461882654 +0100
|
||||||
+++ dhcp-4.2.4b1/Makefile.am 2012-04-16 17:46:10.947226667 +0200
|
+++ dhcp-4.2.5b1/Makefile.am 2012-12-17 16:56:40.597880870 +0100
|
||||||
@@ -29,5 +29,8 @@ endif
|
@@ -30,5 +30,8 @@ endif
|
||||||
|
|
||||||
SUBDIRS += includes tests common omapip client dhcpctl relay server
|
SUBDIRS += includes tests common omapip client dhcpctl relay server
|
||||||
|
|
||||||
@ -57,9 +57,9 @@ diff -up dhcp-4.2.4b1/Makefile.am.systemtap dhcp-4.2.4b1/Makefile.am
|
|||||||
+
|
+
|
||||||
nobase_include_HEADERS = dhcpctl/dhcpctl.h
|
nobase_include_HEADERS = dhcpctl/dhcpctl.h
|
||||||
|
|
||||||
diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
diff -up dhcp-4.2.5b1/server/dhcp.c.systemtap dhcp-4.2.5b1/server/dhcp.c
|
||||||
--- dhcp-4.2.4b1/server/dhcp.c.systemtap 2012-04-16 17:46:10.816228501 +0200
|
--- dhcp-4.2.5b1/server/dhcp.c.systemtap 2012-12-17 16:56:40.483882364 +0100
|
||||||
+++ dhcp-4.2.4b1/server/dhcp.c 2012-04-16 17:48:11.528537555 +0200
|
+++ dhcp-4.2.5b1/server/dhcp.c 2012-12-17 16:56:40.599880842 +0100
|
||||||
@@ -36,7 +36,7 @@
|
@@ -36,7 +36,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
@ -96,7 +96,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
oc = lookup_option (&dhcp_universe, packet -> options,
|
oc = lookup_option (&dhcp_universe, packet -> options,
|
||||||
DHO_DHCP_REQUESTED_ADDRESS);
|
DHO_DHCP_REQUESTED_ADDRESS);
|
||||||
memset (&data, 0, sizeof data);
|
memset (&data, 0, sizeof data);
|
||||||
@@ -677,6 +683,9 @@ void dhcprequest (packet, ms_nulltp, ip_
|
@@ -700,6 +706,9 @@ void dhcprequest (packet, ms_nulltp, ip_
|
||||||
log_info ("%s: unknown lease %s.", msgbuf, piaddr (cip));
|
log_info ("%s: unknown lease %s.", msgbuf, piaddr (cip));
|
||||||
|
|
||||||
out:
|
out:
|
||||||
@ -106,7 +106,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
if (subnet)
|
if (subnet)
|
||||||
subnet_dereference (&subnet, MDL);
|
subnet_dereference (&subnet, MDL);
|
||||||
if (lease)
|
if (lease)
|
||||||
@@ -695,6 +704,7 @@ void dhcprelease (packet, ms_nulltp)
|
@@ -718,6 +727,7 @@ void dhcprelease (packet, ms_nulltp)
|
||||||
const char *s;
|
const char *s;
|
||||||
char msgbuf [1024], cstr[16]; /* XXX */
|
char msgbuf [1024], cstr[16]; /* XXX */
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
|
|
||||||
/* DHCPRELEASE must not specify address in requested-address
|
/* DHCPRELEASE must not specify address in requested-address
|
||||||
option, but old protocol specs weren't explicit about this,
|
option, but old protocol specs weren't explicit about this,
|
||||||
@@ -819,6 +829,8 @@ void dhcprelease (packet, ms_nulltp)
|
@@ -842,6 +852,8 @@ void dhcprelease (packet, ms_nulltp)
|
||||||
#endif
|
#endif
|
||||||
if (lease)
|
if (lease)
|
||||||
lease_dereference (&lease, MDL);
|
lease_dereference (&lease, MDL);
|
||||||
@ -123,7 +123,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
void dhcpdecline (packet, ms_nulltp)
|
void dhcpdecline (packet, ms_nulltp)
|
||||||
@@ -836,6 +848,8 @@ void dhcpdecline (packet, ms_nulltp)
|
@@ -859,6 +871,8 @@ void dhcpdecline (packet, ms_nulltp)
|
||||||
struct option_cache *oc;
|
struct option_cache *oc;
|
||||||
struct data_string data;
|
struct data_string data;
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
/* DHCPDECLINE must specify address. */
|
/* DHCPDECLINE must specify address. */
|
||||||
if (!(oc = lookup_option (&dhcp_universe, packet -> options,
|
if (!(oc = lookup_option (&dhcp_universe, packet -> options,
|
||||||
DHO_DHCP_REQUESTED_ADDRESS)))
|
DHO_DHCP_REQUESTED_ADDRESS)))
|
||||||
@@ -947,6 +961,8 @@ void dhcpdecline (packet, ms_nulltp)
|
@@ -970,6 +984,8 @@ void dhcpdecline (packet, ms_nulltp)
|
||||||
option_state_dereference (&options, MDL);
|
option_state_dereference (&options, MDL);
|
||||||
if (lease)
|
if (lease)
|
||||||
lease_dereference (&lease, MDL);
|
lease_dereference (&lease, MDL);
|
||||||
@ -141,7 +141,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
void dhcpinform (packet, ms_nulltp)
|
void dhcpinform (packet, ms_nulltp)
|
||||||
@@ -970,6 +986,8 @@ void dhcpinform (packet, ms_nulltp)
|
@@ -993,6 +1009,8 @@ void dhcpinform (packet, ms_nulltp)
|
||||||
struct interface_info *interface;
|
struct interface_info *interface;
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
@ -150,7 +150,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
/* The client should set ciaddr to its IP address, but apparently
|
/* The client should set ciaddr to its IP address, but apparently
|
||||||
it's common for clients not to do this, so we'll use their IP
|
it's common for clients not to do this, so we'll use their IP
|
||||||
source address if they didn't set ciaddr. */
|
source address if they didn't set ciaddr. */
|
||||||
@@ -1327,6 +1345,8 @@ void dhcpinform (packet, ms_nulltp)
|
@@ -1350,6 +1368,8 @@ void dhcpinform (packet, ms_nulltp)
|
||||||
|
|
||||||
if (subnet)
|
if (subnet)
|
||||||
subnet_dereference (&subnet, MDL);
|
subnet_dereference (&subnet, MDL);
|
||||||
@ -159,7 +159,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
void nak_lease (packet, cip)
|
void nak_lease (packet, cip)
|
||||||
@@ -1343,6 +1363,8 @@ void nak_lease (packet, cip)
|
@@ -1366,6 +1386,8 @@ void nak_lease (packet, cip)
|
||||||
struct option_state *options = (struct option_state *)0;
|
struct option_state *options = (struct option_state *)0;
|
||||||
struct option_cache *oc = (struct option_cache *)0;
|
struct option_cache *oc = (struct option_cache *)0;
|
||||||
|
|
||||||
@ -168,7 +168,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
option_state_allocate (&options, MDL);
|
option_state_allocate (&options, MDL);
|
||||||
memset (&outgoing, 0, sizeof outgoing);
|
memset (&outgoing, 0, sizeof outgoing);
|
||||||
memset (&raw, 0, sizeof raw);
|
memset (&raw, 0, sizeof raw);
|
||||||
@@ -1494,6 +1516,7 @@ void nak_lease (packet, cip)
|
@@ -1532,6 +1554,7 @@ void nak_lease (packet, cip)
|
||||||
packet->interface->name);
|
packet->interface->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -176,7 +176,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
|
void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
|
||||||
@@ -1535,6 +1558,8 @@ void ack_lease (packet, lease, offer, wh
|
@@ -1573,6 +1596,8 @@ void ack_lease (packet, lease, offer, wh
|
||||||
if (lease -> state)
|
if (lease -> state)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -185,7 +185,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
/* Save original cltt for comparison later. */
|
/* Save original cltt for comparison later. */
|
||||||
lease_cltt = lease->cltt;
|
lease_cltt = lease->cltt;
|
||||||
|
|
||||||
@@ -2897,6 +2922,8 @@ void ack_lease (packet, lease, offer, wh
|
@@ -2936,6 +2961,8 @@ void ack_lease (packet, lease, offer, wh
|
||||||
#endif
|
#endif
|
||||||
dhcp_reply(lease);
|
dhcp_reply(lease);
|
||||||
}
|
}
|
||||||
@ -194,7 +194,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -3049,6 +3076,8 @@ void dhcp_reply (lease)
|
@@ -3088,6 +3115,8 @@ void dhcp_reply (lease)
|
||||||
if (!state)
|
if (!state)
|
||||||
log_fatal ("dhcp_reply was supplied lease with no state!");
|
log_fatal ("dhcp_reply was supplied lease with no state!");
|
||||||
|
|
||||||
@ -203,7 +203,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
/* Compose a response for the client... */
|
/* Compose a response for the client... */
|
||||||
memset (&raw, 0, sizeof raw);
|
memset (&raw, 0, sizeof raw);
|
||||||
memset (&d1, 0, sizeof d1);
|
memset (&d1, 0, sizeof d1);
|
||||||
@@ -3270,6 +3299,8 @@ void dhcp_reply (lease)
|
@@ -3309,6 +3338,8 @@ void dhcp_reply (lease)
|
||||||
|
|
||||||
free_lease_state (state, MDL);
|
free_lease_state (state, MDL);
|
||||||
lease -> state = (struct lease_state *)0;
|
lease -> state = (struct lease_state *)0;
|
||||||
@ -212,7 +212,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
int find_lease (struct lease **lp,
|
int find_lease (struct lease **lp,
|
||||||
@@ -3292,6 +3323,8 @@ int find_lease (struct lease **lp,
|
@@ -3331,6 +3362,8 @@ int find_lease (struct lease **lp,
|
||||||
struct data_string client_identifier;
|
struct data_string client_identifier;
|
||||||
struct hardware h;
|
struct hardware h;
|
||||||
|
|
||||||
@ -221,7 +221,7 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
#if defined(FAILOVER_PROTOCOL)
|
#if defined(FAILOVER_PROTOCOL)
|
||||||
/* Quick check to see if the peer has leases. */
|
/* Quick check to see if the peer has leases. */
|
||||||
if (peer_has_leases) {
|
if (peer_has_leases) {
|
||||||
@@ -4019,6 +4052,9 @@ int find_lease (struct lease **lp,
|
@@ -4058,6 +4091,9 @@ int find_lease (struct lease **lp,
|
||||||
#if defined (DEBUG_FIND_LEASE)
|
#if defined (DEBUG_FIND_LEASE)
|
||||||
log_info ("Not returning a lease.");
|
log_info ("Not returning a lease.");
|
||||||
#endif
|
#endif
|
||||||
@ -231,19 +231,19 @@ diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -up dhcp-4.2.4b1/server/dhcpd.c.systemtap dhcp-4.2.4b1/server/dhcpd.c
|
diff -up dhcp-4.2.5b1/server/dhcpd.c.systemtap dhcp-4.2.5b1/server/dhcpd.c
|
||||||
--- dhcp-4.2.4b1/server/dhcpd.c.systemtap 2012-04-16 17:46:10.928226933 +0200
|
--- dhcp-4.2.5b1/server/dhcpd.c.systemtap 2012-12-17 16:56:40.578881119 +0100
|
||||||
+++ dhcp-4.2.4b1/server/dhcpd.c 2012-04-16 17:46:10.951226611 +0200
|
+++ dhcp-4.2.5b1/server/dhcpd.c 2012-12-17 16:56:40.599880842 +0100
|
||||||
@@ -58,6 +58,8 @@ static const char url [] =
|
@@ -58,6 +58,8 @@ static const char url [] =
|
||||||
# undef group
|
# undef group
|
||||||
#endif /* PARANOIA */
|
#endif /* PARANOIA */
|
||||||
|
|
||||||
+#include "trace.h"
|
+#include "trace.h"
|
||||||
+
|
+
|
||||||
|
#ifndef UNIT_TEST
|
||||||
static void usage(void);
|
static void usage(void);
|
||||||
|
#endif
|
||||||
struct iaddr server_identifier;
|
@@ -865,6 +867,7 @@ main(int argc, char **argv) {
|
||||||
@@ -859,6 +861,7 @@ main(int argc, char **argv) {
|
|
||||||
omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
|
omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
|
||||||
(omapi_object_t *)0, "state", server_running);
|
(omapi_object_t *)0, "state", server_running);
|
||||||
|
|
||||||
@ -251,9 +251,9 @@ diff -up dhcp-4.2.4b1/server/dhcpd.c.systemtap dhcp-4.2.4b1/server/dhcpd.c
|
|||||||
/* Receive packets and dispatch them... */
|
/* Receive packets and dispatch them... */
|
||||||
dispatch ();
|
dispatch ();
|
||||||
|
|
||||||
diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
diff -up dhcp-4.2.5b1/server/dhcpv6.c.systemtap dhcp-4.2.5b1/server/dhcpv6.c
|
||||||
--- dhcp-4.2.4b1/server/dhcpv6.c.systemtap 2012-04-16 17:46:10.925226975 +0200
|
--- dhcp-4.2.5b1/server/dhcpv6.c.systemtap 2012-12-17 16:56:40.571881210 +0100
|
||||||
+++ dhcp-4.2.4b1/server/dhcpv6.c 2012-04-16 17:46:10.953226583 +0200
|
+++ dhcp-4.2.5b1/server/dhcpv6.c 2012-12-17 16:56:40.601880816 +0100
|
||||||
@@ -15,6 +15,7 @@
|
@@ -15,6 +15,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -262,7 +262,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
|
|
||||||
#ifdef DHCPv6
|
#ifdef DHCPv6
|
||||||
|
|
||||||
@@ -4198,6 +4199,8 @@ static void
|
@@ -4212,6 +4213,8 @@ static void
|
||||||
dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
|
dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
|
|
||||||
@ -271,7 +271,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Validate our input.
|
* Validate our input.
|
||||||
*/
|
*/
|
||||||
@@ -4211,6 +4214,8 @@ dhcpv6_solicit(struct data_string *reply
|
@@ -4225,6 +4228,8 @@ dhcpv6_solicit(struct data_string *reply
|
||||||
* Clean up.
|
* Clean up.
|
||||||
*/
|
*/
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
@ -280,7 +280,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -4224,6 +4229,8 @@ dhcpv6_request(struct data_string *reply
|
@@ -4238,6 +4243,8 @@ dhcpv6_request(struct data_string *reply
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
struct data_string server_id;
|
struct data_string server_id;
|
||||||
|
|
||||||
@ -289,7 +289,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Validate our input.
|
* Validate our input.
|
||||||
*/
|
*/
|
||||||
@@ -4241,6 +4248,8 @@ dhcpv6_request(struct data_string *reply
|
@@ -4255,6 +4262,8 @@ dhcpv6_request(struct data_string *reply
|
||||||
*/
|
*/
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
data_string_forget(&server_id, MDL);
|
data_string_forget(&server_id, MDL);
|
||||||
@ -298,7 +298,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Find a DHCPv6 packet's shared network from hints in the packet.
|
/* Find a DHCPv6 packet's shared network from hints in the packet.
|
||||||
@@ -4353,6 +4362,8 @@ dhcpv6_confirm(struct data_string *reply
|
@@ -4367,6 +4376,8 @@ dhcpv6_confirm(struct data_string *reply
|
||||||
struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
|
struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
|
||||||
int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
|
int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
|
||||||
|
|
||||||
@ -307,7 +307,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Basic client message validation.
|
* Basic client message validation.
|
||||||
*/
|
*/
|
||||||
@@ -4539,6 +4550,8 @@ exit:
|
@@ -4553,6 +4564,8 @@ exit:
|
||||||
option_state_dereference(&cli_enc_opt_state, MDL);
|
option_state_dereference(&cli_enc_opt_state, MDL);
|
||||||
if (opt_state != NULL)
|
if (opt_state != NULL)
|
||||||
option_state_dereference(&opt_state, MDL);
|
option_state_dereference(&opt_state, MDL);
|
||||||
@ -316,7 +316,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -4553,6 +4566,8 @@ dhcpv6_renew(struct data_string *reply,
|
@@ -4567,6 +4580,8 @@ dhcpv6_renew(struct data_string *reply,
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
struct data_string server_id;
|
struct data_string server_id;
|
||||||
|
|
||||||
@ -325,7 +325,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Validate the request.
|
* Validate the request.
|
||||||
*/
|
*/
|
||||||
@@ -4570,6 +4585,8 @@ dhcpv6_renew(struct data_string *reply,
|
@@ -4584,6 +4599,8 @@ dhcpv6_renew(struct data_string *reply,
|
||||||
*/
|
*/
|
||||||
data_string_forget(&server_id, MDL);
|
data_string_forget(&server_id, MDL);
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
@ -334,7 +334,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -4583,6 +4600,8 @@ static void
|
@@ -4597,6 +4614,8 @@ static void
|
||||||
dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
|
dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
|
|
||||||
@ -343,7 +343,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
if (!valid_client_msg(packet, &client_id)) {
|
if (!valid_client_msg(packet, &client_id)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -4590,6 +4609,8 @@ dhcpv6_rebind(struct data_string *reply,
|
@@ -4604,6 +4623,8 @@ dhcpv6_rebind(struct data_string *reply,
|
||||||
lease_to_client(reply, packet, &client_id, NULL);
|
lease_to_client(reply, packet, &client_id, NULL);
|
||||||
|
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
@ -352,7 +352,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -5034,6 +5055,8 @@ dhcpv6_decline(struct data_string *reply
|
@@ -5048,6 +5069,8 @@ dhcpv6_decline(struct data_string *reply
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
struct data_string server_id;
|
struct data_string server_id;
|
||||||
|
|
||||||
@ -361,7 +361,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Validate our input.
|
* Validate our input.
|
||||||
*/
|
*/
|
||||||
@@ -5054,6 +5077,8 @@ dhcpv6_decline(struct data_string *reply
|
@@ -5068,6 +5091,8 @@ dhcpv6_decline(struct data_string *reply
|
||||||
|
|
||||||
data_string_forget(&server_id, MDL);
|
data_string_forget(&server_id, MDL);
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
@ -370,7 +370,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -5502,6 +5527,8 @@ dhcpv6_release(struct data_string *reply
|
@@ -5516,6 +5541,8 @@ dhcpv6_release(struct data_string *reply
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
struct data_string server_id;
|
struct data_string server_id;
|
||||||
|
|
||||||
@ -379,7 +379,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Validate our input.
|
* Validate our input.
|
||||||
*/
|
*/
|
||||||
@@ -5523,6 +5550,8 @@ dhcpv6_release(struct data_string *reply
|
@@ -5537,6 +5564,8 @@ dhcpv6_release(struct data_string *reply
|
||||||
|
|
||||||
data_string_forget(&server_id, MDL);
|
data_string_forget(&server_id, MDL);
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
@ -388,7 +388,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -5535,6 +5564,8 @@ dhcpv6_information_request(struct data_s
|
@@ -5549,6 +5578,8 @@ dhcpv6_information_request(struct data_s
|
||||||
struct data_string client_id;
|
struct data_string client_id;
|
||||||
struct data_string server_id;
|
struct data_string server_id;
|
||||||
|
|
||||||
@ -397,7 +397,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Validate our input.
|
* Validate our input.
|
||||||
*/
|
*/
|
||||||
@@ -5566,6 +5597,8 @@ dhcpv6_information_request(struct data_s
|
@@ -5580,6 +5611,8 @@ dhcpv6_information_request(struct data_s
|
||||||
data_string_forget(&client_id, MDL);
|
data_string_forget(&client_id, MDL);
|
||||||
}
|
}
|
||||||
data_string_forget(&server_id, MDL);
|
data_string_forget(&server_id, MDL);
|
||||||
@ -406,7 +406,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -5594,6 +5627,8 @@ dhcpv6_relay_forw(struct data_string *re
|
@@ -5608,6 +5641,8 @@ dhcpv6_relay_forw(struct data_string *re
|
||||||
struct dhcpv6_relay_packet *reply;
|
struct dhcpv6_relay_packet *reply;
|
||||||
int reply_ofs;
|
int reply_ofs;
|
||||||
|
|
||||||
@ -415,7 +415,7 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
/*
|
/*
|
||||||
* Initialize variables for early exit.
|
* Initialize variables for early exit.
|
||||||
*/
|
*/
|
||||||
@@ -5853,6 +5888,8 @@ exit:
|
@@ -5867,6 +5902,8 @@ exit:
|
||||||
if (enc_packet != NULL) {
|
if (enc_packet != NULL) {
|
||||||
packet_dereference(&enc_packet, MDL);
|
packet_dereference(&enc_packet, MDL);
|
||||||
}
|
}
|
||||||
@ -424,9 +424,9 @@ diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
diff -up dhcp-4.2.4b1/server/failover.c.systemtap dhcp-4.2.4b1/server/failover.c
|
diff -up dhcp-4.2.5b1/server/failover.c.systemtap dhcp-4.2.5b1/server/failover.c
|
||||||
--- dhcp-4.2.4b1/server/failover.c.systemtap 2012-03-19 23:29:49.000000000 +0100
|
--- dhcp-4.2.5b1/server/failover.c.systemtap 2012-12-05 02:17:39.000000000 +0100
|
||||||
+++ dhcp-4.2.4b1/server/failover.c 2012-04-16 17:46:10.955226555 +0200
|
+++ dhcp-4.2.5b1/server/failover.c 2012-12-17 16:56:40.603880790 +0100
|
||||||
@@ -36,6 +36,8 @@
|
@@ -36,6 +36,8 @@
|
||||||
#include "dhcpd.h"
|
#include "dhcpd.h"
|
||||||
#include <omapip/omapip_p.h>
|
#include <omapip/omapip_p.h>
|
||||||
@ -472,10 +472,10 @@ diff -up dhcp-4.2.4b1/server/failover.c.systemtap dhcp-4.2.4b1/server/failover.c
|
|||||||
return leases_queued;
|
return leases_queued;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -up dhcp-4.2.4b1/server/Makefile.am.systemtap dhcp-4.2.4b1/server/Makefile.am
|
diff -up dhcp-4.2.5b1/server/Makefile.am.systemtap dhcp-4.2.5b1/server/Makefile.am
|
||||||
--- dhcp-4.2.4b1/server/Makefile.am.systemtap 2012-04-16 17:46:10.914227129 +0200
|
--- dhcp-4.2.5b1/server/Makefile.am.systemtap 2012-12-17 16:56:40.563881316 +0100
|
||||||
+++ dhcp-4.2.4b1/server/Makefile.am 2012-04-16 17:46:10.956226541 +0200
|
+++ dhcp-4.2.5b1/server/Makefile.am 2012-12-17 16:56:40.603880790 +0100
|
||||||
@@ -4,7 +4,7 @@ dist_sysconf_DATA = dhcpd.conf
|
@@ -10,7 +10,7 @@ dist_sysconf_DATA = dhcpd.conf.example
|
||||||
sbin_PROGRAMS = dhcpd
|
sbin_PROGRAMS = dhcpd
|
||||||
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
|
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
|
||||||
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
|
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
|
||||||
@ -484,7 +484,7 @@ diff -up dhcp-4.2.4b1/server/Makefile.am.systemtap dhcp-4.2.4b1/server/Makefile.
|
|||||||
|
|
||||||
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
dhcpd_CFLAGS = $(LDAP_CFLAGS)
|
||||||
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
|
||||||
@@ -13,3 +13,13 @@ dhcpd_LDADD = ../common/libdhcp.a ../oma
|
@@ -19,3 +19,13 @@ dhcpd_LDADD = ../common/libdhcp.a ../oma
|
||||||
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
@ -498,9 +498,9 @@ diff -up dhcp-4.2.4b1/server/Makefile.am.systemtap dhcp-4.2.4b1/server/Makefile.
|
|||||||
+
|
+
|
||||||
+dhcpd_LDADD += probes.o
|
+dhcpd_LDADD += probes.o
|
||||||
+endif
|
+endif
|
||||||
diff -up dhcp-4.2.4b1/server/probes.d.systemtap dhcp-4.2.4b1/server/probes.d
|
diff -up dhcp-4.2.5b1/server/probes.d.systemtap dhcp-4.2.5b1/server/probes.d
|
||||||
--- dhcp-4.2.4b1/server/probes.d.systemtap 2012-04-16 17:46:10.956226541 +0200
|
--- dhcp-4.2.5b1/server/probes.d.systemtap 2012-12-17 16:56:40.603880790 +0100
|
||||||
+++ dhcp-4.2.4b1/server/probes.d 2012-04-16 17:46:10.956226541 +0200
|
+++ dhcp-4.2.5b1/server/probes.d 2012-12-17 16:56:40.603880790 +0100
|
||||||
@@ -0,0 +1,43 @@
|
@@ -0,0 +1,43 @@
|
||||||
+provider dhcpd {
|
+provider dhcpd {
|
||||||
+ probe main();
|
+ probe main();
|
||||||
@ -545,9 +545,23 @@ diff -up dhcp-4.2.4b1/server/probes.d.systemtap dhcp-4.2.4b1/server/probes.d
|
|||||||
+ probe failover_set_state_start(int, int) /* state, new_state */
|
+ probe failover_set_state_start(int, int) /* state, new_state */
|
||||||
+ probe failover_set_state_done()
|
+ probe failover_set_state_done()
|
||||||
+};
|
+};
|
||||||
diff -up dhcp-4.2.4b1/server/trace.h.systemtap dhcp-4.2.4b1/server/trace.h
|
diff -up dhcp-4.2.5b1/server/tests/Makefile.am.systemtap dhcp-4.2.5b1/server/tests/Makefile.am
|
||||||
--- dhcp-4.2.4b1/server/trace.h.systemtap 2012-04-16 17:46:10.956226541 +0200
|
--- dhcp-4.2.5b1/server/tests/Makefile.am.systemtap 2012-12-17 16:56:40.564881302 +0100
|
||||||
+++ dhcp-4.2.4b1/server/trace.h 2012-04-16 17:46:10.956226541 +0200
|
+++ dhcp-4.2.5b1/server/tests/Makefile.am 2012-12-17 16:56:57.505650518 +0100
|
||||||
|
@@ -20,6 +20,10 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
|
||||||
|
DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
|
||||||
|
$(top_builddir)/dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export
|
||||||
|
|
||||||
|
+if ENABLE_SYSTEMTAP
|
||||||
|
+DHCPLIBS += ../probes.o
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
ATF_TESTS =
|
||||||
|
TESTS =
|
||||||
|
if HAVE_ATF
|
||||||
|
diff -up dhcp-4.2.5b1/server/trace.h.systemtap dhcp-4.2.5b1/server/trace.h
|
||||||
|
--- dhcp-4.2.5b1/server/trace.h.systemtap 2012-12-17 16:56:40.604880777 +0100
|
||||||
|
+++ dhcp-4.2.5b1/server/trace.h 2012-12-17 16:56:40.604880777 +0100
|
||||||
@@ -0,0 +1,11 @@
|
@@ -0,0 +1,11 @@
|
||||||
+// trace.h
|
+// trace.h
|
||||||
+
|
+
|
||||||
@ -560,9 +574,9 @@ diff -up dhcp-4.2.4b1/server/trace.h.systemtap dhcp-4.2.4b1/server/trace.h
|
|||||||
+// Wrap the probe to allow it to be removed when no systemtap available
|
+// Wrap the probe to allow it to be removed when no systemtap available
|
||||||
+#define TRACE(probe)
|
+#define TRACE(probe)
|
||||||
+#endif
|
+#endif
|
||||||
diff -up dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap dhcp-4.2.4b1/tapset/dhcpd.stp
|
diff -up dhcp-4.2.5b1/tapset/dhcpd.stp.systemtap dhcp-4.2.5b1/tapset/dhcpd.stp
|
||||||
--- dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap 2012-04-16 17:46:10.957226527 +0200
|
--- dhcp-4.2.5b1/tapset/dhcpd.stp.systemtap 2012-12-17 16:56:40.604880777 +0100
|
||||||
+++ dhcp-4.2.4b1/tapset/dhcpd.stp 2012-04-16 17:46:10.957226527 +0200
|
+++ dhcp-4.2.5b1/tapset/dhcpd.stp 2012-12-17 16:56:40.604880777 +0100
|
||||||
@@ -0,0 +1,212 @@
|
@@ -0,0 +1,212 @@
|
||||||
+/* dhcpd tapset
|
+/* dhcpd tapset
|
||||||
+ Copyright (C) 2011, Red Hat Inc.
|
+ Copyright (C) 2011, Red Hat Inc.
|
||||||
@ -776,9 +790,9 @@ diff -up dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap dhcp-4.2.4b1/tapset/dhcpd.stp
|
|||||||
+{
|
+{
|
||||||
+ probestr = sprintf("%s", $$name);
|
+ probestr = sprintf("%s", $$name);
|
||||||
+}
|
+}
|
||||||
diff -up dhcp-4.2.4b1/tapset/Makefile.am.systemtap dhcp-4.2.4b1/tapset/Makefile.am
|
diff -up dhcp-4.2.5b1/tapset/Makefile.am.systemtap dhcp-4.2.5b1/tapset/Makefile.am
|
||||||
--- dhcp-4.2.4b1/tapset/Makefile.am.systemtap 2012-04-16 17:46:10.957226527 +0200
|
--- dhcp-4.2.5b1/tapset/Makefile.am.systemtap 2012-12-17 16:56:40.604880777 +0100
|
||||||
+++ dhcp-4.2.4b1/tapset/Makefile.am 2012-04-16 17:46:10.957226527 +0200
|
+++ dhcp-4.2.5b1/tapset/Makefile.am 2012-12-17 16:56:40.604880777 +0100
|
||||||
@@ -0,0 +1,26 @@
|
@@ -0,0 +1,26 @@
|
||||||
+# Makefile.am for dhcp/tapset
|
+# Makefile.am for dhcp/tapset
|
||||||
+# Jiri Popelka
|
+# Jiri Popelka
|
23
dhcp-4.2.5b1-atf-pkgconfig.patch
Normal file
23
dhcp-4.2.5b1-atf-pkgconfig.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
diff -up dhcp-4.2.5b1/configure.ac.pkgconfig dhcp-4.2.5b1/configure.ac
|
||||||
|
--- dhcp-4.2.5b1/configure.ac.pkgconfig 2012-12-05 02:18:44.000000000 +0100
|
||||||
|
+++ dhcp-4.2.5b1/configure.ac 2012-12-17 15:45:33.769128387 +0100
|
||||||
|
@@ -194,6 +194,9 @@ if test "$atf_path" != "no" ; then
|
||||||
|
if test -f $atf_path/lib/pkgconfig/atf-c.pc ; then
|
||||||
|
atf_pcp=$atf_path/lib/pkgconfig
|
||||||
|
fi
|
||||||
|
+ if test -f $atf_path/lib64/pkgconfig/atf-c.pc ; then
|
||||||
|
+ atf_pcp=$atf_path/lib64/pkgconfig
|
||||||
|
+ fi
|
||||||
|
else
|
||||||
|
# Not specified, try some common paths
|
||||||
|
atf_dirs="/usr /usr/local /usr/pkg /opt /opt/local"
|
||||||
|
@@ -202,6 +205,9 @@ if test "$atf_path" != "no" ; then
|
||||||
|
if test -f $d/lib/pkgconfig/atf-c.pc ; then
|
||||||
|
atf_pcp=$d/lib/pkgconfig
|
||||||
|
fi
|
||||||
|
+ if test -f $d/lib64/pkgconfig/atf-c.pc ; then
|
||||||
|
+ atf_pcp=$d/lib64/pkgconfig
|
||||||
|
+ fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if test "$atf_pcp" = "" ; then
|
80
dhcp.spec
80
dhcp.spec
@ -8,17 +8,17 @@
|
|||||||
%global dhcpconfdir %{_sysconfdir}/dhcp
|
%global dhcpconfdir %{_sysconfdir}/dhcp
|
||||||
|
|
||||||
|
|
||||||
%global patchver P2
|
#%%global patchver P2
|
||||||
#%%global prever rc2
|
%global prever rc1
|
||||||
|
|
||||||
%global VERSION %{version}-%{patchver}
|
#%%global VERSION %{version}-%{patchver}
|
||||||
#%%global VERSION %{version}%{prever}
|
%global VERSION %{version}%{prever}
|
||||||
#%%global VERSION %{version}
|
#%%global VERSION %{version}
|
||||||
|
|
||||||
Summary: Dynamic host configuration protocol software
|
Summary: Dynamic host configuration protocol software
|
||||||
Name: dhcp
|
Name: dhcp
|
||||||
Version: 4.2.4
|
Version: 4.2.5
|
||||||
Release: 23.%{patchver}%{?dist}
|
Release: 0.1.%{prever}%{?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.
|
||||||
@ -45,7 +45,7 @@ Patch3: dhcp-4.2.0-dhclient-decline-backoff.patch
|
|||||||
Patch4: dhcp-4.2.4-unicast-bootp.patch
|
Patch4: dhcp-4.2.4-unicast-bootp.patch
|
||||||
Patch7: dhcp-4.2.0-default-requested-options.patch
|
Patch7: dhcp-4.2.0-default-requested-options.patch
|
||||||
Patch8: dhcp-4.2.2-xen-checksum.patch
|
Patch8: dhcp-4.2.2-xen-checksum.patch
|
||||||
Patch10: dhcp-4.2.1-manpages.patch
|
Patch10: dhcp-4.2.5-manpages.patch
|
||||||
Patch11: dhcp-4.2.4-paths.patch
|
Patch11: dhcp-4.2.4-paths.patch
|
||||||
Patch12: dhcp-4.2.2-CLOEXEC.patch
|
Patch12: dhcp-4.2.2-CLOEXEC.patch
|
||||||
Patch14: dhcp-4.2.0-garbage-chars.patch
|
Patch14: dhcp-4.2.0-garbage-chars.patch
|
||||||
@ -55,26 +55,26 @@ Patch18: dhcp-4.2.4-64_bit_lease_parse.patch
|
|||||||
Patch19: dhcp-4.2.2-capability.patch
|
Patch19: dhcp-4.2.2-capability.patch
|
||||||
Patch20: dhcp-4.2.0-logpid.patch
|
Patch20: dhcp-4.2.0-logpid.patch
|
||||||
Patch21: dhcp-4.2.4-UseMulticast.patch
|
Patch21: dhcp-4.2.4-UseMulticast.patch
|
||||||
Patch22: dhcp-4.2.1-sendDecline.patch
|
Patch22: dhcp-4.2.5-sendDecline.patch
|
||||||
Patch23: dhcp-4.2.1-retransmission.patch
|
Patch23: dhcp-4.2.1-retransmission.patch
|
||||||
Patch25: dhcp-4.2.4-rfc3442-classless-static-routes.patch
|
Patch25: dhcp-4.2.5-rfc3442-classless-static-routes.patch
|
||||||
Patch27: dhcp-4.2.0-honor-expired.patch
|
Patch27: dhcp-4.2.0-honor-expired.patch
|
||||||
Patch28: dhcp-4.2.2-remove-bind.patch
|
Patch28: dhcp-4.2.5-remove-bind.patch
|
||||||
Patch29: dhcp-4.2.4-P1-remove-dst.patch
|
Patch29: dhcp-4.2.4-P1-remove-dst.patch
|
||||||
Patch30: dhcp-4.2.2-sharedlib.patch
|
Patch30: dhcp-4.2.5-sharedlib.patch
|
||||||
Patch31: dhcp-4.2.4-PPP.patch
|
Patch31: dhcp-4.2.5-PPP.patch
|
||||||
Patch32: dhcp-4.2.4-paranoia.patch
|
Patch32: dhcp-4.2.4-paranoia.patch
|
||||||
Patch33: dhcp-4.2.4-lpf-ib.patch
|
Patch33: dhcp-4.2.5-lpf-ib.patch
|
||||||
Patch34: dhcp-4.2.4-improved-xid.patch
|
Patch34: dhcp-4.2.4-improved-xid.patch
|
||||||
Patch35: dhcp-4.2.2-gpxe-cid.patch
|
Patch35: dhcp-4.2.2-gpxe-cid.patch
|
||||||
Patch36: dhcp-4.2.4-systemtap.patch
|
Patch36: dhcp-4.2.5-systemtap.patch
|
||||||
Patch37: dhcp-4.2.3-dhclient-decline-onetry.patch
|
Patch37: dhcp-4.2.3-dhclient-decline-onetry.patch
|
||||||
Patch38: dhcp-4.2.3-P2-log_perror.patch
|
Patch38: dhcp-4.2.3-P2-log_perror.patch
|
||||||
Patch39: dhcp-4.2.4-getifaddrs.patch
|
Patch39: dhcp-4.2.4-getifaddrs.patch
|
||||||
Patch40: dhcp-4.2.4-send_release.patch
|
Patch40: dhcp-4.2.4-send_release.patch
|
||||||
Patch41: dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch
|
Patch41: dhcp-4.2.5-rfc5970-dhcpv6-options-for-network-boot.patch
|
||||||
Patch42: dhcp-4.2.4-failOverPeer.patch
|
Patch42: dhcp-4.2.4-failOverPeer.patch
|
||||||
Patch43: dhcp-4.2.4-P1-dhclient6-leases_semicolon_expected.patch
|
Patch43: dhcp-4.2.5b1-atf-pkgconfig.patch
|
||||||
Patch44: dhcp-4.2.4-P1-interval.patch
|
Patch44: dhcp-4.2.4-P1-interval.patch
|
||||||
Patch45: dhcp-4.2.4-P2-conflex-do-forward-updates.patch
|
Patch45: dhcp-4.2.4-P2-conflex-do-forward-updates.patch
|
||||||
Patch46: dhcp-4.2.4-P2-dupl-key.patch
|
Patch46: dhcp-4.2.4-P2-dupl-key.patch
|
||||||
@ -85,6 +85,8 @@ BuildRequires: libtool
|
|||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
BuildRequires: libcap-ng-devel
|
BuildRequires: libcap-ng-devel
|
||||||
BuildRequires: bind-lite-devel
|
BuildRequires: bind-lite-devel
|
||||||
|
# %%check
|
||||||
|
BuildRequires: atf libatf-c-devel
|
||||||
%if %sdt
|
%if %sdt
|
||||||
BuildRequires: systemtap-sdt-devel
|
BuildRequires: systemtap-sdt-devel
|
||||||
%global tapsetdir /usr/share/systemtap/tapset
|
%global tapsetdir /usr/share/systemtap/tapset
|
||||||
@ -314,9 +316,9 @@ rm -rf includes/isc-dhcp
|
|||||||
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #30402])
|
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #30402])
|
||||||
%patch42 -p1 -b .failOverPeer
|
%patch42 -p1 -b .failOverPeer
|
||||||
|
|
||||||
# Dhclient does not correctly parse zero-length options in dhclient6.leases (#633318)
|
# To be able to build with '--with-atf'.
|
||||||
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #27314])
|
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #32206])
|
||||||
%patch43 -p1 -b .dhclient6-leases_semicolon
|
%patch43 -p1 -b .pkgconfig
|
||||||
|
|
||||||
# isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601)
|
# isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601)
|
||||||
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #28038])
|
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #28038])
|
||||||
@ -380,15 +382,19 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \
|
|||||||
--enable-systemtap \
|
--enable-systemtap \
|
||||||
--with-tapset-install-dir=%{tapsetdir} \
|
--with-tapset-install-dir=%{tapsetdir} \
|
||||||
%endif
|
%endif
|
||||||
|
--with-atf \
|
||||||
--enable-paranoia --enable-early-chroot
|
--enable-paranoia --enable-early-chroot
|
||||||
%{__make} %{?_smp_mflags}
|
%{__make} %{?_smp_mflags}
|
||||||
|
|
||||||
|
%check
|
||||||
|
%{__make} check
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{__make} install DESTDIR=%{buildroot}
|
%{__make} install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
# Remove files we don't want
|
# We don't want example conf files in /etc
|
||||||
%{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
|
%{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf.example
|
||||||
%{__rm} -f %{buildroot}%{_sysconfdir}/dhcpd.conf
|
%{__rm} -f %{buildroot}%{_sysconfdir}/dhcpd.conf.example
|
||||||
|
|
||||||
# dhclient-script
|
# dhclient-script
|
||||||
%{__mkdir} -p %{buildroot}%{_sbindir}
|
%{__mkdir} -p %{buildroot}%{_sbindir}
|
||||||
@ -422,17 +428,15 @@ touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd6.leases
|
|||||||
%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/dhclient/
|
%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/dhclient/
|
||||||
|
|
||||||
# Copy sample conf files into position (called by doc macro)
|
# Copy sample conf files into position (called by doc macro)
|
||||||
%{__cp} -p client/dhclient.conf dhclient.conf.sample
|
%{__cp} -p doc/examples/dhclient-dhcpv6.conf client/dhclient6.conf.example
|
||||||
%{__cp} -p server/dhcpd.conf dhcpd.conf.sample
|
%{__cp} -p doc/examples/dhcpd-dhcpv6.conf server/dhcpd6.conf.example
|
||||||
%{__cp} -p doc/examples/dhclient-dhcpv6.conf dhclient6.conf.sample
|
|
||||||
%{__cp} -p doc/examples/dhcpd-dhcpv6.conf dhcpd6.conf.sample
|
|
||||||
|
|
||||||
# Install default (empty) dhcpd.conf:
|
# Install default (empty) dhcpd.conf:
|
||||||
%{__mkdir} -p %{buildroot}%{dhcpconfdir}
|
%{__mkdir} -p %{buildroot}%{dhcpconfdir}
|
||||||
%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd.conf
|
%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd.conf
|
||||||
#
|
#
|
||||||
# DHCP Server Configuration file.
|
# DHCP Server Configuration file.
|
||||||
# see /usr/share/doc/dhcp*/dhcpd.conf.sample
|
# see /usr/share/doc/dhcp*/dhcpd.conf.example
|
||||||
# see dhcpd.conf(5) man page
|
# see dhcpd.conf(5) man page
|
||||||
#
|
#
|
||||||
EOF
|
EOF
|
||||||
@ -441,7 +445,7 @@ EOF
|
|||||||
%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd6.conf
|
%{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd6.conf
|
||||||
#
|
#
|
||||||
# DHCPv6 Server Configuration file.
|
# DHCPv6 Server Configuration file.
|
||||||
# see /usr/share/doc/dhcp*/dhcpd6.conf.sample
|
# see /usr/share/doc/dhcp*/dhcpd6.conf.example
|
||||||
# see dhcpd.conf(5) man page
|
# see dhcpd.conf(5) man page
|
||||||
#
|
#
|
||||||
EOF
|
EOF
|
||||||
@ -469,9 +473,7 @@ exit 0
|
|||||||
|
|
||||||
%post
|
%post
|
||||||
# Initial installation
|
# Initial installation
|
||||||
%systemd_post dhcpd.service
|
%systemd_post dhcpd.service dhcpd6.service dhcrelay.service
|
||||||
%systemd_post dhcpd6.service
|
|
||||||
%systemd_post dhcrelay.service
|
|
||||||
|
|
||||||
# Update
|
# Update
|
||||||
if [ $1 -gt 1 ] ; then
|
if [ $1 -gt 1 ] ; then
|
||||||
@ -481,16 +483,12 @@ fi
|
|||||||
|
|
||||||
%preun
|
%preun
|
||||||
# Package removal, not upgrade
|
# Package removal, not upgrade
|
||||||
%systemd_preun dhcpd.service
|
%systemd_preun dhcpd.service dhcpd6.service dhcrelay.service
|
||||||
%systemd_preun dhcpd6.service
|
|
||||||
%systemd_preun dhcrelay.service
|
|
||||||
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
# Package upgrade, not uninstall
|
# Package upgrade, not uninstall
|
||||||
%systemd_postun_with_restart dhcpd.service
|
%systemd_postun_with_restart dhcpd.service dhcpd6.service dhcrelay.service
|
||||||
%systemd_postun_with_restart dhcpd6.service
|
|
||||||
%systemd_postun_with_restart dhcrelay.service
|
|
||||||
|
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
%post libs -p /sbin/ldconfig
|
||||||
@ -499,7 +497,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc dhcpd.conf.sample dhcpd6.conf.sample
|
%doc server/dhcpd.conf.example server/dhcpd6.conf.example
|
||||||
%doc contrib/*
|
%doc contrib/*
|
||||||
%attr(0750,root,root) %dir %{dhcpconfdir}
|
%attr(0750,root,root) %dir %{dhcpconfdir}
|
||||||
%attr(0755,dhcpd,dhcpd) %dir %{_localstatedir}/lib/dhcpd
|
%attr(0755,dhcpd,dhcpd) %dir %{_localstatedir}/lib/dhcpd
|
||||||
@ -527,7 +525,7 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -n dhclient
|
%files -n dhclient
|
||||||
%doc dhclient.conf.sample dhclient6.conf.sample README.dhclient.d
|
%doc client/dhclient.conf.example client/dhclient6.conf.example README.dhclient.d
|
||||||
%attr(0750,root,root) %dir %{dhcpconfdir}
|
%attr(0750,root,root) %dir %{dhcpconfdir}
|
||||||
%dir %{dhcpconfdir}/dhclient.d
|
%dir %{dhcpconfdir}/dhclient.d
|
||||||
%dir %{_localstatedir}/lib/dhclient
|
%dir %{_localstatedir}/lib/dhclient
|
||||||
@ -562,6 +560,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 20 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-0.1.rc1
|
||||||
|
- 4.2.5rc1
|
||||||
|
- added %%check - upstream unit tests (Automated Test Framework - ATF)
|
||||||
|
|
||||||
* Fri Nov 30 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.4-23.P2
|
* Fri Nov 30 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.4-23.P2
|
||||||
- fix two resource leaks in lpf-ib.patch
|
- fix two resource leaks in lpf-ib.patch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user