upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Insert Y2K fix (hidden behind -DLDAP_Y2K).

Browse source
This commit is contained in:
Kurt Zeilenga 1998-09-16 08:33:34 +00:00
parent 916a5f9bd2
commit 007cbfc8f1
3 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/add.c
View file

@ -145,7 +145,7 @@ do_add( conn, op )
static void static void
add_created_attrs( Operation *op, Entry *e ) add_created_attrs( Operation *op, Entry *e )
{ {
char buf[20]; char buf[22];
struct berval bv; struct berval bv;
struct berval *bvals[2]; struct berval *bvals[2];
Attribute **a, **next; Attribute **a, **next;
@ -182,8 +182,12 @@ add_created_attrs( Operation *op, Entry *e )
attr_merge( e, "creatorsname", bvals ); attr_merge( e, "creatorsname", bvals );
pthread_mutex_lock( &currenttime_mutex ); pthread_mutex_lock( &currenttime_mutex );
ltm = localtime( &currenttime ); ltm = localtime( &currenttime );
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #ifdef LDAP_Y2K
strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
#else
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
#endif
pthread_mutex_unlock( &currenttime_mutex ); pthread_mutex_unlock( &currenttime_mutex );
bv.bv_val = buf; bv.bv_val = buf;

10
servers/slapd/modify.c
View file

@ -200,7 +200,7 @@ modlist_free(
static void static void
add_lastmods( Operation *op, LDAPMod **mods ) add_lastmods( Operation *op, LDAPMod **mods )
{ {
char buf[20]; char buf[22];
struct berval bv; struct berval bv;
struct berval *bvals[2]; struct berval *bvals[2];
LDAPMod **m; LDAPMod **m;
@ -251,8 +251,12 @@ add_lastmods( Operation *op, LDAPMod **mods )
*mods = tmp; *mods = tmp;
pthread_mutex_lock( &currenttime_mutex ); pthread_mutex_lock( &currenttime_mutex );
ltm = localtime( &currenttime ); ltm = localtime( &currenttime );
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #ifdef LDAP_Y2K
strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
#else
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
#endif
pthread_mutex_unlock( &currenttime_mutex ); pthread_mutex_unlock( &currenttime_mutex );
bv.bv_val = buf; bv.bv_val = buf;
bv.bv_len = strlen( bv.bv_val ); bv.bv_len = strlen( bv.bv_val );

22
servers/slapd/monitor.c
View file

@ -49,7 +49,7 @@ void
monitor_info( Connection *conn, Operation *op ) monitor_info( Connection *conn, Operation *op )
{ {
Entry *e; Entry *e;
char buf[BUFSIZ], buf2[20]; char buf[BUFSIZ], buf2[22];
struct berval val; struct berval val;
struct berval *vals[2]; struct berval *vals[2];
int i, nconns, nwritewaiters, nreadwaiters; int i, nconns, nwritewaiters, nreadwaiters;
@ -92,7 +92,11 @@ monitor_info( Connection *conn, Operation *op )
} }
pthread_mutex_lock( &currenttime_mutex ); pthread_mutex_lock( &currenttime_mutex );
ltm = localtime( &c[i].c_starttime ); ltm = localtime( &c[i].c_starttime );
#ifdef LDAP_Y2K
strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm );
#else
strftime( buf2, sizeof(buf2), "%y%m%d%H%M%SZ", ltm ); strftime( buf2, sizeof(buf2), "%y%m%d%H%M%SZ", ltm );
#endif
pthread_mutex_unlock( &currenttime_mutex ); pthread_mutex_unlock( &currenttime_mutex );
pthread_mutex_lock( &c[i].c_dnmutex ); pthread_mutex_lock( &c[i].c_dnmutex );
@ -155,16 +159,24 @@ monitor_info( Connection *conn, Operation *op )
attr_merge( e, "bytessent", vals ); attr_merge( e, "bytessent", vals );
pthread_mutex_lock( &currenttime_mutex ); pthread_mutex_lock( &currenttime_mutex );
ltm = localtime( &currenttime ); ltm = localtime( &currenttime );
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #ifdef LDAP_Y2K
strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
#else
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
#endif
pthread_mutex_unlock( &currenttime_mutex ); pthread_mutex_unlock( &currenttime_mutex );
val.bv_val = buf; val.bv_val = buf;
val.bv_len = strlen( buf ); val.bv_len = strlen( buf );
attr_merge( e, "currenttime", vals ); attr_merge( e, "currenttime", vals );
pthread_mutex_lock( &currenttime_mutex ); pthread_mutex_lock( &currenttime_mutex );
ltm = localtime( &starttime ); ltm = localtime( &starttime );
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #ifdef LDAP_Y2K
strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
#else
strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
#endif
pthread_mutex_unlock( &currenttime_mutex ); pthread_mutex_unlock( &currenttime_mutex );
val.bv_val = buf; val.bv_val = buf;
val.bv_len = strlen( buf ); val.bv_len = strlen( buf );