Spelling fixes. See RT ticket 16513 for details.

diff --git a/RELNOTES b/RELNOTES
index b617ce3b44a9825433a942b9087393afbdfd4656..306aaa7fbc03d2fae8555afb4f4fff61bb765aa3 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -25,6 +25,9 @@ For information on how to install, configure and run this software,
 as well as how to find documentation and report bugs, please consult
 the README file.
 
+                       Changes since 3.1.0a3
+
+- Some spelling fixes.
 
                        Changes since 3.1.0a2
 

diff --git a/client/clparse.c b/client/clparse.c
index b19c81ce714195e5224cc8a81e91e5048a073bdd..04f12b63eeefc7e50a6f913e46ebca5801a7c152 100644 (file)
--- a/client/clparse.c
+++ b/client/clparse.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: clparse.c,v 1.67 2006/06/01 20:23:16 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: clparse.c,v 1.68 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -288,7 +288,7 @@ void parse_client_statement (cfile, ip, config)
                return;
 
                /* REQUIRE can either start a policy statement or a
-                  comma-seperated list of names of required options. */
+                  comma-separated list of names of required options. */
              case REQUIRE:
                next_token (&val, (unsigned *)0, cfile);
                token = peek_token (&val, (unsigned *)0, cfile);

diff --git a/common/options.c b/common/options.c
index 68812e1b11e1c6e1ddf0fc818f5e17034074cf1e..4b7aa35fe2d55aee27eafd5f10f4464b4be188dd 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.102 2007/01/11 16:31:51 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.103 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -476,7 +476,7 @@ int fqdn_universe_decode (struct option_state *options,
 }
 
 /* cons options into a big buffer, and then split them out into the
-   three seperate buffers if needed.  This allows us to cons up a set
+   three separate buffers if needed.  This allows us to cons up a set
    of vendor options using the same routine. */
 
 int cons_options (inpacket, outpacket, lease, client_state,

diff --git a/common/parse.c b/common/parse.c
index 486d0cd2cf1658166862a0ea123a26e17632ae91..8c0be7ad4263f668d33c4de01f6b31f10d6c5b64 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.118 2007/01/28 23:00:19 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.119 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -414,7 +414,7 @@ parse_ip_addr_with_subnet(cfile, match)
 }
 
 /*
- * hardware-parameter :== HARDWARE hardware-type colon-seperated-hex-list SEMI
+ * hardware-parameter :== HARDWARE hardware-type colon-separated-hex-list SEMI
  * hardware-type :== ETHERNET | TOKEN_RING | FDDI
  */
 
@@ -513,18 +513,18 @@ void parse_lease_time (cfile, timep)
 }
 
 /* No BNF for numeric aggregates - that's defined by the caller.  What
-   this function does is to parse a sequence of numbers seperated by
-   the token specified in seperator.  If max is zero, any number of
+   this function does is to parse a sequence of numbers separated by
+   the token specified in separator.  If max is zero, any number of
    numbers will be parsed; otherwise, exactly max numbers are
    expected.  Base and size tell us how to internalize the numbers
    once they've been tokenized. */
 
 unsigned char *parse_numeric_aggregate (cfile, buf,
-                                       max, seperator, base, size)
+                                       max, separator, base, size)
        struct parse *cfile;
        unsigned char *buf;
        unsigned *max;
