Don't depend error handling on exact resultCode.

[openldap] / clients / ud / print.c

diff --git a/clients/ud/print.c b/clients/ud/print.c
index cbff8eb8a31f056f17a31ba1e8964b30279d2837..5d4414ee550ca141591cd7a2d6c19a4fb0ce3046 100644 (file)
--- a/clients/ud/print.c
+++ b/clients/ud/print.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1991, 1993 
  * Regents of the University of Michigan.  All rights reserved.
@@ -51,6 +56,8 @@ static char *person_attr_print_order[] = {
        "memberOfGroup",
        "lastModifiedBy",
        "lastModifiedTime",
+       "modifiersname",
+       "modifytimestamp",
        NULL
 };
 
@@ -73,6 +80,10 @@ static char *group_attr_print_order[] = {
        "labeledURL",
        "lastModifiedBy",
        "lastModifiedTime",
+       "modifiersname",
+       "modifytimestamp",
+       "creatorsname",
+       "createtimestamp",
        NULL
 };
 
@@ -194,6 +205,12 @@ print_an_entry( void )
        if (debug & D_TRACE)
                printf("->print_an_entry()\n");
 #endif
+
+       if( Entry.name == NULL ) {
+               printf(" No Entry found.\n");
+               return;
+       }
+
        printf(" \"%s\"\n", Entry.name);
        
        /*
@@ -544,7 +561,6 @@ time2text( char *ldtimestr, int dateonly )
     struct tm          t;
     char               *p, *timestr, zone, *fmterr = "badly formatted time";
     time_t             gmttime;
-    char               timebuf[32];
        int ndigits;
 
        if (strlen( ldtimestr ) < 12 ) {
@@ -568,8 +584,10 @@ time2text( char *ldtimestr, int dateonly )
                /* POSIX says tm_year should be year - 1900 */
        t.tm_year = 100 * GET2BYTENUM( p ) - 1900;
                p += 2;
+       } else {
+       t.tm_year = 0;
        }
-    t.tm_year = GET2BYTENUM( p ); p += 2;
+    t.tm_year += GET2BYTENUM( p ); p += 2;
 
     t.tm_mon = GET2BYTENUM( p ) - 1; p += 2;
     t.tm_mday = GET2BYTENUM( p ); p += 2;
@@ -611,7 +629,7 @@ int dmsize[] = {
 /*
  * Y2K YEAR
  */
-       /* per POSIX tm_year should be offset by 1900 */
+       /* per STDC & POSIX tm_year *should* be offset by 1900 */
 #define YEAR_POSIX(y)          ((y) + 1900)
 
        /*
@@ -619,15 +637,6 @@ int        dmsize[] = {
         */
 #define YEAR_CAREFUL(y)                ((y) < 1900 ? (y) + 1900 : (y))
 
-       /*
-       ** if year is < 1990 and < 70 must be offset by 2000 as Unix epoch
-       ** started in 1970.  if year is < 1990 but >= 70, offset by 1900.
-       ** if year is >= 1900, it must be the real year.
-       */ 
-#define YEAR_PEDANTIC(y)               ((y) < 1900 \
-                                               ? ((y) < 70 ? (y) + 2000 ? (y) + 1900) \
-                                               : (y))
-
 #define YEAR(y) YEAR_CAREFUL(y)