Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/dist/dhcp import ISC dhcp-3.0.3 onto the vendor branch



details:   https://anonhg.NetBSD.org/src/rev/5d0162ca4068
branches:  trunk
changeset: 583552:5d0162ca4068
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu Aug 11 16:54:17 2005 +0000

description:
import ISC dhcp-3.0.3 onto the vendor branch

diffstat:

 dist/dhcp/LICENSE                           |    20 +
 dist/dhcp/contrib/dhcp.spec                 |     4 +-
 dist/dhcp/contrib/ms2isc/ms2isc.pl          |    16 +-
 dist/dhcp/contrib/ms2isc/readme.txt         |    15 +
 dist/dhcp/doc/ja_JP.eucJP/dhclient-script.8 |    57 +-
 dist/dhcp/doc/ja_JP.eucJP/dhclient.8        |    41 +-
 dist/dhcp/doc/ja_JP.eucJP/dhclient.conf.5   |    59 +-
 dist/dhcp/doc/ja_JP.eucJP/dhclient.leases.5 |    59 +-
 dist/dhcp/doc/ja_JP.eucJP/dhcp-eval.5       |    59 +-
 dist/dhcp/doc/ja_JP.eucJP/dhcp-options.5    |    59 +-
 dist/dhcp/doc/rfc1542.txt                   |  1291 +++++++++++++++++++++++++++
 dist/dhcp/dst/md5_dgst.c                    |   128 +-
 dist/dhcp/dst/md5_locl.h                    |     9 +-
 dist/dhcp/includes/cdefs.h                  |    45 +-
 dist/dhcp/includes/cf/aix.h                 |    56 +-
 dist/dhcp/includes/cf/alphaosf.h            |    61 +-
 dist/dhcp/includes/cf/bsdos.h               |    49 +-
 dist/dhcp/includes/cf/cygwin32.h            |    52 +-
 dist/dhcp/includes/cf/hpux.h                |    57 +-
 dist/dhcp/includes/cf/irix.h                |    44 +-
 dist/dhcp/includes/cf/nextstep.h            |    52 +-
 dist/dhcp/includes/cf/openbsd.h             |    49 +-
 dist/dhcp/includes/cf/qnx.h                 |    50 +-
 dist/dhcp/includes/cf/rhapsody.h            |    49 +-
 dist/dhcp/includes/cf/sample.h              |    53 +-
 dist/dhcp/includes/cf/sco.h                 |    50 +-
 dist/dhcp/includes/cf/sunos4.h              |    50 +-
 dist/dhcp/includes/cf/sunos5-5.h            |    65 +-
 dist/dhcp/includes/cf/ultrix.h              |    53 +-
 dist/dhcp/includes/ctrace.h                 |    49 +-
 dist/dhcp/includes/inet.h                   |    49 +-
 dist/dhcp/includes/isc-dhcp/boolean.h       |    28 +-
 dist/dhcp/includes/isc-dhcp/int.h           |    28 +-
 dist/dhcp/includes/isc-dhcp/lang.h          |    28 +-
 dist/dhcp/includes/isc-dhcp/list.h          |    28 +-
 dist/dhcp/includes/isc-dhcp/result.h        |    28 +-
 dist/dhcp/includes/isc-dhcp/types.h         |    28 +-
 dist/dhcp/includes/minires/res_update.h     |    26 +-
 dist/dhcp/includes/omapip/buffer.h          |    49 +-
 dist/dhcp/includes/omapip/convert.h         |    49 +-
 dist/dhcp/includes/omapip/omapip_p.h        |    49 +-
 dist/dhcp/includes/omapip/trace.h           |    49 +-
 dist/dhcp/includes/statement.h              |    49 +-
 dist/dhcp/minires/Makefile.dist             |    32 +-
 dist/dhcp/minires/res_sendsigned.c          |    23 +
 dist/dhcp/omapip/Makefile.dist              |    36 +-
 dist/dhcp/omapip/iscprint.c                 |   539 +++++++++++
 dist/dhcp/omapip/omapi.3                    |    54 +-
 dist/dhcp/omapip/test.c                     |    50 +-
 dist/dhcp/omapip/toisc.c                    |    49 +-
 dist/dhcp/relay/Makefile.dist               |    31 +-
 51 files changed, 2851 insertions(+), 1152 deletions(-)

