Bug 634561 - Server crushes when using Windows Sync Agreement

https://bugzilla.redhat.com/show_bug.cgi?id=634561
Resolves: bug 634561
Bug Description: Server crushes when using Windows Sync Agreement
Reviewed by: ???
Branch: master
Fix Description: The regular replication protocol and the windows sync
protocol have two completely different struct repl_connection.  They
are almost the same, almost identical fields, but they are different.
When additional fields were added to the struct repl_connection, not
at the end of the structure, and identical changes were not made to the
struct repl_connection in windows_connection.c, the structures got out
of sync.  The authors tried to anticipate this condition by providing
windows_ versions of all of the conn_ functions.  We were not using the
windows_ versions of these functions in all places in the winsync code.
The fix is to use the windows_ versions of these functions throughout
the winsync code, and to make the struct repl_connection the same size
up through the char *plain field.  If additional fields are added to
either structure at the end, this problem should not occur in the
future.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit 4bd78323d0bb1299a19e0ed1feebc79ff997c92f)

1 files changed, 2 insertions, 2 deletions

diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index 3fe42cf0..5fb6e7b1 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1562,7 +1562,7 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
 			if (CONN_OPERATION_FAILED == return_value) {
 				int operation = 0;
 				int error = 0;
-				conn_get_error(prp->conn, &operation, &error);
+				windows_conn_get_error(prp->conn, &operation, &error);
 				/* The remote entry is missing. Let's add the renamed entry. */
 				if (LDAP_NO_SUCH_OBJECT == error) {
 					return_value = process_replay_add(prp,
@@ -4508,7 +4508,7 @@ windows_process_total_add(Private_Repl_Protocol *prp,Slapi_Entry *e, Slapi_DN* r
 				int operation = 0;
 				int error = 0;
 				
-				conn_get_error(prp->conn, &operation, &error);
+				windows_conn_get_error(prp->conn, &operation, &error);
 				if (windows_ignore_error_and_keep_going(error))
 				{
 					retval = CONN_OPERATION_SUCCESS;