- Timestamp parsing errors that indicated missing "minutes" fields rather

  than the actually missing "seconds" fields have been repaired thanks to
  a patch from Kevin Steves. [ISC_Bugs #16505]

diff --git a/RELNOTES b/RELNOTES
index 40e3f6e707c3433d9f6d9432e9507e72eb349929..69c2f792d26996fc8fe670e14d5e88b7e159a4bc 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -227,6 +227,10 @@ the README file.
 - A bug was fixed where the nwip virtual option space was referencing
   the fqdn option's virtual option space's option cache.
 
+- Timestamp parsing errors that indicated missing "minutes" fields rather
+  than the actually missing "seconds" fields have been repaired thanks to
+  a patch from Kevin Steves.
+
                        Changes since 3.0.5rc1
 
 - A bug was repaired in fixes to the dhclient, which sought to run the

diff --git a/common/parse.c b/common/parse.c
index 8c0be7ad4263f668d33c4de01f6b31f10d6c5b64..7639d14f21fef15ce48d80dc9326bfcc9093107c 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$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";
+"$Id: parse.c,v 1.120 2007/04/16 17:32:02 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -876,16 +876,16 @@ TIME parse_date (cfile)
        token = next_token (&val, (unsigned *)0, cfile);
        if (token != COLON) {
                parse_warn (cfile,
-                           "expected colon separating hour from minute.");
+                           "expected colon separating minute from second.");
                if (token != SEMI)
                        skip_to_semi (cfile);
                return (TIME)0;
        }
 
-       /* Minute... */
+       /* Second... */
        token = next_token (&val, (unsigned *)0, cfile);
        if (token != NUMBER) {
-               parse_warn (cfile, "numeric minute expected.");
+               parse_warn (cfile, "numeric second expected.");
                if (token != SEMI)
                        skip_to_semi (cfile);
                return (TIME)0;