13 files changed, 13 insertions, 14 deletions
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 964dc822fb..2abea01e7d 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -27,7 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "samba3/samba3.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "torture/torture.h"
 
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index e49112ef54..5d3a515b42 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -23,7 +23,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
 #include "libnet/userinfo.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index b491c0b8e8..601cb3353a 100644
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "torture/torture.h"
 
 
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index f461b0f30c..8d6166015f 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -26,7 +26,7 @@
 #include "libcli/libcli.h"
 #include "librpc/gen_ndr/lsa.h"
 #include "libcli/util/clilsa.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "torture/util.h"
 
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 2ce827df6a..8d824d24f2 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -25,12 +25,11 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/cmdline/popt_common.h"
-#include "librpc/gen_ndr/security.h"
 #include "torture/util.h"
 
 #define BASEDIR "\\composite"
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index ffc1863f22..28b3b615ba 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -24,7 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "lib/events/events.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
 
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index fa2bc724e5..28a4f59b3a 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -26,7 +26,7 @@
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
 			struct policy_handle **handle)
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 35ec8c0f76..c22eb833a0 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -48,7 +48,7 @@ _PUBLIC_ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx,
 		printf("Failed to connect to remote server: %s %s\n", binding, nt_errstr(status));
 	}
 
-    return status;
+	return status;
 }
 
 /* open a rpc connection to a specific transport */
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 3501ab300d..8ff4d37273 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -28,7 +28,7 @@
 #include "smb.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "torture/rpc/rpc.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index b61282d37e..dd1180c27d 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -31,7 +31,7 @@
 #include "torture/rpc/rpc.h"
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/libcli_auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index b814543730..a80b94ab3b 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -29,7 +29,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/libcli_auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 #define TEST_MACHINE_NAME "schannel"
 
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 55fa25fb38..c83fda79ab 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -37,7 +37,7 @@
 
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 struct test_join {
 	struct dcerpc_pipe *p;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index e477c25e3e..5a05e669a2 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -24,7 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "torture/rpc/rpc.h"
 
 #define TEST_KEY_BASE "smbtorture test"