Makefile.in | 1 README | 16 - RELNOTES | 138 ++++++++++++++ aclocal.m4 | 4 client/Makefile.am | 4 client/Makefile.in | 5 client/clparse.c | 65 ++----- client/dhc6.c | 354 +++++++++++--------------------------- client/dhclient-script.8 | 20 +- client/dhclient.8 | 378 ++++++++++++++++++++++------------------- client/dhclient.c | 10 - client/dhclient.conf | 2 client/dhclient.conf.5 | 38 +--- client/dhclient.leases.5 | 15 - client/scripts/linux | 7 client/scripts/netbsd | 4 client/scripts/nextstep | 4 client/scripts/openwrt | 6 common/Makefile.in | 1 common/dhcp-eval.5 | 13 - common/dhcp-options.5 | 42 ++-- common/dlpi.c | 19 +- common/dns.c | 21 +- common/options.c | 8 common/parse.c | 196 ++++++++++++--------- common/print.c | 159 +++++++++++++---- common/socket.c | 85 +++++++-- common/tests/Makefile.in | 1 configure | 346 ++++++++++++++++++++++++++++++++++++- configure.ac | 10 - debian/changelog | 13 + dhcpctl/Makefile.in | 1 dhcpctl/omshell.c | 14 - doc/ja_JP.eucJP/dhcp-options.5 | 4 dst/Makefile.in | 1 includes/Makefile.in | 1 includes/config.h.in | 25 ++ includes/dhcp6.h | 6 includes/dhcpd.h | 16 + includes/minires/minires.h | 4 includes/omapip/omapip_p.h | 5 includes/osdep.h | 10 - minires/Makefile.in | 1 minires/ns_parse.c | 7 minires/res_findzonecut.c | 18 - omapip/Makefile.in | 1 omapip/alloc.c | 11 + omapip/connection.c | 16 + omapip/handle.c | 65 ++++--- omapip/hash.c | 28 +-- omapip/omapi.3 | 21 +- omapip/test.c | 5 relay/Makefile.in | 1 relay/dhcrelay.8 | 17 + relay/dhcrelay.c | 13 + server/Makefile.in | 1 server/confpars.c | 92 +++++++++ server/db.c | 6 server/dhcp.c | 136 ++++++++++---- server/dhcpd.8 | 187 ++++++++++---------- server/dhcpd.c | 16 + server/dhcpd.conf.5 | 80 ++++---- server/dhcpv6.c | 24 ++ server/mdb6.c | 7 server/omapi.c | 9 tests/Makefile.in | 1 66 files changed, 1847 insertions(+), 988 deletions(-)
New commits: commit 68531c9719a8ec7badf945ca4eab3b1d9e581f8a Author: Bob Gilligan <[email protected]> Date: Tue Jan 25 18:04:55 2011 -0800 4.1.2+vyatta3 commit 38214e49ffbf4fd560efecc2846c861025ef2294 Author: Bob Gilligan <[email protected]> Date: Tue Jan 25 18:04:12 2011 -0800 Merged ISC DHCP version 4.1.2. commit 2bc3ff99c657face4f7a80eb45a6718377105002 Author: Bob Gilligan <[email protected]> Date: Tue Jan 25 17:59:15 2011 -0800 Merge branch 'upstream' into mendocino Conflicts: README RELNOTES aclocal.m4 common/dhcp-options.5 configure configure.ac omapip/omapi.3 (cherry picked from commit 2e4375f4171d1a94f430ba80139b39979ab85196) http://suva.vyatta.com/git/?p=vyatta-dhcp3.git;a=commitdiff;h=68531c9719a8ec7badf945ca4eab3b1d9e581f8a http://suva.vyatta.com/git/?p=vyatta-dhcp3.git;a=commitdiff;h=38214e49ffbf4fd560efecc2846c861025ef2294 http://suva.vyatta.com/git/?p=vyatta-dhcp3.git;a=commitdiff;h=2bc3ff99c657face4f7a80eb45a6718377105002 _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
