Regenerate

diff --git a/client/dhclient.conf.cat5 b/client/dhclient.conf.cat5
index 7b6bb1cd927b9a749647d3e1b0e8f2d4b22b9f1d..bb34e524bd7c73ec71d704d3a04eb077f7e90749 100644 (file)
--- a/client/dhclient.conf.cat5
+++ b/client/dhclient.conf.cat5
@@ -569,7 +569,7 @@ S\bSE\bEE\bE A\bAL\bLS\bSO\bO
 A\bAU\bUT\bTH\bHO\bOR\bR
        d\bdh\bhc\bcl\bli\bie\ben\bnt\bt(\b(8\b8)\b)  was  written  by  Ted  Lemon <mellon@vix.com>
        under a contract with Vixie Labs.   Funding for this  pro­
-       ject  was  provided  by the Internet Software Corporation.
+       ject  was  provided  by  the Internet Software Consortium.
        Information about the Internet Software Consortium can  be
        found at h\bht\btt\btp\bp:\b:/\b//\b/w\bww\bww\bw.\b.i\bis\bsc\bc.\b.o\bor\brg\bg/\b/i\bis\bsc\bc.\b.
 

diff --git a/client/dhclient.leases.cat5 b/client/dhclient.leases.cat5
index 411d60d3afcaf2e93234657c6a9184d4d09db10b..1add3996f1e2d73e7fd651c91f7fd1f90434ead7 100644 (file)
--- a/client/dhclient.leases.cat5
+++ b/client/dhclient.leases.cat5
@@ -29,7 +29,7 @@ S\bSE\bEE\bE A\bAL\bLS\bSO\bO
 A\bAU\bUT\bTH\bHO\bOR\bR
        d\bdh\bhc\bcl\bli\bie\ben\bnt\bt(\b(8\b8)\b)  was  written  by  Ted  Lemon <mellon@vix.com>
        under a contract with Vixie Labs.   Funding for this  pro­
-       ject  was  provided  by the Internet Software Corporation.
+       ject  was  provided  by  the Internet Software Consortium.
        Information about the Internet Software Consortium can  be
        found at h\bht\btt\btp\bp:\b:/\b//\b/w\bww\bww\bw.\b.i\bis\bsc\bc.\b.o\bor\brg\bg/\b/i\bis\bsc\bc.\b.
 

diff --git a/common/dhcp-options.cat5 b/common/dhcp-options.cat5
index 30e44cbdd7a87c2b7441d20bad9aa657502d91d0..df8202e3fbceb3e7a68b838e5ed522aebe974bf0 100644 (file)
--- a/common/dhcp-options.cat5
+++ b/common/dhcp-options.cat5
@@ -532,9 +532,48 @@ dhcpd-options(5)                                 dhcpd-options(5)
 dhcpd-options(5)                                 dhcpd-options(5)
 
 
+R\bRE\bEL\bLA\bAY\bY A\bAG\bGE\bEN\bNT\bT I\bIN\bNF\bFO\bOR\bRM\bMA\bAT\bTI\bIO\bON\bN O\bOP\bPT\bTI\bIO\bON\bN
+       An   IETF   draft,    draft-ietf-dhc-agent-options-03.txt,
+       defines  a  series  of  encapsulated  options that a relay
+       agent can add to a DHCP packet when  relaying  it  to  the
+       DHCP server.   The server can then make address allocation
+       decisions (or whatever other decisions it wants) based  on
+       these  options.   The server also returns these options in
+       any replies it sends through the relay agent, so that  the
+       relay  agent  can use the information in these options for
+       delivery or accounting purposes.
+
+       The current draft  defines  two  options.    To  reference
+       these options in the dhcp server, specify the option space
+       name, "agent", followed  by  a  period,  followed  by  the
+       option name.   It isn't useful to specify these options to
+       be sent, nor is it useful to reference them at all in  the
+       client.  o\bop\bpt\bti\bio\bon\bn a\bag\bge\ben\bnt\bt.\b.c\bci\bir\brc\bcu\bui\bit\bt-\b-i\bid\bd _\bd_\ba_\bt_\ba_\b-_\bs_\bt_\br_\bi_\bn_\bg;\b;
+
+          The circuit-id suboption encodes an agent-local identi­
+          fier of the circuit from which a DHCP  client-to-server
+          packet  was received.  It is intended for use by agents
+          in relaying DHCP responses back to the proper  circuit.
+          The  format  of  this option is currently defined to be
+          vendor-dependent, and will probably  remain  that  way,
+          although the current draft allows for for the possibil­
+          ity of standardizing the format in the future.
+
+       o\bop\bpt\bti\bio\bon\bn a\bag\bge\ben\bnt\bt.\b.c\bci\bir\brc\bcu\bui\bit\bt-\b-i\bid\bd _\bd_\ba_\bt_\ba_\b-_\bs_\bt_\br_\bi_\bn_\bg;\b;
+
+          The remote-id suboption encodes information  about  the
+          remote  host  end  of  a circuit.   Examples of what it
+          might contain include caller ID  information,  username
+          information,  remote  ATM  address, cable modem ID, and
+          similar things.   In  principal,  the  meaning  is  not
+          well-specified,  and  it should generally be assumed to
+          be an opaque object that is administratively guaranteed
+          to be unique to a particular remote end of a circuit.
+
 S\bSE\bEE\bE A\bAL\bLS\bSO\bO
        dhcpd.conf(5),  dhcpd.leases(5),  dhclient.conf(5),  dhcp-