-       int seperator;
+       int separator;
        int base;
        unsigned size;
 {
@@ -545,7 +545,7 @@ unsigned char *parse_numeric_aggregate (cfile, buf,
        do {
                if (count) {
                        token = peek_token (&val, (unsigned *)0, cfile);
-                       if (token != seperator) {
+                       if (token != separator) {
                                if (!*max)
                                        break;
                                if (token != RBRACE && token != LBRACE)
@@ -802,11 +802,11 @@ TIME parse_date (cfile)
        if (year > 1900)
                year -= 1900;
 
-       /* Slash seperating year from month... */
+       /* Slash separating year from month... */
        token = next_token (&val, (unsigned *)0, cfile);
        if (token != SLASH) {
                parse_warn (cfile,
-                           "expected slash seperating year from month.");
+                           "expected slash separating year from month.");
                if (token != SEMI)
                        skip_to_semi (cfile);
                return (TIME)0;
@@ -822,11 +822,11 @@ TIME parse_date (cfile)
        }
        mon = atoi (val) - 1;
 
-       /* Slash seperating month from day... */
+       /* Slash separating month from day... */
        token = next_token (&val, (unsigned *)0, cfile);
        if (token != SLASH) {
                parse_warn (cfile,
-                           "expected slash seperating month from day.");
+                           "expected slash separating month from day.");
                if (token != SEMI)
                        skip_to_semi (cfile);
                return (TIME)0;
@@ -852,11 +852,11 @@ TIME parse_date (cfile)
        }
        hour = atoi (val);
 
-       /* Colon seperating hour from minute... */
+       /* Colon separating hour from minute... */
        token = next_token (&val, (unsigned *)0, cfile);
        if (token != COLON) {
                parse_warn (cfile,
-                           "expected colon seperating hour from minute.");
+                           "expected colon separating hour from minute.");
                if (token != SEMI)
                        skip_to_semi (cfile);
                return (TIME)0;
@@ -872,11 +872,11 @@ TIME parse_date (cfile)
        }
        min = atoi (val);
 
-       /* Colon seperating minute from second... */
+       /* Colon separating minute from second... */
        token = next_token (&val, (unsigned *)0, cfile);
        if (token != COLON) {
                parse_warn (cfile,
-                           "expected colon seperating hour from minute.");
+                           "expected colon separating hour from minute.");
                if (token != SEMI)
                        skip_to_semi (cfile);
                return (TIME)0;
@@ -1701,8 +1701,8 @@ int parse_base64 (data, cfile)
 
 
 /*
- * colon-seperated-hex-list :== NUMBER |
- *                             NUMBER COLON colon-seperated-hex-list
+ * colon-separated-hex-list :== NUMBER |
+ *                             NUMBER COLON colon-separated-hex-list
  */
 
 int parse_cshl (data, cfile)
@@ -3101,7 +3101,7 @@ int parse_boolean_expression (expr, cfile, lose)
  *                    PACKET LPAREN numeric-expression COMMA
  *                                  numeric-expression RPAREN |
  *                    STRING |
- *                    colon_seperated_hex_list
+ *                    colon_separated_hex_list
  */
 
 int parse_data_expression (expr, cfile, lose)
@@ -3519,7 +3519,7 @@ int parse_non_binary (expr, cfile, lose, context)
                if (token != COMMA)
                        goto nocomma;
 
-               if (!parse_data_expression (&(*expr) -> data.b2a.seperator,
+               if (!parse_data_expression (&(*expr) -> data.b2a.separator,
                                            cfile, lose))
                        goto nodata;
 

diff --git a/common/print.c b/common/print.c
index f068ecdfc8d50183f52f0c321c4dcccb62fe222a..f825177726d7a02ec9668127498c64dcb5fd23f5 100644 (file)
--- a/common/print.c
+++ b/common/print.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: print.c,v 1.62 2007/01/28 23:00:19 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: print.c,v 1.63 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -918,7 +918,7 @@ static unsigned print_subexpression (expr, buf, len)
                        rv += print_subexpression (expr -> data.b2a.width,
                                                   buf + rv, len - rv - 3);
                        buf [rv++] = ' ';
-                       rv += print_subexpression (expr -> data.b2a.seperator,
+                       rv += print_subexpression (expr -> data.b2a.separator,
                                                   buf + rv, len - rv - 2);
                        buf [rv++] = ' ';
                        rv += print_subexpression (expr -> data.b2a.buffer,

diff --git a/common/tables.c b/common/tables.c
index b4b47ba6d94d99488eb47b949cb1a355592d0cf6..9740257ce4547a926e470aa03dcc92d7b62e46e4 100644 (file)
--- a/common/tables.c
+++ b/common/tables.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tables.c,v 1.60 2006/10/27 22:54:12 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: tables.c,v 1.61 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -74,7 +74,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option,
    F - implicit flag - the presence of the option indicates that the
        flag is true.
    o - the preceding value is optional.
-   E - encapsulation, string or colon-seperated hex list (the latter
+   E - encapsulation, string or colon-separated hex list (the latter
        two for parsing).   E is followed by a text string containing
        the name of the option space to encapsulate, followed by a '.'.
        If the E is immediately followed by '.', the applicable vendor
@@ -86,9 +86,9 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option,
        thing in the option.
    X - either an ASCII string or binary data.   On output, the string is
        scanned to see if it's printable ASCII and, if so, output as a
-       quoted string.   If not, it's output as colon-seperated hex.   On
+       quoted string.   If not, it's output as colon-separated hex.   On
        input, the option can be specified either as a quoted string or as
-       a colon-seperated hex list.
+       a colon-separated hex list.
    N - enumeration.   N is followed by a text string containing
        the name of the set of enumeration values to parse or emit,
        followed by a '.'.   The width of the data is specified in the

diff --git a/common/tree.c b/common/tree.c
index f3d8d3e3dff85abfb082d42bc7af25a2e1733141..8f2b787916b2bcf1e5cdcc588655ccd690c68621 100644 (file)
--- a/common/tree.c
+++ b/common/tree.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.111 2007/01/28 23:00:19 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.112 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -852,7 +852,7 @@ int evaluate_dns_expression (result, packet, lease, client_state, in_options,
                   ASCII string both look like data expressions, but
                   for A records, we want an ASCII string, not a
                   binary IP address.  Do I need to turn binary IP
-                  addresses into a seperate type?  */
+                  addresses into a separate type?  */
                return (r0 && r1 &&
                        (r2 || expr -> op != expr_ns_add) && *result);
 
@@ -1825,12 +1825,12 @@ int evaluate_data_expression (result, packet, lease, client_state,
                                                  scope,
                                                  expr -> data.b2a.width);
 
-               /* Evaluate the seperator string. */
+               /* Evaluate the separator string. */
                memset (&data, 0, sizeof data);
                s2 = evaluate_data_expression (&data, packet, lease,
                                               client_state,
                                               in_options, cfg_options, scope,
-                                              expr -> data.b2a.seperator,
+                                              expr -> data.b2a.separator,
                                               MDL);
 
                /* Evaluate the data to be converted. */
@@ -2997,8 +2997,8 @@ void expression_dereference (eptr, file, line)
                if (expr -> data.b2a.width)
                        expression_dereference (&expr -> data.b2a.width,
                                                file, line);
-               if (expr -> data.b2a.seperator)
-                       expression_dereference (&expr -> data.b2a.seperator,
+               if (expr -> data.b2a.separator)
+                       expression_dereference (&expr -> data.b2a.separator,
                                                file, line);
                if (expr -> data.b2a.buffer)
                        expression_dereference (&expr -> data.b2a.buffer,
@@ -3693,7 +3693,7 @@ int write_expression (file, expr, col, indent, firstp)
                                        col, scol, 0);
                col = token_print_indent (file, col, scol, "", " ",
                                          ",");
-               col = write_expression (file, expr -> data.b2a.seperator,
+               col = write_expression (file, expr -> data.b2a.separator,
                                        col, scol, 0);
                col = token_print_indent (file, col, scol, "", " ",
                                          ",");

diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index afac88ac705877b5b04eb7b6174b1d25b1ce088a..ffbde4341173614b34fdd26b50519cac46e8481b 100644 (file)
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: omshell.c,v 1.11 2006/02/24 23:16:29 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: omshell.c,v 1.12 2007/01/29 10:25:55 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include <time.h>
@@ -473,7 +473,7 @@ int main (int argc, char **argv, char **envp)
                          case NUMBER:
                            strcpy (buf, val);
                            token = peek_token (&val, (unsigned *)0, cfile);
-                           /* Colon-seperated hex list? */
+                           /* Colon-separated hex list? */
                            if (token == COLON)
                                goto cshl;
                            else if (token == DOT) {

diff --git a/doc/ja_JP.eucJP/dhcp-eval.5 b/doc/ja_JP.eucJP/dhcp-eval.5
index 60134f589e2daaf0b5097817b80057882271b3a6..e85dc7bc64bd9caf30af47f6b7e00d8a36beac71 100644 (file)
--- a/doc/ja_JP.eucJP/dhcp-eval.5
+++ b/doc/ja_JP.eucJP/dhcp-eval.5
@@ -1,4 +1,4 @@
-.\"    $Id: dhcp-eval.5,v 1.2 2005/03/17 20:15:05 dhankins Exp $
+.\"    $Id: dhcp-eval.5,v 1.3 2007/01/29 10:25:55 shane Exp $
 .\"
 .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -250,7 +250,7 @@ FDDI (8) 
 .\" horikawa@jp.FreeBSD.org 2002/05/01
 .RE
 .PP
-.I colon-seperated hexadecimal list
+.I colon-separated hexadecimal list
 .PP
 .RS 0.25i
 ¥³¥í¥ó¤Ç¶èÀÚ¤é¤ì¤¿ 16 ¿Ê¿ô¤Î¥ª¥¯¥Æ¥Ã¥ÈÃͤΥꥹ¥È¤ò¡¢

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index 1028a9ca41ee8664ad9c500b2eada093c94a0315..ad2c9790731d77cd6bcb2f87f178b13fd1ff601b 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -79,7 +79,7 @@ extern int h_errno;
    in /var/state/misc - indeed, given that there's only one lease file, it
    would probably be better.   However, I have some ideas for optimizing
    the lease database that may result in a _lot_ of smaller files being
-   created, so in that context it makes more sense to have a seperate
+   created, so in that context it makes more sense to have a separate
    directory. */
 
 #ifndef _PATH_DHCPD_DB

diff --git a/includes/cf/sample.h b/includes/cf/sample.h
index 0f793184eed62feee662ac4b1881b14bfbd706af..deea3ec435f0de5268bca8222be5db3a2cd6a8b7 100644 (file)
--- a/includes/cf/sample.h
+++ b/includes/cf/sample.h
@@ -256,13 +256,13 @@ char *strerror PROTO ((int));
 
 /* #define HAVE_SA_LEN */
 
-/* Every operating system has its own way of seperating lines in a
+/* Every operating system has its own way of separating lines in a
    sequential text file.  Most modern systems use a single character,
    either an ASCII Newline (10) or an ASCII Carriage Return (13).
 
    The most notable exception is MS-DOS (and consequently, Windows),
    which uses an ASCII Carriage Return followed by a Newline to
-   seperate each line.  Fortunately, MS-DOS C compiler libraries
+   separate each line.  Fortunately, MS-DOS C compiler libraries
    typically hide this from the programmer, returning just a Newline.
 
    Define EOL to be whatever getc() returns for a newline. */

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 9c5cd71b18c8aa1e0c2a697bae52edffa19cc853..d77f507b00fe6af63739cca9f43983f29a574511 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -285,7 +285,7 @@ struct option_tag {
 
 /* An agent option structure.   We need a special structure for the
    Relay Agent Information option because if more than one appears in
-   a message, we have to keep them seperate. */
+   a message, we have to keep them separate. */
 
 struct agent_options {
        struct agent_options *next;

diff --git a/includes/failover.h b/includes/failover.h
index 16e3b3e9a544fb5752ad69f7f36ddf87a1a18d57..00409bf9fa2c85d70d390ca35442971747b980fa 100644 (file)
--- a/includes/failover.h
+++ b/includes/failover.h
@@ -304,7 +304,7 @@ enum failover_state {
 
 /* Service states are simplifications of failover states, particularly
    useful because the startup state isn't actually implementable as a
-   seperate failover state without maintaining a state stack. */
+   separate failover state without maintaining a state stack. */
 
 enum service_state {
        unknown_service_state,

diff --git a/includes/tree.h b/includes/tree.h
index e70a612309f5d229c4c796aa2205afc3349e9b6c..a13f67a2c4990292d148553a00733155e488f3d9 100644 (file)
--- a/includes/tree.h
+++ b/includes/tree.h
@@ -237,7 +237,7 @@ struct expression {
                struct {
                        struct expression *base;
                        struct expression *width;
-                       struct expression *seperator;
+                       struct expression *separator;
                        struct expression *buffer;
                } b2a;
                struct {

diff --git a/server/confpars.c b/server/confpars.c
index 8679284924c00b17ac659c339c0fa53fc3192c40..9951496ad863d69b270d95e7381f7a27ebd959c3 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.159 2006/07/25 13:26:00 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.160 2007/01/29 10:25:55 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -2695,7 +2695,7 @@ int parse_lease_declaration (struct lease **lp, struct parse *cfile)
                        }
                        break;
 
-                       /* Colon-seperated hexadecimal octets... */
+                       /* Colon-separated hexadecimal octets... */
                      case UID:
                        seenbit = 8;
                        token = peek_token (&val, (unsigned *)0, cfile);

diff --git a/server/failover.c b/server/failover.c
index a7e18c02404038cb494ffa2e1f0a5a309697391f..b842eb792ae68e55422b6517339eeaf8d658c7b5 100644 (file)
--- a/server/failover.c
+++ b/server/failover.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: failover.c,v 1.68 2006/10/27 22:54:12 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: failover.c,v 1.69 2007/01/29 10:25:55 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -164,7 +164,7 @@ isc_result_t find_failover_peer (peer, name, file, line)
    each failover partner declaration in the dhcpd.conf file, primary
    or secondary, there is a failover_state object.  For any primary or
    secondary state object that has a connection to its peer, there is
-   also a failover_link object, which has its own input state seperate
+   also a failover_link object, which has its own input state separate
    from the failover protocol state for managing the actual bytes
    coming in off the wire.  Finally, there will be one listener object
    for every distinct port number associated with a secondary