diffs (truncated from 4878 to 300 lines):

diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/LICENSE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/dhcp/LICENSE Thu Aug 11 16:54:17 2005 +0000
@@ -0,0 +1,20 @@
+# Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1995-2003 by Internet Software Consortium
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#   Internet Systems Consortium, Inc.
+#   950 Charter Street
+#   Redwood City, CA 94063
+#   <info%isc.org@localhost>
+#   http://www.isc.org/
diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/contrib/dhcp.spec
--- a/dist/dhcp/contrib/dhcp.spec       Thu Aug 11 13:01:38 2005 +0000
+++ b/dist/dhcp/contrib/dhcp.spec       Thu Aug 11 16:54:17 2005 +0000
@@ -1,6 +1,6 @@
-Summary: The Internet Software Consortium (ISC) DHCP server
+Summary: The Internet Systems Consortium (ISC) DHCP server
 Name: dhcp
-%define version 3.1
+%define version 3.0.2
 Version: %{version}
 Release: 2tac
 Group: System Environment/Daemons
diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/contrib/ms2isc/ms2isc.pl
--- a/dist/dhcp/contrib/ms2isc/ms2isc.pl        Thu Aug 11 13:01:38 2005 +0000
+++ b/dist/dhcp/contrib/ms2isc/ms2isc.pl        Thu Aug 11 16:54:17 2005 +0000
@@ -5,7 +5,7 @@
 #
 # Author: Shu-Min Chang
 #
-# Copyright(c) 2002 Intel Corporation.  All rights reserved
+# Copyright(c) 2003 Intel Corporation.  All rights reserved
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -94,6 +94,8 @@
 
 Usage: $ARGV -s <Srv> -o <Out> [-p <Pri> [-k <key>]] [-f <Fo>]
 
+Version: 1.0.1
+
 ENDOFHELP
 
 ###################### Begin Main Program ####################################
@@ -349,10 +351,20 @@
 
                if (!Registry::GetRegKeyVal ("\\\\$Server\\HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\DHCPServer\\Configuration\\Subnets\\$Subnets[$i]\\ExcludedIpRanges", \$RegVal)) {
                        @SExclusionRanges = Registry::ExtractExclusionRanges($RegVal);
+
+#                      for (my $j=2; $j<=$#SExclusionRanges; $j+=2) {
+#                              if (unpack("L",$SExclusionRanges[$j]) < unpack("L",$SExclusionRanges[$j-2])) {
+#                                      print ("\n******** Subnet exclusion ranges out of order ********\n");
+#                              }
+#                      }
+
+                       @SExclusionRanges = sort(@SExclusionRanges);
+
 #              print "\n\tExclusion Ranges: ";
 #              for (my $j=0; $j<=$#SExclusionRanges; $j+=2) {
-#                      print "\n\t\t$SExclusionRanges[$j] - $SExclusionRanges[$j+1]";
+#                      print "\n\t\t",Registry::ExtractIp($SExclusionRanges[$j])," - ",Registry::ExtractIp($SExclusionRanges[$j+1]);
 #              }
+
                }
                @InclusionRanges = FindInclusionRanges ($SStartAddress, $SEndAddress, @SExclusionRanges);
 
diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/contrib/ms2isc/readme.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/dhcp/contrib/ms2isc/readme.txt       Thu Aug 11 16:54:17 2005 +0000
@@ -0,0 +1,15 @@
+Copyright: please read the top of the source code.
+
+Usage:
+Objective: please read the help screen by executing the program without any 
+           parameter.
+
+Revision:
+SMC: Shu-Min Chang
+
+Who When   What
+--- ------ --------------------------------------------------------------------
+SMC 021107 Initial release Version 1.0 to ISC DHCP repository
+SMC 030129 Fixed inclusion range calculation by sorting exclusion before
+           passing to FindInclusionRanges
+SMC 030228 release 1.0.1 to ISC DHCP repository
diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/doc/ja_JP.eucJP/dhclient-script.8
--- a/dist/dhcp/doc/ja_JP.eucJP/dhclient-script.8       Thu Aug 11 13:01:38 2005 +0000
+++ b/dist/dhcp/doc/ja_JP.eucJP/dhclient-script.8       Thu Aug 11 16:54:17 2005 +0000
@@ -1,36 +1,29 @@
-.\"    dhclient-script.8
-.\"
-.\" Copyright (c) 1996-2001 Internet Software Consortium.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
+.\"    $Id: dhclient-script.8,v 1.1.1.2 2005/08/11 16:54:34 drochner Exp $
 .\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of The Internet Software Consortium nor the names
