svn commit: samba r12241 - in branches/SAMBA_4_0/source/wrepl_server: .

[metze at samba.org]

Author: metze
Date: 2005-12-14 19:07:53 +0000 (Wed, 14 Dec 2005)
New Revision: 12241

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12241

Log:
fix the inform push notifies

metze
Modified:
   branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c


Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c	2005-12-14 19:04:45 UTC (rev 12240)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c	2005-12-14 19:07:53 UTC (rev 12241)
@@ -802,7 +802,7 @@
 
 enum wreplsrv_push_notify_stage {
 	WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_CONNECT,
-	WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_UPDATE,
+	WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_INFORM,
 	WREPLSRV_PUSH_NOTIFY_STAGE_DONE
 };
 
@@ -944,7 +944,7 @@
 	state->req->async.fn		= wreplsrv_push_notify_handler_req;
 	state->req->async.private	= state;
 
-	state->stage = WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_UPDATE;
+	state->stage = WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_INFORM;
 
 	return NT_STATUS_OK;
 }
@@ -976,9 +976,15 @@
 	return NT_STATUS_INTERNAL_ERROR;
 }
 
-static NTSTATUS wreplsrv_push_notify_wait_update(struct wreplsrv_push_notify_state *state)
+static NTSTATUS wreplsrv_push_notify_wait_inform(struct wreplsrv_push_notify_state *state)
 {
-	return NT_STATUS_FOOBAR;
+	NTSTATUS status;
+
+	status =  wrepl_request_recv(state->req, state, NULL);
+	NT_STATUS_NOT_OK_RETURN(status);
+
+	state->stage = WREPLSRV_PUSH_NOTIFY_STAGE_DONE;
+	return status;
 }
 
 static void wreplsrv_push_notify_handler(struct wreplsrv_push_notify_state *state)
@@ -989,8 +995,8 @@
 	case WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_CONNECT:
 		c->status = wreplsrv_push_notify_wait_connect(state);
 		break;
-	case WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_UPDATE:
-		c->status = wreplsrv_push_notify_wait_update(state);
+	case WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_INFORM:
+		c->status = wreplsrv_push_notify_wait_inform(state);
 		break;
 	case WREPLSRV_PUSH_NOTIFY_STAGE_DONE:
 		c->status = NT_STATUS_INTERNAL_ERROR;