[Ultrapossum-cvs 1134] plugin/slapd/upstream 1.7, 1.8, syncbackup-2.2.18.patch

Back to archive index

Masato Taruishi taru****@users*****
2004年 11月 19日 (金) 19:23:51 JST


===================================================================
RCS file: plugin/slapd/upstream/syncbackup-2.2.18.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin/slapd/upstream/syncbackup-2.2.18.patch	2004/11/19 10:20:56	1.7
+++ plugin/slapd/upstream/syncbackup-2.2.18.patch	2004/11/19 10:23:51	1.8
@@ -1,11 +1,11 @@
-Index: build/version.var
+Index: openldap-2.2.18/build/version.var
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/build/version.var,v
 retrieving revision 1.1.1.1
 retrieving revision 1.7
 diff -u -r1.1.1.1 -r1.7
---- build/version.var	26 Oct 2004 10:14:56 -0000	1.1.1.1
-+++ build/version.var	19 Nov 2004 09:52:42 -0000	1.7
+--- openldap-2.2.18/build/version.var	26 Oct 2004 10:14:56 -0000	1.1.1.1
++++ openldap-2.2.18/build/version.var	19 Nov 2004 09:52:42 -0000	1.7
 @@ -15,7 +15,7 @@
  ol_package=OpenLDAP
  ol_major=2
@@ -15,14 +15,14 @@
  ol_api_inc=20218
  ol_api_current=7
  ol_api_revision=11
-Index: include/ldap.h
+Index: openldap-2.2.18/include/ldap.h
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/include/ldap.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- include/ldap.h	26 Oct 2004 10:14:59 -0000	1.1.1.1
-+++ include/ldap.h	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/include/ldap.h	26 Oct 2004 10:14:59 -0000	1.1.1.1
++++ openldap-2.2.18/include/ldap.h	26 Oct 2004 10:26:09 -0000	1.2
 @@ -198,6 +198,9 @@
  	char			ldctl_iscritical;	/* criticality */
  } LDAPControl;
@@ -55,14 +55,14 @@
  
  /* LDAP Features */
  #define LDAP_FEATURE_ALL_OP_ATTRS	"1.3.6.1.4.1.4203.1.5.1"	/* RFC 3673 */
-Index: servers/slapd/Makefile.in
+Index: openldap-2.2.18/servers/slapd/Makefile.in
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/Makefile.in,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/Makefile.in	26 Oct 2004 10:15:05 -0000	1.1.1.1
-+++ servers/slapd/Makefile.in	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/Makefile.in	26 Oct 2004 10:15:05 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/Makefile.in	26 Oct 2004 10:26:09 -0000	1.2
 @@ -38,6 +38,7 @@
  		backover.c ctxcsn.c ldapsync.c sessionlog.c \
  		slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
@@ -79,14 +79,14 @@
  		$(@PLAT @ _OBJS)
  
  LDAP_INCDIR= ../../include -I$(srcdir)/slapi
-Index: servers/slapd/add.c
+Index: openldap-2.2.18/servers/slapd/add.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/add.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.6
 diff -u -r1.1.1.1 -r1.6
---- servers/slapd/add.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/add.c	17 Nov 2004 13:47:17 -0000	1.6
+--- openldap-2.2.18/servers/slapd/add.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/add.c	17 Nov 2004 13:47:17 -0000	1.6
 @@ -33,6 +33,10 @@
  #include "ldap_pvt.h"
  #include "slap.h"