-.\"    of its contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
+.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 1996-2003 by Internet Software Consortium
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR
-.\" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" This software has been written for the Internet Software Consortium
+.\"   Internet Systems Consortium, Inc.
+.\"   950 Charter Street
+.\"   Redwood City, CA 94063
+.\"   <info%isc.org@localhost>
+.\"   http://www.isc.org/
+.\"
+.\" This software has been written for Internet Systems Consortium
 .\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\" To learn more about the Internet Software Consortium, see
+.\" To learn more about Internet Systems Consortium, see
 .\" ``http://www.isc.org/''.  To learn more about Vixie Enterprises,
 .\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
 .\" ``http://www.nominum.com''.
@@ -220,7 +213,7 @@
 Îà»÷¤·¤¿¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ËÂФ¹¤ë¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤Ï
 »÷¤Æ¤¤¤¿¤êÁ´¤¯Æ±¤¸¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢°ìÈ̤ˤϡ¢
 ³Æ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥àÍѤ˳ơ¹¤Î¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤Ù¤­¤Ç¤¹¡£
-Internet Software Consortium ¤Î DHCP ÇÛÉۤ˴ޤޤì¤ë¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤Ï¡¢
+Internet Systems Consortium ¤Î DHCP ÇÛÉۤ˴ޤޤì¤ë¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤Ï¡¢
 client/scripts °Ê²¼¤ÎÇÛÉۥĥ꡼¤Ë¤¢¤ê¡¢
 Æ°ºîÂоݥª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à̾¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
 .SH ¥Ð¥°
@@ -239,9 +232,9 @@
 .SH ºî¼Ô
 .B dhclient-script(8)
 ¤Ï Ted Lemon ¤¬
-Vixie Enterprises ¤È¶¨ÎϤ·¤Æ Internet Software Consortium ¤Î¤¿¤á¤Ë
+Vixie Enterprises ¤È¶¨ÎϤ·¤Æ Internet Systems Consortium ¤Î¤¿¤á¤Ë
 ½ñ¤­¤Þ¤·¤¿¡£
-Internet Software Consortium ¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢
+Internet Systems Consortium ¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢
 .B http://www.isc.org
 ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 Vixie Enterprises ¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢
diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/doc/ja_JP.eucJP/dhclient.8
--- a/dist/dhcp/doc/ja_JP.eucJP/dhclient.8      Thu Aug 11 13:01:38 2005 +0000
+++ b/dist/dhcp/doc/ja_JP.eucJP/dhclient.8      Thu Aug 11 16:54:17 2005 +0000
@@ -1,20 +1,25 @@
-.\"    dhclient.8
+.\"    $Id: dhclient.8,v 1.1.1.2 2005/08/11 16:54:35 drochner Exp $
 .\"
-.\" Copyright (c) 1996-1999 Internet Software Consortium.
-.\" Use is subject to license terms which appear in the file named
-.\" ISC-LICENSE that should have accompanied this file when you
-.\" received it.   If a file named ISC-LICENSE did not accompany this
-.\" file, or you are not sure the one you have is correct, you may
-.\" obtain an applicable copy of the license at:
+.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 1996-2003 by Internet Software Consortium
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\"             http://www.isc.org/isc-license-1.0.html. 
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" This file is part of the ISC DHCP distribution.   The documentation
-.\" associated with this file is listed in the file DOCUMENTATION,
-.\" included in the top-level directory of this release.
-.\"
-.\" Support and other services are available for ISC products - see
-.\" http://www.isc.org for more information.
+.\"   Internet Systems Consortium, Inc.
+.\"   950 Charter Street
+.\"   Redwood City, CA 94063
+.\"   <info%isc.org@localhost>
+.\"   http://www.isc.org/
 .\"
 .\" Portions copyright (c) 2000 David E. O'Brien.
 .\" All rights reserved.
