Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
	librpc/ndr.pc.in

7 files changed, 15 insertions, 15 deletions

diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c
index f7be59136c..d0efbb159b 100644
--- a/source4/winbind/idmap.c
+++ b/source4/winbind/idmap.c
@@ -29,7 +29,7 @@
 #include "lib/ldb_wrap.h"
 #include "param/param.h"
 #include "winbind/idmap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/ldap/ldap_ndr.h"
 
 /**
diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c
index 7d821537f0..be43684f82 100644
--- a/source4/winbind/wb_cmd_getpwnam.c
+++ b/source4/winbind/wb_cmd_getpwnam.c
@@ -27,7 +27,7 @@
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
 #include "libnet/libnet_proto.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 struct cmd_getpwnam_state {
 	struct composite_context *ctx;
diff --git a/source4/winbind/wb_irpc.c b/source4/winbind/wb_irpc.c
index 0535045adb..42f4e7c94b 100644
--- a/source4/winbind/wb_irpc.c
+++ b/source4/winbind/wb_irpc.c
@@ -36,7 +36,7 @@ static void wb_irpc_SamLogon_callback(struct composite_context *ctx);
 static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg, 
 				 struct winbind_SamLogon *req)
 {
-	struct wbsrv_service *service = talloc_get_type(msg->private,
+	struct wbsrv_service *service = talloc_get_type(msg->private_data,
 					struct wbsrv_service);
 	struct wb_irpc_SamLogon_state *s;
 	struct composite_context *ctx;
@@ -83,7 +83,7 @@ static void wb_irpc_get_idmap_callback(struct composite_context *ctx);
 static NTSTATUS wb_irpc_get_idmap(struct irpc_message *msg,
 				  struct winbind_get_idmap *req)
 {
-	struct wbsrv_service *service = talloc_get_type(msg->private,
+	struct wbsrv_service *service = talloc_get_type(msg->private_data,
 					struct wbsrv_service);
 	struct wb_irpc_get_idmap_state *s;
 	struct composite_context *ctx;
diff --git a/source4/winbind/wb_samba3_protocol.c b/source4/winbind/wb_samba3_protocol.c
index d40e0e6bc6..77c5bf3a1e 100644
--- a/source4/winbind/wb_samba3_protocol.c
+++ b/source4/winbind/wb_samba3_protocol.c
@@ -28,7 +28,7 @@
   work out if a packet is complete for protocols that use a 32 bit host byte
   order length
 */
-NTSTATUS wbsrv_samba3_packet_full_request(void *private, DATA_BLOB blob, size_t *size)
+NTSTATUS wbsrv_samba3_packet_full_request(void *private_data, DATA_BLOB blob, size_t *size)
 {
 	uint32_t *len;
 	if (blob.length < 4) {
@@ -270,10 +270,10 @@ NTSTATUS wbsrv_samba3_send_reply(struct wbsrv_samba3_call *call)
 	return status;
 }
 
-NTSTATUS wbsrv_samba3_process(void *private, DATA_BLOB blob)
+NTSTATUS wbsrv_samba3_process(void *private_data, DATA_BLOB blob)
 {
 	NTSTATUS status;
-	struct wbsrv_connection *wbconn = talloc_get_type(private, 
+	struct wbsrv_connection *wbconn = talloc_get_type(private_data,
 							  struct wbsrv_connection);
 	struct wbsrv_samba3_call *call;
 	status = wbsrv_samba3_pull_request(blob, wbconn, &call);
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 9ffcd467ee..95be49d1e3 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -41,15 +41,15 @@ void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *rea
 /*
   called on a tcp recv error
 */
-static void wbsrv_recv_error(void *private, NTSTATUS status)
+static void wbsrv_recv_error(void *private_data, NTSTATUS status)
 {
-	struct wbsrv_connection *wbconn = talloc_get_type(private, struct wbsrv_connection);
+	struct wbsrv_connection *wbconn = talloc_get_type(private_data, struct wbsrv_connection);
 	wbsrv_terminate_connection(wbconn, nt_errstr(status));
 }
 
 static void wbsrv_accept(struct stream_connection *conn)
 {
-	struct wbsrv_listen_socket *listen_socket = talloc_get_type(conn->private, 
+	struct wbsrv_listen_socket *listen_socket = talloc_get_type(conn->private_data,
 								    struct wbsrv_listen_socket);
 	struct wbsrv_connection *wbconn;
 
@@ -61,7 +61,7 @@ static void wbsrv_accept(struct stream_connection *conn)
 	wbconn->conn	      = conn;
 	wbconn->listen_socket = listen_socket;
 	wbconn->lp_ctx        = listen_socket->service->task->lp_ctx;
-	conn->private         = wbconn;
+	conn->private_data    = wbconn;
 
 	wbconn->packet = packet_init(wbconn);
 	if (wbconn->packet == NULL) {
@@ -83,7 +83,7 @@ static void wbsrv_accept(struct stream_connection *conn)
 */
 static void wbsrv_recv(struct stream_connection *conn, uint16_t flags)
 {
-	struct wbsrv_connection *wbconn = talloc_get_type(conn->private, 
+	struct wbsrv_connection *wbconn = talloc_get_type(conn->private_data,
 							  struct wbsrv_connection);
 	packet_recv(wbconn->packet);
 
@@ -94,7 +94,7 @@ static void wbsrv_recv(struct stream_connection *conn, uint16_t flags)
 */
 static void wbsrv_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct wbsrv_connection *wbconn = talloc_get_type(conn->private, 
+	struct wbsrv_connection *wbconn = talloc_get_type(conn->private_data,
 							  struct wbsrv_connection);
 	packet_queue_run(wbconn->packet);
 }
diff --git a/source4/winbind/wb_sid2gid.c b/source4/winbind/wb_sid2gid.c
index d68956ce85..282d10c9c9 100644
--- a/source4/winbind/wb_sid2gid.c
+++ b/source4/winbind/wb_sid2gid.c
@@ -24,7 +24,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "winbind/wb_helper.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "winbind/idmap.h"
 
 struct sid2gid_state {
diff --git a/source4/winbind/wb_sid2uid.c b/source4/winbind/wb_sid2uid.c
index b65e41978c..151f39906b 100644
--- a/source4/winbind/wb_sid2uid.c
+++ b/source4/winbind/wb_sid2uid.c
@@ -24,7 +24,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "winbind/wb_helper.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "winbind/idmap.h"
 
 struct sid2uid_state {