Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/dhcp import of ISC dhcp-3.0.1rc11
details: https://anonhg.NetBSD.org/src/rev/c01f08dcc351
branches: trunk
changeset: 543171:c01f08dcc351
user: drochner <drochner%NetBSD.org@localhost>
date: Tue Feb 18 16:37:52 2003 +0000
description:
import of ISC dhcp-3.0.1rc11
diffstat:
dist/dhcp/COPYRIGHT | 2 +-
dist/dhcp/Makefile | 2 +-
dist/dhcp/Makefile.dist | 2 +-
dist/dhcp/client/Makefile.dist | 2 +-
dist/dhcp/common/ctrace.c | 2 +-
dist/dhcp/common/dispatch.c | 4 +-
dist/dhcp/common/dlpi.c | 4 +-
dist/dhcp/common/ethernet.c | 4 +-
dist/dhcp/common/lpf.c | 4 +-
dist/dhcp/common/nit.c | 4 +-
dist/dhcp/common/tr.c | 4 +-
dist/dhcp/common/upf.c | 4 +-
dist/dhcp/contrib/ms2isc/Registry.pm | 361 ++++++
dist/dhcp/contrib/ms2isc/ms2isc.pl | 622 ++++++++++
dist/dhcp/dhcpctl/Makefile.dist | 2 +-
dist/dhcp/dhcpctl/cltest.c | 2 +-
dist/dhcp/dhcpctl/dhcpctl.h | 2 +-
dist/dhcp/dhcpctl/omshell.1 | 2 +-
dist/dhcp/doc/ja_JP.eucJP/dhclient-script.8 | 249 ++++
dist/dhcp/doc/ja_JP.eucJP/dhclient.8 | 360 ++++++
dist/dhcp/doc/ja_JP.eucJP/dhclient.conf.5 | 632 ++++++++++
dist/dhcp/doc/ja_JP.eucJP/dhclient.leases.5 | 71 +
dist/dhcp/doc/ja_JP.eucJP/dhcp-eval.5 | 495 ++++++++
dist/dhcp/doc/ja_JP.eucJP/dhcp-options.5 | 1588 +++++++++++++++++++++++++++
dist/dhcp/dst/Makefile.dist | 2 +-
dist/dhcp/includes/osdep.h | 4 +
dist/dhcp/server/Makefile.dist | 2 +-
dist/dhcp/server/salloc.c | 4 +-
28 files changed, 4409 insertions(+), 27 deletions(-)
diffs (truncated from 4715 to 300 lines):
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/COPYRIGHT
--- a/dist/dhcp/COPYRIGHT Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/COPYRIGHT Tue Feb 18 16:37:52 2003 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996-1999 Internet Software Consortium.
+ * Copyright (c) 1996-2003 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
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/Makefile
--- a/dist/dhcp/Makefile Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/Makefile Tue Feb 18 16:37:52 2003 +0000
@@ -1,6 +1,6 @@
# Makefile
#
-# Copyright (c) 2000 Internet Software Consortium.
+# Copyright (c) 2002 Internet Software Consortium.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/Makefile.dist
--- a/dist/dhcp/Makefile.dist Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/Makefile.dist Tue Feb 18 16:37:52 2003 +0000
@@ -1,6 +1,6 @@
# Makefile.dist
#
-# Copyright (c) 1996-1999 Internet Software Consortium.
+# Copyright (c) 1996-2002 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
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/client/Makefile.dist
--- a/dist/dhcp/client/Makefile.dist Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/client/Makefile.dist Tue Feb 18 16:37:52 2003 +0000
@@ -1,6 +1,6 @@
# Makefile.dist
#
-# Copyright (c) 1996-1999 Internet Software Consortium.
+# Copyright (c) 1996-2002 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
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/ctrace.c
--- a/dist/dhcp/common/ctrace.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/ctrace.c Tue Feb 18 16:37:52 2003 +0000
@@ -3,7 +3,7 @@
Subroutines that support dhcp tracing... */
/*
- * Copyright (c) 2001 Internet Software Consortium.
+ * Copyright (c) 2001-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/dispatch.c
--- a/dist/dhcp/common/dispatch.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/dispatch.c Tue Feb 18 16:37:52 2003 +0000
@@ -3,7 +3,7 @@
Network input dispatcher... */
/*
- * Copyright (c) 1995-2001 Internet Software Consortium.
+ * Copyright (c) 1995-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
-"$Id: dispatch.c,v 1.1.1.1 2001/08/03 11:35:32 drochner Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dispatch.c,v 1.1.1.2 2003/02/18 16:37:55 drochner Exp $ Copyright (c) 1995-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/dlpi.c
--- a/dist/dhcp/common/dlpi.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/dlpi.c Tue Feb 18 16:37:52 2003 +0000
@@ -3,7 +3,7 @@
Data Link Provider Interface (DLPI) network interface code. */
/*
- * Copyright (c) 1996-2001 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@
#ifndef lint
static char copyright[] =
-"$Id: dlpi.c,v 1.1.1.1 2001/08/03 11:35:32 drochner Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dlpi.c,v 1.1.1.2 2003/02/18 16:37:56 drochner Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/ethernet.c
--- a/dist/dhcp/common/ethernet.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/ethernet.c Tue Feb 18 16:37:52 2003 +0000
@@ -3,7 +3,7 @@
Packet assembly code, originally contributed by Archie Cobbs. */
/*
- * Copyright (c) 1996-2000 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
-"$Id: ethernet.c,v 1.1.1.1 2001/08/03 11:35:32 drochner Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: ethernet.c,v 1.1.1.2 2003/02/18 16:37:56 drochner Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/lpf.c
--- a/dist/dhcp/common/lpf.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/lpf.c Tue Feb 18 16:37:52 2003 +0000
@@ -4,7 +4,7 @@
Support Services in Vancouver, B.C. */
/*
- * Copyright (c) 1996-2000 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
#ifndef lint
static char copyright[] =
-"$Id: lpf.c,v 1.1.1.1 2001/08/03 11:35:32 drochner Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: lpf.c,v 1.1.1.2 2003/02/18 16:37:56 drochner Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/nit.c
--- a/dist/dhcp/common/nit.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/nit.c Tue Feb 18 16:37:52 2003 +0000
@@ -4,7 +4,7 @@
with one crucial tidbit of help from Stu Grossmen. */
/*
- * Copyright (c) 1996-2000 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
#ifndef lint
static char copyright[] =
-"$Id: nit.c,v 1.1.1.1 2001/08/03 11:35:32 drochner Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: nit.c,v 1.1.1.2 2003/02/18 16:37:56 drochner Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/tr.c
--- a/dist/dhcp/common/tr.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/tr.c Tue Feb 18 16:37:52 2003 +0000
@@ -4,7 +4,7 @@
Contributed in May of 1999 by Andrew Chittenden */
/*
- * Copyright (c) 1996-2000 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
#ifndef lint
static char copyright[] =
-"$Id: tr.c,v 1.1.1.1 2001/08/03 11:35:33 drochner Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: tr.c,v 1.1.1.2 2003/02/18 16:37:57 drochner Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/common/upf.c
--- a/dist/dhcp/common/upf.c Tue Feb 18 16:37:48 2003 +0000
+++ b/dist/dhcp/common/upf.c Tue Feb 18 16:37:52 2003 +0000
@@ -3,7 +3,7 @@
Ultrix PacketFilter interface code. */
/*
- * Copyright (c) 1996-2000 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
-"$Id: upf.c,v 1.1.1.1 2001/08/03 11:35:34 drochner Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
+"$Id: upf.c,v 1.1.1.2 2003/02/18 16:37:57 drochner Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
diff -r a22427eecf6b -r c01f08dcc351 dist/dhcp/contrib/ms2isc/Registry.pm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/dhcp/contrib/ms2isc/Registry.pm Tue Feb 18 16:37:52 2003 +0000
@@ -0,0 +1,361 @@
+# Registry.pm
+# A perl module provided easy Windows Registry access
+#
+# Author: Shu-Min Chang
+#
+# Copyright(c) 2002 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:
+#
+# 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 Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE INTEL CORPORATION 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 INTEL CORPORATION OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUE
+# 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 ADVICED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+
+package Registry;
+use strict;
+use Win32API::Registry 0.21 qw( :ALL );
+
+
+###############################################################################
+
+#-----------------------------------------
+sub GetRegKeyVal($*) {
+ my ($FullRegPath, $value) = @_;
+#-----------------------------------------
+# Purpose: uses Win32API to get registry information from a given server
+#
+# WARNING: this procedure is VERY Win32 specific, you'll need a Win32 manual
+# to figure out why something is done.
+# input: $FullRegPath: a MS specific way of fully qualifying a registry path
+# \\Server\RootKey\Path\ValueName
+# output: *value: the value of the registry key of $FullRegPath
+#
+
+ my ($RemoteMachine, $RootKey, $RegPath, $KeyName, $i);
+
+#print "in sub:GetRegKeyVal:Parameters:", @_, "\n";
+
+ # Check the for valid fully qualified registry path
+ return -1 if (! ($FullRegPath =~ /\\.+\\.+/)) && (!($FullRegPath =~ /\\\\.+\\.+\\.+/));
+
+
+ $RemoteMachine = (index($FullRegPath, "\\\\") == $[ ? substr($FullRegPath, $[+2, index($FullRegPath, "\\", $[+2)-2):0);
+
+#print "RemoteMachine = $RemoteMachine\n";
+
+ $i = $RemoteMachine ? $[+3+length($RemoteMachine) : $[+1;
+ $RootKey = substr ($FullRegPath, $i, index($FullRegPath, "\\", $i)-$i);
+
+ $KeyName = $FullRegPath;
+ $KeyName =~ s/.*\\(.+)/$1/;
+#print "KeyName = $KeyName\n";
+
+ $i = index($FullRegPath, $RootKey, $[+length($RemoteMachine)) + $[ + length($RootKey)+1;
+ $RegPath = substr ($FullRegPath, $i, length($FullRegPath) - length($KeyName) -$i - 1);
+#print "RegPath = $RegPath\n";
+
+ my ($RootKeyHandle, $handle, $key, $type);
+
+ if ($RemoteMachine) {
+ $RootKeyHandle = regConstant($RootKey);
+
+ if (!RegConnectRegistry ($RemoteMachine, $RootKeyHandle, $handle)) {
+ $$value = regLastError();
+ return -2;
+ }
+ } else { # not valid actually because I can't find the mapping table of default
+ # local handle mapping. Should always pass in the Machine name to use for now
+ $handle = $RootKey;
+ }
+
+ if (!RegOpenKeyEx ($handle, $RegPath, 0, KEY_READ, $key)) {
+ $$value = regLastError();
+#print "regLastError = $$value\n";
+ return -3;
+ }
+ if (!RegQueryValueEx( $key, $KeyName, [], $type, $$value, [] )) {
Home |
Main Index |
Thread Index |
Old Index