@@ -140,14 +140,14 @@
  #endif
  			{
  				cb.sc_next = op->o_callback;
-Index: servers/slapd/backend.c
+Index: openldap-2.2.18/servers/slapd/backend.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/backend.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.4
 diff -u -r1.1.1.1 -r1.4
---- servers/slapd/backend.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/backend.c	13 Nov 2004 06:47:03 -0000	1.4
+--- openldap-2.2.18/servers/slapd/backend.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/backend.c	13 Nov 2004 06:47:03 -0000	1.4
 @@ -329,6 +329,10 @@
  	int i;
  	int rc = 0;
@@ -210,14 +210,14 @@
  
   	/* assign a default depth limit for alias deref */
  	be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH; 
-Index: servers/slapd/config.c
+Index: openldap-2.2.18/servers/slapd/config.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/config.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
 diff -u -r1.1.1.1 -r1.3
---- servers/slapd/config.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/config.c	13 Nov 2004 06:47:03 -0000	1.3
+--- openldap-2.2.18/servers/slapd/config.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/config.c	13 Nov 2004 06:47:03 -0000	1.3
 @@ -106,6 +106,12 @@
  
  static int add_syncrepl LDAP_P(( Backend *, char **, int ));
@@ -823,14 +823,14 @@
  char **
  str2clist( char ***out, char *in, const char *brkstr )
  {
-Index: servers/slapd/connection.c
+Index: openldap-2.2.18/servers/slapd/connection.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/connection.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.5
 diff -u -r1.1.1.1 -r1.5
---- servers/slapd/connection.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/connection.c	10 Nov 2004 04:58:06 -0000	1.5
+--- openldap-2.2.18/servers/slapd/connection.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/connection.c	10 Nov 2004 04:58:06 -0000	1.5
 @@ -1094,6 +1094,27 @@
  		assert( 0 );
  	}
@@ -878,14 +878,14 @@
  	} else {
  		LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
  		LDAP_STAILQ_NEXT(op, o_next) = NULL;
-Index: servers/slapd/controls.c
+Index: openldap-2.2.18/servers/slapd/controls.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/controls.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/controls.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/controls.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/controls.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/controls.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -43,6 +43,10 @@
  #endif
  static SLAP_CTRL_PARSE_FN parseLDAPsync;
@@ -963,14 +963,14 @@
 +	return LDAP_SUCCESS;
 +}
 +#endif
-Index: servers/slapd/ctxcsn.c
+Index: openldap-2.2.18/servers/slapd/ctxcsn.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/ctxcsn.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
 diff -u -r1.1.1.1 -r1.3
---- servers/slapd/ctxcsn.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/ctxcsn.c	17 Nov 2004 13:47:17 -0000	1.3
+--- openldap-2.2.18/servers/slapd/ctxcsn.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/ctxcsn.c	17 Nov 2004 13:47:17 -0000	1.3
 @@ -95,6 +95,12 @@
  		}
  	}
