[Bug 2191] dcfd -Y y2kcheck on CentOS 6.2 x86_64 breaks make check.

bk: 4fca0ab50rg7hjGpebKzdN7QommAtQ

diff --git a/ChangeLog b/ChangeLog
index 8ea1fe1c3ab792dd5ddb41ae5487934086c499b5..e2c0fac2c5b3719bc79bacc78508dd12c1335a7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 2178] refclock_tsyncpci.c reach register fails to shift.
+* [Bug 2191] dcfd -Y y2kcheck on CentOS 6.2 x86_64 breaks make check.
 (4.2.7p277) 2012/05/25 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2193] Building timestruct tests with Clang 3.1 fails.
 (4.2.7p276) 2012/05/15 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/parseutil/dcfd.c b/parseutil/dcfd.c
index 5c446fc690cb06a48559dff72283c3e624243ddb..0db94c0be973f3e0c8d6963d803cc855d73514cb 100644 (file)
--- a/parseutil/dcfd.c
+++ b/parseutil/dcfd.c
@@ -1325,43 +1325,6 @@ check_y2k( void )
            break;
        }
 
-       if ( year >= YEAR_PIVOT+1900 )
-       {
-           /* check year % 100 code we put into dcf_to_unixtime() */
-           ct.year = year % 100;
-           Flag = 0;
-
-           Observed = dcf_to_unixtime( &ct, &Flag );
-
-           if ( Observed != Expected  ||  Flag )
-           {   /* time difference */
-               fprintf( stdout, 
-"%04d: dcf_to_unixtime(%d,%d) FAILURE: was=%lu s/b=%lu  (%ld)\n",
-                  year, (int)ct.year, (int)Flag, 
-                  (unsigned long)Observed, (unsigned long)Expected,
-                  ((long)Observed - (long)Expected) );
-               Error(year);
-               break;
-           }
-
-           /* check year - 1900 code we put into dcf_to_unixtime() */
-           ct.year = year - 1900;
-           Flag = 0;
-
-           Observed = dcf_to_unixtime( &ct, &Flag );
-
-           if ( Observed != Expected  ||  Flag ) {   /* time difference */
-                   fprintf( stdout, 
-                            "%04d: dcf_to_unixtime(%d,%d) FAILURE: was=%lu s/b=%lu  (%ld)\n",
-                            year, (int)ct.year, (int)Flag, 
-                            (unsigned long)Observed, (unsigned long)Expected,
-                            ((long)Observed - (long)Expected) );
-                   Error(year);
-               break;
-           }
-
-
-       }
     }
 
     return ( Fatals );