@@ -91,7 +96,7 @@
 ]
 ]
 .SH ²òÀâ
-Internet Software Consortium ¤Î DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¢¤ë dhclient
+Internet Systems Consortium ¤Î DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¢¤ë dhclient
 ¤ÏưŪ¥Û¥¹¥ÈÀßÄê¥×¥í¥È¥³¥ë (DHCP: Dynamic Host Configuration Protocol)
 ¤Þ¤¿¤Ï BOOTP ¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¡¢¤¢¤ë¤¤¤Ï
 ¤³¤ì¤é¤Î¥×¥í¥È¥³¥ë¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤Ë¤Ï¥¢¥É¥ì¥¹¤òÀÅŪ¤Ë³ä¤êÅö¤Æ¤Æ¡¢
@@ -334,9 +339,9 @@
 .SH ºî¼Ô
 .B dhclient(8)
 ¤Ï Ted Lemon ¤¬
-Vixie Enterprises ¤È¶¨ÎϤ·¤Æ Internet Software Consortium ¤Î¤¿¤á¤Ë
+Vixie Enterprises ¤È¶¨ÎϤ·¤Æ Internet Systems Consortium ¤Î¤¿¤á¤Ë
 ½ñ¤­¤Þ¤·¤¿¡£
-Internet Software Consortium ¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢
+Internet Systems Consortium ¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢
 .B http://www.isc.org
 ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 Vixie Enterprises ¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢
@@ -348,7 +353,7 @@
 Linux ¤Ç¤ÎÍøÍѤ˺ݤ·ÂçÉý¤Ë½¤Àµ¡¢²þÎɤò¹Ô¤¤¤Þ¤·¤¿¡£
 .PP
 ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢Elliot ¤Ë¤è¤ë Linux ¤Ç¤Î²þÎɤËÉ餦¤È¤³¤í¤¬Â礭¤¤¤Ç¤¹¤¬¡¢
-Internet Software Consortium ¤Î DHCP ¥µ¡¼¥Ð¤¬»È¤¦¤â¤Î¤ÈƱ¤¸
+Internet Systems Consortium ¤Î DHCP ¥µ¡¼¥Ð¤¬»È¤¦¤â¤Î¤ÈƱ¤¸
 ¥Í¥Ã¥È¥ï¡¼¥­¥ó¥°¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤òÍѤ¤¤ë¤è¤¦¤Ë¡¢Ted Lemon ¤¬
 ÂçÉý¤ÊºÆÊÔÀ®¤äÉôʬŪ¤Ê½ñ¤­´¹¤¨¤ò¹Ô¤¤¤Þ¤·¤¿¡£
 ¥·¥¹¥Æ¥àÆÃÍ­¤ÎÀßÄꥳ¡¼¥É¤ÎÂçÉôʬ¤Ï¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ë°Ü¤µ¤ì¤¿¤Î¤Ç¡¢
diff -r 7ead7af07f03 -r 5d0162ca4068 dist/dhcp/doc/ja_JP.eucJP/dhclient.conf.5
--- a/dist/dhcp/doc/ja_JP.eucJP/dhclient.conf.5 Thu Aug 11 13:01:38 2005 +0000
+++ b/dist/dhcp/doc/ja_JP.eucJP/dhclient.conf.5 Thu Aug 11 16:54:17 2005 +0000
@@ -1,36 +1,29 @@
-.\"    dhclient.conf.5
-.\"
-.\" Copyright (c) 1996-2001 Internet Software Consortium.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
+.\"    $Id: dhclient.conf.5,v 1.1.1.2 2005/08/11 16:54:35 drochner Exp $
 .\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of The Internet Software Consortium nor the names
-.\"    of its contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
+.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 1996-2003 by Internet Software Consortium
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR
-.\" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT



Home | Main Index | Thread Index | Old Index