-       eval(5), dhcpd(8), dhclient(8), RFC2132, RFC2131.
+       eval(5), dhcpd(8), dhclient(8), RFC2132,  RFC2131,  draft-
+       ietf-dhc-agent-options-??.txt.
 
 A\bAU\bUT\bTH\bHO\bOR\bR
        The  Internet  Software  Consortium  DHCP Distribution was
@@ -550,45 +589,6 @@ A\bAU\bUT\bTH\bHO\bOR\bR
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                                                                 9
 
 

diff --git a/server/dhcpd.cat8 b/server/dhcpd.cat8
index 06a7ed7c46e92aba67a952477d305a5aa3a71380..8d3381d546b28638303e38578fb466a8d361df78 100644 (file)
--- a/server/dhcpd.cat8
+++ b/server/dhcpd.cat8
@@ -340,9 +340,9 @@ S\bSE\bEE\bE A\bAL\bLS\bSO\bO
 A\bAU\bUT\bTH\bHO\bOR\bR
        d\bdh\bhc\bcp\bpd\bd(\b(8\b8)\b) was written by Ted Lemon <mellon@vix.com> under a
        contract with Vixie Labs.   Funding for this  project  was
-       provided  by  the Internet Software Corporation.  Informa­
-       tion about the Internet Software Consortium can  be  found
-       at h\bht\btt\btp\bp:\b:/\b//\b/w\bww\bww\bw.\b.i\bis\bsc\bc.\b.o\bor\brg\bg/\b/i\bis\bsc\bc.\b.
+       provided by the Internet Software Consortium.  Information
+       about the Internet Software Consortium  can  be  found  at
+       h\bht\btt\btp\bp:\b:/\b//\b/w\bww\bww\bw.\b.i\bis\bsc\bc.\b.o\bor\brg\bg/\b/i\bis\bsc\bc.\b.
 
 
 

diff --git a/server/dhcpd.conf.cat5 b/server/dhcpd.conf.cat5
index ce09e0889ff25e3f890cb9a25797dc33d8eaec0e..bffedf326b0ea5ce4857fcaeb6368127276b138f 100644 (file)
--- a/server/dhcpd.conf.cat5
+++ b/server/dhcpd.conf.cat5
@@ -1007,9 +1007,9 @@ S\bSE\bEE\bE A\bAL\bLS\bSO\bO
 A\bAU\bUT\bTH\bHO\bOR\bR
        d\bdh\bhc\bcp\bpd\bd(\b(8\b8)\b) was written by Ted Lemon <mellon@vix.com> under a
        contract with Vixie Labs.   Funding for this  project  was
-       provided  by  the Internet Software Corporation.  Informa­
-       tion about the Internet Software Consortium can  be  found
-       at h\bht\btt\btp\bp:\b:/\b//\b/w\bww\bww\bw.\b.i\bis\bsc\bc.\b.o\bor\brg\bg/\b/i\bis\bsc\bc.\b.
+       provided by the Internet Software Consortium.  Information
+       about the Internet Software Consortium  can  be  found  at
+       h\bht\btt\btp\bp:\b:/\b//\b/w\bww\bww\bw.\b.i\bis\bsc\bc.\b.o\bor\brg\bg/\b/i\bis\bsc\bc.\b.