@@ -1016,14 +1016,14 @@
  	if ( manage_ctxcsn ) {
  		pending = (struct slap_csn_entry *) ch_calloc( 1,
  			sizeof( struct slap_csn_entry ));
-Index: servers/slapd/daemon.c
+Index: openldap-2.2.18/servers/slapd/daemon.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/daemon.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
 diff -u -r1.1.1.1 -r1.3
---- servers/slapd/daemon.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/daemon.c	10 Nov 2004 04:19:29 -0000	1.3
+--- openldap-2.2.18/servers/slapd/daemon.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/daemon.c	10 Nov 2004 04:19:29 -0000	1.3
 @@ -1281,6 +1281,9 @@
  		struct timeval		*tvp;
  
@@ -1066,14 +1066,14 @@
  		if ( cat != NULL ) {
  			time_t diff = difftime( cat->tv_sec, now );
  			if ( diff == 0 )
-Index: servers/slapd/delete.c
+Index: openldap-2.2.18/servers/slapd/delete.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/delete.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.6
 diff -u -r1.1.1.1 -r1.6
---- servers/slapd/delete.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/delete.c	17 Nov 2004 13:47:17 -0000	1.6
+--- openldap-2.2.18/servers/slapd/delete.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/delete.c	17 Nov 2004 13:47:17 -0000	1.6
 @@ -207,20 +207,33 @@
  		/* do the update here */
  		int repl_user = be_isupdate( op );
@@ -1110,14 +1110,14 @@
  #endif
  			{
  				cb.sc_next = op->o_callback;
-Index: servers/slapd/extended.c
+Index: openldap-2.2.18/servers/slapd/extended.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/extended.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/extended.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
-+++ servers/slapd/extended.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/extended.c	26 Oct 2004 10:15:06 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/extended.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -69,6 +69,9 @@
  const struct berval slap_EXOP_WHOAMI = BER_BVC(LDAP_EXOP_X_WHO_AM_I);
  const struct berval slap_EXOP_MODIFY_PASSWD = BER_BVC(LDAP_EXOP_MODIFY_PASSWD);
@@ -1138,14 +1138,14 @@
  	{ NULL, 0, NULL }
  };
  
-Index: servers/slapd/modify.c
+Index: openldap-2.2.18/servers/slapd/modify.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/modify.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.6
 diff -u -r1.1.1.1 -r1.6
---- servers/slapd/modify.c	26 Oct 2004 10:15:07 -0000	1.1.1.1
-+++ servers/slapd/modify.c	17 Nov 2004 13:47:17 -0000	1.6
+--- openldap-2.2.18/servers/slapd/modify.c	26 Oct 2004 10:15:07 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/modify.c	17 Nov 2004 13:47:17 -0000	1.6
 @@ -462,8 +462,13 @@
  		 * because it accepts each modify request
  		 */
@@ -1182,14 +1182,14 @@
  #endif
  			{
  				/* but we log only the ones not from a replicator user */
-Index: servers/slapd/modrdn.c
+Index: openldap-2.2.18/servers/slapd/modrdn.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/modrdn.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.6
 diff -u -r1.1.1.1 -r1.6
---- servers/slapd/modrdn.c	26 Oct 2004 10:15:07 -0000	1.1.1.1
-+++ servers/slapd/modrdn.c	17 Nov 2004 13:47:17 -0000	1.6
+--- openldap-2.2.18/servers/slapd/modrdn.c	26 Oct 2004 10:15:07 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/modrdn.c	17 Nov 2004 13:47:17 -0000	1.6
 @@ -364,13 +364,22 @@
  		/* do the update here */
  		int repl_user = be_isupdate( op );
@@ -1227,14 +1227,14 @@
  		char textbuf[ SLAP_TEXT_BUFLEN ];
  		size_t textlen = sizeof textbuf;
  
-Index: servers/slapd/operation.c
+Index: openldap-2.2.18/servers/slapd/operation.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/operation.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/operation.c	26 Oct 2004 10:15:08 -0000	1.1.1.1
-+++ servers/slapd/operation.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/operation.c	26 Oct 2004 10:15:08 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/operation.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -89,6 +89,12 @@
  
  	slap_sync_cookie_free( &op->o_sync_state, 0 );
@@ -1258,14 +1258,14 @@
 +
  	return( op );
  }
-Index: servers/slapd/proto-slap.h
+Index: openldap-2.2.18/servers/slapd/proto-slap.h
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/proto-slap.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.4
 diff -u -r1.1.1.1 -r1.4
---- servers/slapd/proto-slap.h	26 Oct 2004 10:15:08 -0000	1.1.1.1
-+++ servers/slapd/proto-slap.h	18 Nov 2004 13:55:49 -0000	1.4
+--- openldap-2.2.18/servers/slapd/proto-slap.h	26 Oct 2004 10:15:08 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/proto-slap.h	18 Nov 2004 13:55:49 -0000	1.4
 @@ -1303,6 +1303,27 @@
  LDAP_SLAPD_F (int) do_unbind LDAP_P((Operation *op, SlapReply *rs));
  LDAP_SLAPD_F (int) do_extended LDAP_P((Operation *op, SlapReply *rs));
@@ -1294,14 +1294,14 @@
  LDAP_END_DECL
  
  #endif /* PROTO_SLAP_H */
-Index: servers/slapd/slap.h
+Index: openldap-2.2.18/servers/slapd/slap.h
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/slap.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.8
 diff -u -r1.1.1.1 -r1.8
---- servers/slapd/slap.h	26 Oct 2004 10:15:09 -0000	1.1.1.1
-+++ servers/slapd/slap.h	18 Nov 2004 13:55:50 -0000	1.8
+--- openldap-2.2.18/servers/slapd/slap.h	26 Oct 2004 10:15:09 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/slap.h	18 Nov 2004 13:55:50 -0000	1.8
 @@ -1410,8 +1410,163 @@
  		LDAP				*si_ld;
  		LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist;
@@ -1522,12 +1522,12 @@
  #ifdef LDAP_SLAPI
  	void    *o_pb;                  /* NS-SLAPI plugin */
  	void	*o_extensions;		/* NS-SLAPI plugin */
-Index: servers/slapd/startsync.c
+Index: openldap-2.2.18/servers/slapd/startsync.c
 ===================================================================
-RCS file: servers/slapd/startsync.c
-diff -N servers/slapd/startsync.c
+RCS file: openldap-2.2.18/servers/slapd/startsync.c
+diff -N openldap-2.2.18/servers/slapd/startsync.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ servers/slapd/startsync.c	13 Nov 2004 06:47:03 -0000	1.5
++++ openldap-2.2.18/servers/slapd/startsync.c	13 Nov 2004 06:47:03 -0000	1.5
 @@ -0,0 +1,351 @@
 +/* $OpenLDAP:$ */
 +/*
@@ -1880,12 +1880,12 @@
 +	return;
 +}
 +#endif
-Index: servers/slapd/syncbackup.c
+Index: openldap-2.2.18/servers/slapd/syncbackup.c
 ===================================================================
-RCS file: servers/slapd/syncbackup.c
-diff -N servers/slapd/syncbackup.c
+RCS file: openldap-2.2.18/servers/slapd/syncbackup.c
+diff -N openldap-2.2.18/servers/slapd/syncbackup.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ servers/slapd/syncbackup.c	18 Nov 2004 13:55:50 -0000	1.17
++++ openldap-2.2.18/servers/slapd/syncbackup.c	18 Nov 2004 13:55:50 -0000	1.17
 @@ -0,0 +1,2968 @@
 +/* $OpenLDAP:$ */
 +/*
@@ -4855,14 +4855,14 @@
 +}
 +
 +#endif /* LDAP_SYNCBACKUP */
-Index: servers/slapd/syncrepl.c
+Index: openldap-2.2.18/servers/slapd/syncrepl.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/syncrepl.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.6
 diff -u -r1.1.1.1 -r1.6
---- servers/slapd/syncrepl.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
-+++ servers/slapd/syncrepl.c	13 Nov 2004 06:47:03 -0000	1.6
+--- openldap-2.2.18/servers/slapd/syncrepl.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/syncrepl.c	13 Nov 2004 06:47:03 -0000	1.6
 @@ -241,6 +241,11 @@
  				si->si_tls == SYNCINFO_TLS_CRITICAL ? "Error" : "Warning",
  				rc, 0 );
@@ -5140,14 +5140,14 @@
  	for (ml = modlist ; ml != NULL; ml = mlnext ) {
  		mlnext = ml->sml_next;
  		free( ml );
-Index: servers/slapd/back-bdb/add.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/add.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/add.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.5
 diff -u -r1.1.1.1 -r1.5
---- servers/slapd/back-bdb/add.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/add.c	18 Nov 2004 13:56:00 -0000	1.5
+--- openldap-2.2.18/servers/slapd/back-bdb/add.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/add.c	18 Nov 2004 13:56:00 -0000	1.5
 @@ -42,6 +42,9 @@
  	DB_LOCK		lock;
  
@@ -5210,14 +5210,14 @@
  			if ( ctxcsn_added ) {
  				bdb_cache_add( bdb, suffix_ei, ctxcsn_e,
  					(struct berval *)&slap_ldapsync_cn_bv, locker );
-Index: servers/slapd/back-bdb/ctxcsn.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/ctxcsn.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/ctxcsn.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/back-bdb/ctxcsn.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/ctxcsn.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/back-bdb/ctxcsn.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/ctxcsn.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -267,7 +267,11 @@
  	u_int32_t	ctxcsn_locker = 0;
  
@@ -5244,14 +5244,14 @@
  
  provider_ctxcsn_retry :
  		rs->sr_err = bdb_dn2entry( op, NULL, &op->o_bd->be_context_csn, &ctxcsn_ei,
-Index: servers/slapd/back-bdb/delete.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/delete.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/delete.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.5
 diff -u -r1.1.1.1 -r1.5
---- servers/slapd/back-bdb/delete.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/delete.c	18 Nov 2004 13:56:00 -0000	1.5
+--- openldap-2.2.18/servers/slapd/back-bdb/delete.c	26 Oct 2004 10:15:10 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/delete.c	18 Nov 2004 13:56:00 -0000	1.5
 @@ -41,6 +41,9 @@
  	DB_LOCK		lock, plock;
  
@@ -5303,14 +5303,14 @@
  			if ( ctxcsn_added ) {
  				bdb_cache_add( bdb, suffix_ei,
  					ctxcsn_e, (struct berval *)&slap_ldapsync_cn_bv, locker );
-Index: servers/slapd/back-bdb/init.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/init.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/init.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/back-bdb/init.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/init.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/back-bdb/init.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/init.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -654,6 +654,9 @@
  		LDAP_CONTROL_SUBENTRIES,
  #endif
@@ -5321,14 +5321,14 @@
  		NULL
  	};
  
-Index: servers/slapd/back-bdb/modify.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/modify.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/modify.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.5
 diff -u -r1.1.1.1 -r1.5
---- servers/slapd/back-bdb/modify.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/modify.c	18 Nov 2004 13:56:00 -0000	1.5
+--- openldap-2.2.18/servers/slapd/back-bdb/modify.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/modify.c	18 Nov 2004 13:56:00 -0000	1.5
 @@ -359,6 +359,9 @@
  	DB_LOCK		lock;
  
@@ -5379,14 +5379,14 @@
  			if ( ctxcsn_added ) {
  				bdb_cache_add( bdb, suffix_ei, ctxcsn_e,
  					(struct berval *)&slap_ldapsync_cn_bv, locker );
-Index: servers/slapd/back-bdb/modrdn.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/modrdn.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/modrdn.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.5
 diff -u -r1.1.1.1 -r1.5
---- servers/slapd/back-bdb/modrdn.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/modrdn.c	18 Nov 2004 13:56:00 -0000	1.5
+--- openldap-2.2.18/servers/slapd/back-bdb/modrdn.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/modrdn.c	18 Nov 2004 13:56:00 -0000	1.5
 @@ -59,6 +59,9 @@
  	DB_LOCK		lock, plock, nplock;
  
@@ -5437,14 +5437,14 @@
  			if ( ctxcsn_added ) {
  				bdb_cache_add( bdb, suffix_ei, ctxcsn_e,
  					(struct berval *)&slap_ldapsync_cn_bv, locker );
-Index: servers/slapd/back-bdb/search.c
+Index: openldap-2.2.18/servers/slapd/back-bdb/search.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-bdb/search.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
 diff -u -r1.1.1.1 -r1.3
---- servers/slapd/back-bdb/search.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
-+++ servers/slapd/back-bdb/search.c	18 Nov 2004 13:56:00 -0000	1.3
+--- openldap-2.2.18/servers/slapd/back-bdb/search.c	26 Oct 2004 10:15:11 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-bdb/search.c	18 Nov 2004 13:56:00 -0000	1.3
 @@ -336,6 +336,11 @@
  {
  	Operation	*ps;
@@ -5491,14 +5491,14 @@
  
  			mr = slap_schema.si_ad_entryCSN->ad_type->sat_ordering;
  			if ( sop->o_sync_state.ctxcsn &&
-Index: servers/slapd/back-monitor/backend.c
+Index: openldap-2.2.18/servers/slapd/back-monitor/backend.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-monitor/backend.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.3
 diff -u -r1.1.1.1 -r1.3
---- servers/slapd/back-monitor/backend.c	26 Oct 2004 10:15:13 -0000	1.1.1.1
-+++ servers/slapd/back-monitor/backend.c	13 Nov 2004 06:47:09 -0000	1.3
+--- openldap-2.2.18/servers/slapd/back-monitor/backend.c	26 Oct 2004 10:15:13 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-monitor/backend.c	13 Nov 2004 06:47:09 -0000	1.3
 @@ -138,7 +138,7 @@
  			attr_merge_normalize_one( e, mi->mi_ad_seeAlso,
  					&dn, NULL );
@@ -5508,14 +5508,14 @@
  		mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
  		e->e_private = ( void * )mp;
  		mp->mp_next = e_tmp;
-Index: servers/slapd/back-monitor/database.c
+Index: openldap-2.2.18/servers/slapd/back-monitor/database.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-monitor/database.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/back-monitor/database.c	26 Oct 2004 10:15:13 -0000	1.1.1.1
-+++ servers/slapd/back-monitor/database.c	13 Nov 2004 06:47:09 -0000	1.2
+--- openldap-2.2.18/servers/slapd/back-monitor/database.c	26 Oct 2004 10:15:13 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-monitor/database.c	13 Nov 2004 06:47:09 -0000	1.2
 @@ -36,6 +36,13 @@
  #include "../back-ldap/back-ldap.h"
  #endif /* defined(SLAPD_LDAP) */
@@ -5702,14 +5702,14 @@
 +
 +#endif
 +
-Index: servers/slapd/back-monitor/init.c
+Index: openldap-2.2.18/servers/slapd/back-monitor/init.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-monitor/init.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/back-monitor/init.c	26 Oct 2004 10:15:13 -0000	1.1.1.1
-+++ servers/slapd/back-monitor/init.c	8 Nov 2004 10:17:34 -0000	1.2
+--- openldap-2.2.18/servers/slapd/back-monitor/init.c	26 Oct 2004 10:15:13 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-monitor/init.c	8 Nov 2004 10:17:34 -0000	1.2
 @@ -61,7 +61,11 @@
  		BER_BVNULL, BER_BVNULL, BER_BVNULL,
  		MONITOR_F_PERSISTENT_CH,
@@ -5722,14 +5722,14 @@
  		NULL,   /* create */
  		NULL	/* modify */
         	}, { 
-Index: servers/slapd/back-monitor/proto-back-monitor.h
+Index: openldap-2.2.18/servers/slapd/back-monitor/proto-back-monitor.h
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slapd/back-monitor/proto-back-monitor.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slapd/back-monitor/proto-back-monitor.h	26 Oct 2004 10:15:13 -0000	1.1.1.1
-+++ servers/slapd/back-monitor/proto-back-monitor.h	8 Nov 2004 10:17:34 -0000	1.2
+--- openldap-2.2.18/servers/slapd/back-monitor/proto-back-monitor.h	26 Oct 2004 10:15:13 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slapd/back-monitor/proto-back-monitor.h	8 Nov 2004 10:17:34 -0000	1.2
 @@ -36,6 +36,9 @@
   * backends
   */
@@ -5740,14 +5740,14 @@
  
  /*
   * databases 
-Index: servers/slurpd/config.c
+Index: openldap-2.2.18/servers/slurpd/config.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slurpd/config.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slurpd/config.c	26 Oct 2004 10:15:15 -0000	1.1.1.1
-+++ servers/slurpd/config.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slurpd/config.c	26 Oct 2004 10:15:15 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slurpd/config.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -411,6 +411,9 @@
  )
  {
@@ -5797,14 +5797,14 @@
  	} else {
  	    fprintf( stderr, 
  		    "Error: parse_replica_line: unknown keyword \"%s\"\n",
-Index: servers/slurpd/re.c
+Index: openldap-2.2.18/servers/slurpd/re.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slurpd/re.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slurpd/re.c	26 Oct 2004 10:15:16 -0000	1.1.1.1
-+++ servers/slurpd/re.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slurpd/re.c	26 Oct 2004 10:15:16 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slurpd/re.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -46,10 +46,19 @@
  #include <ac/ctype.h>
  
@@ -5825,14 +5825,14 @@
  /* Forward references */
  static Rh 	*get_repl_hosts LDAP_P(( char *, int *, char ** ));
  static int	gettype LDAP_P(( char * ));
-Index: servers/slurpd/sanity.c
+Index: openldap-2.2.18/servers/slurpd/sanity.c
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slurpd/sanity.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slurpd/sanity.c	26 Oct 2004 10:15:16 -0000	1.1.1.1
-+++ servers/slurpd/sanity.c	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slurpd/sanity.c	26 Oct 2004 10:15:16 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slurpd/sanity.c	26 Oct 2004 10:26:09 -0000	1.2
 @@ -82,9 +82,15 @@
      /*
       * Are there any replicas listed in the slapd config file?
@@ -5849,14 +5849,14 @@
  	err++;
      }
  
-Index: servers/slurpd/slurp.h
+Index: openldap-2.2.18/servers/slurpd/slurp.h
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/servers/slurpd/slurp.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- servers/slurpd/slurp.h	26 Oct 2004 10:15:16 -0000	1.1.1.1
-+++ servers/slurpd/slurp.h	26 Oct 2004 10:26:09 -0000	1.2
+--- openldap-2.2.18/servers/slurpd/slurp.h	26 Oct 2004 10:15:16 -0000	1.1.1.1
++++ openldap-2.2.18/servers/slurpd/slurp.h	26 Oct 2004 10:26:09 -0000	1.2
 @@ -154,6 +154,9 @@
  #define STARTTLSSTR		"starttls"
  #define TLSSTR			"tls"
@@ -5877,12 +5877,12 @@
  
      /* Member functions */
      int (*ri_process) LDAP_P(( Ri * ));	/* process the next repl entry */
-Index: tests/data/slapd-syncbackup-master.conf
+Index: openldap-2.2.18/tests/data/slapd-syncbackup-master.conf
 ===================================================================
-RCS file: tests/data/slapd-syncbackup-master.conf
-diff -N tests/data/slapd-syncbackup-master.conf
+RCS file: openldap-2.2.18/tests/data/slapd-syncbackup-master.conf
+diff -N openldap-2.2.18/tests/data/slapd-syncbackup-master.conf
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ tests/data/slapd-syncbackup-master.conf	26 Oct 2004 10:27:59 -0000	1.1
++++ openldap-2.2.18/tests/data/slapd-syncbackup-master.conf	26 Oct 2004 10:27:59 -0000	1.1
 @@ -0,0 +1,47 @@
 +# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-master.conf,v 1.27 2003/04/30 01:04:18 hyc Exp $
 +#
@@ -5931,12 +5931,12 @@
 +		bindmethod=simple
 +		credentials=secret
 +		syncid=hige
-Index: tests/data/slapd-syncbackup-master2.conf
+Index: openldap-2.2.18/tests/data/slapd-syncbackup-master2.conf
 ===================================================================
-RCS file: tests/data/slapd-syncbackup-master2.conf
-diff -N tests/data/slapd-syncbackup-master2.conf
+RCS file: openldap-2.2.18/tests/data/slapd-syncbackup-master2.conf
+diff -N openldap-2.2.18/tests/data/slapd-syncbackup-master2.conf
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ tests/data/slapd-syncbackup-master2.conf	26 Oct 2004 10:27:59 -0000	1.1
++++ openldap-2.2.18/tests/data/slapd-syncbackup-master2.conf	26 Oct 2004 10:27:59 -0000	1.1
 @@ -0,0 +1,45 @@
 +# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-master.conf,v 1.27 2003/04/30 01:04:18 hyc Exp $
 +#
@@ -5983,12 +5983,12 @@
 +		bindmethod=simple
 +		credentials=secret
 +		syncid=hige
-Index: tests/data/slapd-syncbackup-slave1.conf
+Index: openldap-2.2.18/tests/data/slapd-syncbackup-slave1.conf
 ===================================================================
-RCS file: tests/data/slapd-syncbackup-slave1.conf
-diff -N tests/data/slapd-syncbackup-slave1.conf
+RCS file: openldap-2.2.18/tests/data/slapd-syncbackup-slave1.conf
+diff -N openldap-2.2.18/tests/data/slapd-syncbackup-slave1.conf
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ tests/data/slapd-syncbackup-slave1.conf	26 Oct 2004 10:27:59 -0000	1.1
++++ openldap-2.2.18/tests/data/slapd-syncbackup-slave1.conf	26 Oct 2004 10:27:59 -0000	1.1
 @@ -0,0 +1,42 @@
 +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-persist.conf,v 1.1 2003/05/20 17:58:11 jongchoi Exp $
 +#
@@ -6032,12 +6032,12 @@
 +		 credentials=secret
 +		 checkinterval=10
 +
-Index: tests/data/slapd-syncbackup-slave2.conf
+Index: openldap-2.2.18/tests/data/slapd-syncbackup-slave2.conf
 ===================================================================
-RCS file: tests/data/slapd-syncbackup-slave2.conf
-diff -N tests/data/slapd-syncbackup-slave2.conf
+RCS file: openldap-2.2.18/tests/data/slapd-syncbackup-slave2.conf
+diff -N openldap-2.2.18/tests/data/slapd-syncbackup-slave2.conf
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ tests/data/slapd-syncbackup-slave2.conf	26 Oct 2004 10:27:59 -0000	1.1
++++ openldap-2.2.18/tests/data/slapd-syncbackup-slave2.conf	26 Oct 2004 10:27:59 -0000	1.1
 @@ -0,0 +1,42 @@
 +# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-slave.conf,v 1.31 2003/04/30 01:04:18 hyc Exp $
 +#
@@ -6081,14 +6081,14 @@
 +                 credentials=secret
 +		 checkinterval=10
 +
-Index: tests/scripts/defines.sh
+Index: openldap-2.2.18/tests/scripts/defines.sh
 ===================================================================
 RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.18/tests/scripts/defines.sh,v
 retrieving revision 1.1.1.1
 retrieving revision 1.2
 diff -u -r1.1.1.1 -r1.2
---- tests/scripts/defines.sh	26 Oct 2004 10:15:17 -0000	1.1.1.1
-+++ tests/scripts/defines.sh	26 Oct 2004 10:26:10 -0000	1.2
+--- openldap-2.2.18/tests/scripts/defines.sh	26 Oct 2004 10:15:17 -0000	1.1.1.1
++++ openldap-2.2.18/tests/scripts/defines.sh	26 Oct 2004 10:26:10 -0000	1.2
 @@ -39,6 +39,8 @@
  RCONF=$DATADIR/slapd-referrals.conf
  MASTERCONF=$DATADIR/slapd-repl-master.conf
@@ -6107,12 +6107,12 @@
  REFSLAVECONF=$DATADIR/slapd-ref-slave.conf
  SCHEMACONF=$DATADIR/slapd-schema.conf
  GLUECONF=$DATADIR/slapd-glue.conf
-Index: tests/scripts/test101-syncbackup
+Index: openldap-2.2.18/tests/scripts/test101-syncbackup
 ===================================================================
-RCS file: tests/scripts/test101-syncbackup
-diff -N tests/scripts/test101-syncbackup
+RCS file: openldap-2.2.18/tests/scripts/test101-syncbackup
+diff -N openldap-2.2.18/tests/scripts/test101-syncbackup
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ tests/scripts/test101-syncbackup	26 Oct 2004 10:28:00 -0000	1.1
++++ openldap-2.2.18/tests/scripts/test101-syncbackup	26 Oct 2004 10:28:00 -0000	1.1
 @@ -0,0 +1,411 @@
 +#! /bin/sh
 +# $OpenLDAP$



Ultrapossum-cvs メーリングリストの案内
Back to archive index