--- globus-2.2.4/mds/openldap/patch-n-build/patches/openldap-2.0.22-patch Sat Mar 1 18:23:52 2003 +++ vdt-1.1.8-10/mds/openldap/patch-n-build/patches/openldap-2.0.22-patch Fri Jul 4 20:08:02 2003 @@ -1,6 +1,6 @@ diff -urN openldap-2.0.22/build/lib.mk openldap-2.0.22-patched/build/lib.mk ---- openldap-2.0.22/build/lib.mk 2002-01-04 14:38:06.000000000 -0600 -+++ openldap-2.0.22-patched/build/lib.mk 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/build/lib.mk Fri Jan 4 21:38:06 2002 ++++ openldap-2.0.22-patched/build/lib.mk Fri Jul 4 19:40:30 2003 @@ -25,7 +25,7 @@ $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \ $(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \ @@ -11,8 +11,8 @@ depend-common: FORCE $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS) diff -urN openldap-2.0.22/build/ltconfig openldap-2.0.22-patched/build/ltconfig ---- openldap-2.0.22/build/ltconfig 2001-11-06 10:29:18.000000000 -0600 -+++ openldap-2.0.22-patched/build/ltconfig 2003-03-01 11:17:04.000000000 -0600 +--- openldap-2.0.22/build/ltconfig Tue Nov 6 17:29:18 2001 ++++ openldap-2.0.22-patched/build/ltconfig Fri Jul 4 19:40:30 2003 @@ -603,6 +603,7 @@ # Allow CC to be a program name with arguments. set dummy $CC @@ -80,8 +80,8 @@ LD=$LD diff -urN openldap-2.0.22/build/ltmain.sh openldap-2.0.22-patched/build/ltmain.sh ---- openldap-2.0.22/build/ltmain.sh 2001-11-06 10:29:18.000000000 -0600 -+++ openldap-2.0.22-patched/build/ltmain.sh 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/build/ltmain.sh Tue Nov 6 17:29:18 2001 ++++ openldap-2.0.22-patched/build/ltmain.sh Fri Jul 4 19:40:30 2003 @@ -2699,8 +2699,8 @@ esac @@ -94,8 +94,8 @@ # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" diff -urN openldap-2.0.22/build/mkdep openldap-2.0.22-patched/build/mkdep ---- openldap-2.0.22/build/mkdep 2002-01-04 14:38:06.000000000 -0600 -+++ openldap-2.0.22-patched/build/mkdep 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/build/mkdep Fri Jan 4 21:38:06 2002 ++++ openldap-2.0.22-patched/build/mkdep Fri Jul 4 19:40:30 2003 @@ -99,6 +99,21 @@ trap 'rm -f $TMP.sed $TMP ; exit 1' 1 2 3 13 15 @@ -152,8 +152,8 @@ cat << _EOF_ >> $TMP diff -urN openldap-2.0.22/build/top.mk openldap-2.0.22-patched/build/top.mk ---- openldap-2.0.22/build/top.mk 2002-01-14 12:46:51.000000000 -0600 -+++ openldap-2.0.22-patched/build/top.mk 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/build/top.mk Mon Jan 14 19:46:51 2002 ++++ openldap-2.0.22-patched/build/top.mk Fri Jul 4 19:40:30 2003 @@ -108,7 +108,7 @@ LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la @@ -164,9 +164,17 @@ LDAP_LIBAVL_DEPEND = $(LDAP_LIBDIR)/libavl/libavl.a LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a diff -urN openldap-2.0.22/clients/tools/ldapmodify.c openldap-2.0.22-patched/clients/tools/ldapmodify.c ---- openldap-2.0.22/clients/tools/ldapmodify.c 2002-01-04 14:38:08.000000000 -0600 -+++ openldap-2.0.22-patched/clients/tools/ldapmodify.c 2003-03-01 11:15:27.000000000 -0600 -@@ -133,6 +133,44 @@ +--- openldap-2.0.22/clients/tools/ldapmodify.c Fri Jan 4 21:38:08 2002 ++++ openldap-2.0.22-patched/clients/tools/ldapmodify.c Fri Jul 4 19:40:30 2003 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_SYS_STAT_H + #include +@@ -133,6 +134,44 @@ exit( EXIT_FAILURE ); } @@ -211,7 +219,53 @@ int main( int argc, char **argv ) -@@ -653,6 +691,7 @@ +@@ -142,6 +181,11 @@ + int rc, i, authmethod, version, want_bindpw, debug, manageDSAit, referrals; + int count; + ++ struct timeval timer; ++ struct timeval *timeout=NULL; ++ timer.tv_sec = 0; ++ timer.tv_usec = 0; ++ + if (( prog = strrchr( argv[ 0 ], *LDAP_DIRSEP )) == NULL ) { + prog = argv[ 0 ]; + } else { +@@ -158,7 +202,7 @@ + authmethod = -1; + version = -1; + +- while (( i = getopt( argc, argv, "acrf:F" ++ while (( i = getopt( argc, argv, "acrf:Fo:" + "Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z" )) != EOF ) + { + switch( i ) { +@@ -179,6 +223,10 @@ + case 'F': /* force all changes records to be used */ + force = 1; + break; ++ case 'o': ++ timer.tv_sec = atoi(optarg); ++ timeout = &timer; ++ break; + + /* Common Options */ + case 'C': +@@ -588,6 +636,13 @@ + } + } + ++ if (timeout && ++ ldap_set_option( ld, LDAP_OPT_NETWORK_TIMEOUT, (void *) timeout ) != LDAP_OPT_SUCCESS ) ++ { ++ fprintf( stderr, "Could not set LDAP_OPT_NETWORK_TIMEOUT %d\n", timeout->tv_sec ); ++ return EXIT_FAILURE; ++ } ++ + /* referrals */ + if( ldap_set_option( ld, LDAP_OPT_REFERRALS, + referrals ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS ) +@@ -653,6 +708,7 @@ ldap_perror( ld, "ldap_sasl_interactive_bind_s" ); return( EXIT_FAILURE ); } @@ -220,8 +274,8 @@ fprintf( stderr, "%s: not compiled with SASL support\n", argv[0] ); diff -urN openldap-2.0.22/clients/tools/ldapsearch.c openldap-2.0.22-patched/clients/tools/ldapsearch.c ---- openldap-2.0.22/clients/tools/ldapsearch.c 2002-01-04 14:38:09.000000000 -0600 -+++ openldap-2.0.22-patched/clients/tools/ldapsearch.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/clients/tools/ldapsearch.c Fri Jan 4 21:38:09 2002 ++++ openldap-2.0.22-patched/clients/tools/ldapsearch.c Fri Jul 4 19:40:30 2003 @@ -14,6 +14,7 @@ #include #include @@ -311,7 +365,20 @@ case 'l': /* time limit */ timelimit = atoi( optarg ); if( timelimit < 0 ) { -@@ -776,6 +826,7 @@ +@@ -699,6 +749,12 @@ + fprintf( stderr, "Could not set LDAP_OPT_DEREF %d\n", deref ); + return EXIT_FAILURE; + } ++ if (timeout && ++ ldap_set_option( ld, LDAP_OPT_NETWORK_TIMEOUT, (void *) timeout ) != LDAP_OPT_SUCCESS ) ++ { ++ fprintf( stderr, "Could not set LDAP_OPT_NETWORK_TIMEOUT %d\n", timeout->tv_sec ); ++ return EXIT_FAILURE; ++ } + if (timelimit != -1 && + ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) != LDAP_OPT_SUCCESS ) + { +@@ -776,6 +832,7 @@ ldap_perror( ld, "ldap_sasl_interactive_bind_s" ); return( EXIT_FAILURE ); } @@ -319,7 +386,7 @@ #else fprintf( stderr, "%s: not compiled with SASL support\n", prog, argv[0] ); -@@ -852,9 +903,9 @@ +@@ -852,9 +909,9 @@ printf( "\n#\n\n" ); } @@ -331,7 +398,7 @@ } else { rc = 0; -@@ -866,8 +917,9 @@ +@@ -866,8 +923,9 @@ } else { first = 0; } @@ -342,7 +409,7 @@ } if ( fp != stdin ) { fclose( fp ); -@@ -933,10 +985,10 @@ +@@ -933,10 +991,10 @@ nresponses = nentries = nreferences = nextended = npartial = 0; res = NULL; @@ -356,8 +423,8 @@ if( sortattr ) { (void) ldap_sort_entries( ld, &res, diff -urN openldap-2.0.22/configure openldap-2.0.22-patched/configure ---- openldap-2.0.22/configure 2002-01-31 17:31:09.000000000 -0600 -+++ openldap-2.0.22-patched/configure 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/configure Fri Feb 1 00:31:09 2002 ++++ openldap-2.0.22-patched/configure Fri Jul 4 19:40:30 2003 @@ -1,5 +1,5 @@ #! /bin/sh -# $OpenLDAP: pkg/ldap/configure,v 1.217.2.71 2002/01/31 23:31:09 kurt Exp $ @@ -7575,8 +7642,8 @@ +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff -urN openldap-2.0.22/configure.in openldap-2.0.22-patched/configure.in ---- openldap-2.0.22/configure.in 2002-01-24 11:04:28.000000000 -0600 -+++ openldap-2.0.22-patched/configure.in 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/configure.in Thu Jan 24 18:04:28 2002 ++++ openldap-2.0.22-patched/configure.in Fri Jul 4 19:40:30 2003 @@ -164,6 +164,8 @@ [auto berkeley bcompat mdbm gdbm]) OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type], static, @@ -7608,8 +7675,8 @@ servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk \ diff -urN openldap-2.0.22/include/Makefile.in openldap-2.0.22-patched/include/Makefile.in ---- openldap-2.0.22/include/Makefile.in 2002-01-04 14:38:14.000000000 -0600 -+++ openldap-2.0.22-patched/include/Makefile.in 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/include/Makefile.in Fri Jan 4 21:38:14 2002 ++++ openldap-2.0.22-patched/include/Makefile.in Fri Jul 4 19:40:30 2003 @@ -4,16 +4,72 @@ ## ## include Makefile.in for OpenLDAP @@ -7686,8 +7753,8 @@ $(RM) ldap_config.h diff -urN openldap-2.0.22/include/Makefile.in.orig openldap-2.0.22-patched/include/Makefile.in.orig ---- openldap-2.0.22/include/Makefile.in.orig 1969-12-31 18:00:00.000000000 -0600 -+++ openldap-2.0.22-patched/include/Makefile.in.orig 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/include/Makefile.in.orig Thu Jan 1 01:00:00 1970 ++++ openldap-2.0.22-patched/include/Makefile.in.orig Fri Jul 4 19:40:30 2003 @@ -0,0 +1,48 @@ +# $OpenLDAP: pkg/ldap/include/Makefile.in,v 1.10.4.4 2002/01/04 20:38:14 kurt Exp $ +## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. @@ -7737,9 +7804,186 @@ +clean-common: clean-local +veryclean-common: veryclean-local +depend-common: depend-local +diff -urN openldap-2.0.22/libraries/liblber/sockbuf.c openldap-2.0.22-patched/libraries/liblber/sockbuf.c +--- openldap-2.0.22/libraries/liblber/sockbuf.c Fri Jan 4 21:38:19 2002 ++++ openldap-2.0.22-patched/libraries/liblber/sockbuf.c Fri Jul 4 19:40:30 2003 +@@ -311,6 +311,7 @@ + + if ( (ber_len_t)ret < to_go ) { + /* not enough data, so pretend no data was sent. */ ++ errno = EAGAIN; + return -1; + } + +diff -urN openldap-2.0.22/libraries/libldap/cyrus.c openldap-2.0.22-patched/libraries/libldap/cyrus.c +--- openldap-2.0.22/libraries/libldap/cyrus.c Fri Jan 4 21:38:19 2002 ++++ openldap-2.0.22-patched/libraries/libldap/cyrus.c Fri Jul 4 19:40:30 2003 +@@ -185,12 +185,12 @@ + + p = (struct sb_sasl_data *)sbiod->sbiod_pvt; + +- /* Are there anything left in the buffer? */ ++ /* Is there anything left in the buffer? */ + ret = ber_pvt_sb_copy_out( &p->buf_in, buf, len ); + bufptr = ret; + len -= ret; + +- if ( len == 0 ) ++ if ( bufptr != 0 ) + return bufptr; + + ber_pvt_sb_buf_destroy( &p->buf_in ); +@@ -273,11 +273,15 @@ + + p = (struct sb_sasl_data *)sbiod->sbiod_pvt; + +- /* Are there anything left in the buffer? */ ++ /* Make sure it is not too big */ ++ if ( len > SASL_MAX_BUFF_SIZE / 2 ) len = SASL_MAX_BUFF_SIZE / 2; ++ ++ /* Is there anything left in the buffer? */ + if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) { + ret = ber_pvt_sb_do_write( sbiod, &p->buf_out ); + if ( ret <= 0 ) + return ret; ++ return len; + } + + /* now encode the next packet. */ +@@ -288,6 +292,7 @@ + ber_log_printf( LDAP_DEBUG_ANY, sbiod->sbiod_sb->sb_debug, + "sb_sasl_write: failed to encode packet: %s\n", + sasl_errstring( ret, NULL, NULL ) ); ++ errno = EIO; + return -1; + } + p->buf_out.buf_end = p->buf_out.buf_size; +diff -urN openldap-2.0.22/libraries/libldap/os-ip.c openldap-2.0.22-patched/libraries/libldap/os-ip.c +--- openldap-2.0.22/libraries/libldap/os-ip.c Sun Jan 13 04:53:46 2002 ++++ openldap-2.0.22-patched/libraries/libldap/os-ip.c Fri Jul 4 19:45:48 2003 +@@ -195,6 +195,7 @@ + { + struct timeval tv, *opt_tv=NULL; + fd_set wfds, *z=NULL; ++ time_t end_t = 0; + #ifdef HAVE_WINSOCK + fd_set efds; + #endif +@@ -202,6 +203,7 @@ + if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) { + tv.tv_usec = opt_tv->tv_usec; + tv.tv_sec = opt_tv->tv_sec; ++ end_t = time((time_t *) 0) + tv.tv_sec; + } + + osip_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n", +@@ -229,23 +231,40 @@ + if ( async ) return ( -2 ); + #endif + +- FD_ZERO(&wfds); +- FD_SET(s, &wfds ); ++ for (;;) { ++ FD_ZERO(&wfds); ++ FD_SET(s, &wfds ); + + #ifdef HAVE_WINSOCK +- FD_ZERO(&efds); +- FD_SET(s, &efds ); ++ FD_ZERO(&efds); ++ FD_SET(s, &efds ); + #endif + +- if ( select(ldap_int_tblsize, z, &wfds, ++ if ( select(ldap_int_tblsize, z, &wfds, + #ifdef HAVE_WINSOCK +- &efds, ++ &efds, + #else +- z, ++ z, + #endif +- opt_tv ? &tv : NULL) == AC_SOCKET_ERROR ) +- { +- return ( -1 ); ++ opt_tv ? &tv : NULL) == AC_SOCKET_ERROR ) ++ { ++ if ( errno != EINTR ) { ++ return ( -1 ); ++ } ++ ++ if ( opt_tv ) { ++ if ( (tv.tv_sec = end_t - time((time_t *) 0)) < 0 ) { ++ /* avoid EINVAL when timeout < 0 */ ++ tv.tv_sec = 0; ++ } ++ ++ tv.tv_usec = 0; ++ } ++ ++ continue; ++ } ++ ++ break; + } + + #ifdef HAVE_WINSOCK +diff -urN openldap-2.0.22/libraries/libldap/os-local.c openldap-2.0.22-patched/libraries/libldap/os-local.c +--- openldap-2.0.22/libraries/libldap/os-local.c Fri Jan 4 21:38:21 2002 ++++ openldap-2.0.22-patched/libraries/libldap/os-local.c Fri Jul 4 19:48:34 2003 +@@ -136,10 +136,12 @@ + { + struct timeval tv, *opt_tv=NULL; + fd_set wfds, *z=NULL; ++ time_t end_t = 0; + + if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) { + tv.tv_usec = opt_tv->tv_usec; + tv.tv_sec = opt_tv->tv_sec; ++ end_t = time((time_t *) 0) + tv.tv_sec; + } + + oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n", +@@ -165,13 +167,30 @@ + if ( async ) return ( -2 ); + #endif + +- FD_ZERO(&wfds); +- FD_SET(s, &wfds ); ++ for (;;) { ++ FD_ZERO(&wfds); ++ FD_SET(s, &wfds ); ++ ++ if ( select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL) ++ == AC_SOCKET_ERROR ) ++ { ++ if ( errno != EINTR ) { ++ return ( -1 ); ++ } ++ ++ if ( opt_tv ) { ++ if ( (tv.tv_sec = end_t - time((time_t *) 0)) < 0 ) { ++ /* avoid EINVAL when timeout < 0 */ ++ tv.tv_sec = 0; ++ } + +- if ( select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL) +- == AC_SOCKET_ERROR ) +- { +- return ( -1 ); ++ tv.tv_usec = 0; ++ } ++ ++ continue; ++ } ++ ++ break; + } + + if ( FD_ISSET(s, &wfds) ) { diff -urN openldap-2.0.22/libraries/libldap/result.c openldap-2.0.22-patched/libraries/libldap/result.c ---- openldap-2.0.22/libraries/libldap/result.c 2002-01-04 14:38:21.000000000 -0600 -+++ openldap-2.0.22-patched/libraries/libldap/result.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/libraries/libldap/result.c Fri Jan 4 21:38:21 2002 ++++ openldap-2.0.22-patched/libraries/libldap/result.c Fri Jul 4 19:40:30 2003 @@ -283,16 +283,14 @@ } #endif @@ -7765,9 +8009,34 @@ rc = -2; /* select interrupted: loop */ } else { rc = -2; +diff -urN openldap-2.0.22/libraries/libldap/sasl.c openldap-2.0.22-patched/libraries/libldap/sasl.c +--- openldap-2.0.22/libraries/libldap/sasl.c Fri Jan 4 21:38:21 2002 ++++ openldap-2.0.22-patched/libraries/libldap/sasl.c Fri Jul 4 19:40:30 2003 +@@ -168,6 +168,7 @@ + int rc, msgid; + LDAPMessage *result; + struct berval *scredp = NULL; ++ struct timeval tv, *opt_tv=NULL; + + Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 ); + +@@ -186,7 +187,12 @@ + return( rc ); + } + +- if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) { ++ if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) { ++ tv.tv_usec = opt_tv->tv_usec; ++ tv.tv_sec = opt_tv->tv_sec; ++ } ++ ++ if ( ldap_result( ld, msgid, 1, opt_tv ? &tv : NULL, &result ) <= 0 ) { + return( ld->ld_errno ); /* ldap_result sets ld_errno */ + } + diff -urN openldap-2.0.22/libraries/libldap_r/tpool.c openldap-2.0.22-patched/libraries/libldap_r/tpool.c ---- openldap-2.0.22/libraries/libldap_r/tpool.c 2002-01-04 14:38:23.000000000 -0600 -+++ openldap-2.0.22-patched/libraries/libldap_r/tpool.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/libraries/libldap_r/tpool.c Fri Jan 4 21:38:23 2002 ++++ openldap-2.0.22-patched/libraries/libldap_r/tpool.c Fri Jul 4 19:40:30 2003 @@ -57,7 +57,7 @@ static ldap_pvt_thread_mutex_t ldap_pvt_thread_pool_mutex; @@ -7836,8 +8105,8 @@ if (pool == NULL) diff -urN openldap-2.0.22/libraries/libldbm/ldbm.c openldap-2.0.22-patched/libraries/libldbm/ldbm.c ---- openldap-2.0.22/libraries/libldbm/ldbm.c 2002-01-04 20:15:35.000000000 -0600 -+++ openldap-2.0.22-patched/libraries/libldbm/ldbm.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/libraries/libldbm/ldbm.c Sat Jan 5 03:15:35 2002 ++++ openldap-2.0.22-patched/libraries/libldbm/ldbm.c Fri Jul 4 19:40:30 2003 @@ -13,6 +13,20 @@ #include "portable.h" @@ -7860,8 +8129,8 @@ #include diff -urN openldap-2.0.22/libraries/liblutil/Makefile.in openldap-2.0.22-patched/libraries/liblutil/Makefile.in ---- openldap-2.0.22/libraries/liblutil/Makefile.in 2002-01-04 14:38:24.000000000 -0600 -+++ openldap-2.0.22-patched/libraries/liblutil/Makefile.in 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/libraries/liblutil/Makefile.in Fri Jan 4 21:38:24 2002 ++++ openldap-2.0.22-patched/libraries/liblutil/Makefile.in Fri Jul 4 19:40:30 2003 @@ -5,21 +5,25 @@ ## Makefile for -llutil ## @@ -7915,8 +8184,8 @@ + $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) + diff -urN openldap-2.0.22/servers/slapd/Makefile.in openldap-2.0.22-patched/servers/slapd/Makefile.in ---- openldap-2.0.22/servers/slapd/Makefile.in 2001-07-21 21:28:28.000000000 -0500 -+++ openldap-2.0.22-patched/servers/slapd/Makefile.in 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/servers/slapd/Makefile.in Sun Jul 22 04:28:28 2001 ++++ openldap-2.0.22-patched/servers/slapd/Makefile.in Fri Jul 4 19:40:30 2003 @@ -52,6 +52,8 @@ BUILD_OPT = "--enable-slapd" BUILD_SRV = @BUILD_SLAPD@ @@ -7945,8 +8214,8 @@ + $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$header $(DESTDIR)$(includedir)/ldap_backend; \ + done diff -urN openldap-2.0.22/servers/slapd/acl.c openldap-2.0.22-patched/servers/slapd/acl.c ---- openldap-2.0.22/servers/slapd/acl.c 2002-01-15 09:28:13.000000000 -0600 -+++ openldap-2.0.22-patched/servers/slapd/acl.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/servers/slapd/acl.c Tue Jan 15 16:28:13 2002 ++++ openldap-2.0.22-patched/servers/slapd/acl.c Fri Jul 4 19:40:30 2003 @@ -1529,7 +1529,7 @@ *dp = '\0'; i = matches[n].rm_so; @@ -7957,8 +8226,8 @@ size++; } diff -urN openldap-2.0.22/servers/slapd/result.c openldap-2.0.22-patched/servers/slapd/result.c ---- openldap-2.0.22/servers/slapd/result.c 2002-01-04 14:38:29.000000000 -0600 -+++ openldap-2.0.22-patched/servers/slapd/result.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/servers/slapd/result.c Fri Jan 4 21:38:29 2002 ++++ openldap-2.0.22-patched/servers/slapd/result.c Fri Jul 4 19:40:31 2003 @@ -213,7 +213,7 @@ Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n", err, sock_errstr(err), 0 ); @@ -7984,8 +8253,8 @@ if ( err == LDAP_REFERRAL ) { if( ref == NULL ) { diff -urN openldap-2.0.22/servers/slapd/sasl.c openldap-2.0.22-patched/servers/slapd/sasl.c ---- openldap-2.0.22/servers/slapd/sasl.c 2002-01-04 14:38:29.000000000 -0600 -+++ openldap-2.0.22-patched/servers/slapd/sasl.c 2003-03-01 11:15:27.000000000 -0600 +--- openldap-2.0.22/servers/slapd/sasl.c Fri Jan 4 21:38:29 2002 ++++ openldap-2.0.22-patched/servers/slapd/sasl.c Fri Jul 4 19:40:31 2003 @@ -1,6 +1,6 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/sasl.c,v 1.5.2.17 2002/01/04 20:38:29 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/sasl.c,v 1.5.2.15 2000/10/12 17:02:48 kurt Exp $ */