4 files changed, 7 insertions, 7 deletions
diff --git a/source4/libcli/raw/clioplock.c b/source4/libcli/raw/clioplock.c
index 5005f878af..42ac6b517b 100644
--- a/source4/libcli/raw/clioplock.c
+++ b/source4/libcli/raw/clioplock.c
@@ -58,5 +58,5 @@ _PUBLIC_ void smbcli_oplock_handler(struct smbcli_transport *transport,
 			void *private_data)
 {
 	transport->oplock.handler = handler;
-	transport->oplock.private = private_data;
+	transport->oplock.private_data = private_data;
 }
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index e6f27b1159..1fa27e37ea 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -317,7 +317,7 @@ static void idle_handler(struct tevent_context *ev,
 						      transport,
 						      next,
 						      idle_handler, transport);
-	transport->idle.func(transport, transport->idle.private);
+	transport->idle.func(transport, transport->idle.private_data);
 }
 
 /*
@@ -330,7 +330,7 @@ _PUBLIC_ void smbcli_transport_idle_handler(struct smbcli_transport *transport,
 				   void *private_data)
 {
 	transport->idle.func = idle_func;
-	transport->idle.private = private_data;
+	transport->idle.private_data = private_data;
 	transport->idle.period = period;
 
 	if (transport->socket->event.te != NULL) {
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 1b9cba8e38..a9fcdab9cc 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -128,7 +128,7 @@ struct smbcli_transport {
 	   for a packet */
 	struct {
 		void (*func)(struct smbcli_transport *, void *);
-		void *private;
+		void *private_data;
 		uint_t period;
 	} idle;
 
@@ -151,7 +151,7 @@ struct smbcli_transport {
 		bool (*handler)(struct smbcli_transport *transport, 
 				uint16_t tid, uint16_t fnum, uint8_t level, void *private_data);
 		/* private data passed to the oplock handler */
-		void *private;
+		void *private_data;
 	} oplock;
 
 	/* a list of async requests that are pending for receive on this connection */
@@ -286,7 +286,7 @@ struct smbcli_request {
 	*/
 	struct {
 		void (*fn)(struct smbcli_request *);
-		void *private;
+		void *private_data;
 	} async;
 };
 
diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index a257e3d0f1..029d56428d 100644
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@@ -388,7 +388,7 @@ bool smbcli_handle_oplock_break(struct smbcli_transport *transport, uint_t len,
 		uint16_t tid = SVAL(hdr, HDR_TID);
 		uint16_t fnum = SVAL(vwv,VWV(2));
 		uint8_t level = CVAL(vwv,VWV(3)+1);
-		transport->oplock.handler(transport, tid, fnum, level, transport->oplock.private);
+		transport->oplock.handler(transport, tid, fnum, level, transport->oplock.private_data);
 	}
 
 	return true;