r14860: create libcli/security/security.h

metze
(This used to be commit 9ec706238c173992dc938d537bdf1103bf519dbf)

54 files changed, 75 insertions, 57 deletions

diff --git a/source4/auth/auth_developer.c b/source4/auth/auth_developer.c
index 6cbba4ca7af..25c828c2a17 100644
--- a/source4/auth/auth_developer.c
+++ b/source4/auth/auth_developer.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /** 
  * Return an error based on username
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 9772a819a7a..9ccab13dcfb 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -25,7 +25,7 @@
 #include "auth/auth.h"
 #include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/ldap/ldap.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
diff --git a/source4/auth/auth_sam_reply.c b/source4/auth/auth_sam_reply.c
index 5ba2ab43064..0ea501d585f 100644
--- a/source4/auth/auth_sam_reply.c
+++ b/source4/auth/auth_sam_reply.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 NTSTATUS auth_convert_server_info_sambaseinfo(TALLOC_CTX *mem_ctx, 
 					      struct auth_serversupplied_info *server_info, 
diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 6dfc292d6dd..4c6bf04fcbb 100644
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 
 /* this default function can be used by mostly all backends
diff --git a/source4/client/client.c b/source4/client/client.c
index 6a2ba6e98ec..ceb949ffd96 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -36,7 +36,7 @@
 #include "auth/gensec/gensec.h"
 #include "system/time.h" /* needed by some systems for asctime() */
 #include "libcli/resolve/resolve.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "lib/replace/readline.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 2f27dc6aeed..2b9e7e31f7b 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -29,7 +29,7 @@
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "libcli/ldap/ldap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "auth/auth.h"
 #include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index f7efdb65e4a..88e1831d14e 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -36,7 +36,7 @@
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "auth/auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /* Kludge ACL rules:
  *
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 6ab33031df4..cfc7192543f 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -38,7 +38,7 @@
 #include "lib/ldb/include/ldb_errors.h"
 #include "lib/ldb/include/ldb_private.h"
 #include "dsdb/samdb/samdb.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
 
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 35de578f38a..bd133c87452 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -26,7 +26,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "libcli/ldap/ldap.h"
diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index d4c1471e1cc..6ca8aa7ae20 100644
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -24,7 +24,7 @@
 #include "libcli/ldap/ldap.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "db_wrap.h"
 
 /*
diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c
index e57cd970b11..e84dfea6004 100644
--- a/source4/lib/ldb/samba/ldif_handlers.c
+++ b/source4/lib/ldb/samba/ldif_handlers.c
@@ -28,7 +28,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /*
   convert a ldif formatted objectSid to a NDR formatted blob
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c
index 74190e24ea9..13b21ed21fe 100644
--- a/source4/lib/samba3/group.c
+++ b/source4/lib/samba3/group.c
@@ -24,7 +24,7 @@
 #include "lib/samba3/samba3.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/filesys.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 #define DATABASE_VERSION_V1 1 /* native byte format. */
 #define DATABASE_VERSION_V2 2 /* le format. */
diff --git a/source4/lib/samba3/idmap.c b/source4/lib/samba3/idmap.c
index 6958f8d004e..47cbdd89e1f 100644
--- a/source4/lib/samba3/idmap.c
+++ b/source4/lib/samba3/idmap.c
@@ -27,7 +27,7 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /* High water mark keys */
 #define HWM_GROUP  "GROUP HWM"
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 2773dba1d75..7a484607a7a 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -38,7 +38,7 @@
 #include "libcli/ldap/ldap.h"
 #include "libcli/cldap/cldap.h"
 #include "lib/socket/socket.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
diff --git a/source4/libcli/security/access_check.c b/source4/libcli/security/access_check.c
index 1617963998c..cd877db9c59 100644
--- a/source4/libcli/security/access_check.c
+++ b/source4/libcli/security/access_check.c
@@ -21,8 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 
 /*
diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index 38192fc60ce..46183ce2371 100644
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/iconv.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 struct flag_map {
 	const char *name;
diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
new file mode 100644
index 00000000000..eca68780314
--- /dev/null
+++ b/source4/libcli/security/security.h
@@ -0,0 +1,22 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Stefan Metzmacher 2006
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "librpc/gen_ndr/security.h"
+#include "libcli/security/proto.h"
diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index 1da3e2e7508..f7972f57ac9 100644
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -21,8 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /*
   return a blank security descriptor (no owners, dacl or sacl)
diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 5fcde246ef8..6e380a62add 100644
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /*
diff --git a/source4/libcli/smb_composite/appendacl.c b/source4/libcli/smb_composite/appendacl.c
index 55aa7277291..f82714de5b4 100644
--- a/source4/libcli/smb_composite/appendacl.c
+++ b/source4/libcli/smb_composite/appendacl.c
@@ -1,7 +1,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /* the stages of this call */
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index fab392ac047..f5e49dd5775 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -29,7 +29,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index b105ce78ef2..e50755229dc 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -28,7 +28,7 @@
 #include "passdb/secrets.h"
 #include "dsdb/samdb/samdb.h"
 #include "db_wrap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "auth/credentials/credentials.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 5985a4864f9..7ef2a753fa7 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -30,7 +30,7 @@
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "db_wrap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/rpc/dcerpc.h"
 
diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 444a1884570..25a2ac42b09 100644
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c
index c22d29a7232..cac238c70d5 100644
--- a/source4/ntvfs/common/sidmap.c
+++ b/source4/ntvfs/common/sidmap.c
@@ -27,7 +27,7 @@
 #include "auth/auth.h"
 #include "libcli/ldap/ldap.h"
 #include "db_wrap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /*
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index f7647ae3e4d..53ee63dc0ac 100644
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -24,7 +24,7 @@
 #include "auth/auth.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/xattr.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 
 /*
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 28cf2cc6cdc..d161dac5a4e 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -29,7 +29,7 @@
 #include "librpc/gen_ndr/security.h"
 #include "lib/tdb/include/tdb.h"
 #include "db_wrap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 
 /*
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index f161075fa62..d5012c06095 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -31,7 +31,7 @@
 #include "smbd/service_stream.h"
 #include "smbd/service.h"
 #include "system/filesys.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "build.h"
 
 /*
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index c3debc88bec..1c2d48330fa 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -27,7 +27,7 @@
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ntvfs/ntvfs.h"
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 580cf842f96..ab8144c7358 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -33,7 +33,7 @@
 #include "ads.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "rpc_server/samr/proto.h"
 #include "db_wrap.h"
 
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index 36d67790cd2..f3ec36c5504 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -27,7 +27,7 @@
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "scripting/ejs/ejsrpc.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /*
   set the switch var to be used by the next union switch
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 964dc822fbf..2abea01e7dd 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 e49112ef540..5d3a515b428 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 b491c0b8e8a..601cb3353ab 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 f461b0f30cb..8d6166015f0 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 2ce827df6a3..8d824d24f2a 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 ffc1863f22f..28b3b615bac 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 fa2bc724e57..28a4f59b3a3 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 35ec8c0f76a..c22eb833a02 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 3501ab300d3..8ff4d372739 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 b61282d37e0..dd1180c27de 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 b8145437309..a80b94ab3bb 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 55fa25fb387..c83fda79abb 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 e477c25e3ea..5a05e669a2c 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"
diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index eb8ccd22bca..7fe64ebcd13 100644
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -28,7 +28,7 @@
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/irpc.h"
 #include "libcli/auth/credentials.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
diff --git a/source4/winbind/wb_cmd_lookupsid.c b/source4/winbind/wb_cmd_lookupsid.c
index fbc01d60b81..f5549a9a7fa 100644
--- a/source4/winbind/wb_cmd_lookupsid.c
+++ b/source4/winbind/wb_cmd_lookupsid.c
@@ -25,7 +25,7 @@
 #include "winbind/wb_server.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 struct cmd_lookupsid_state {
 	struct composite_context *ctx;
diff --git a/source4/winbind/wb_cmd_userdomgroups.c b/source4/winbind/wb_cmd_userdomgroups.c
index 65c70934554..2f994e8ea14 100644
--- a/source4/winbind/wb_cmd_userdomgroups.c
+++ b/source4/winbind/wb_cmd_userdomgroups.c
@@ -22,8 +22,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "winbind/wb_server.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c
index 480698f08ac..1aebeae9136 100644
--- a/source4/winbind/wb_cmd_usersids.c
+++ b/source4/winbind/wb_cmd_usersids.c
@@ -25,7 +25,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /* Calculate the token in two steps: Go the user's originating domain, ask for
  * the user's domain groups. Then with the resulting list of sids go to our
diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c
index e496cc3c58f..5e5a33d2c1b 100644
--- a/source4/winbind/wb_connect_sam.c
+++ b/source4/winbind/wb_connect_sam.c
@@ -25,7 +25,7 @@
 #include "libcli/composite/composite.h"
 
 #include "libcli/raw/libcliraw.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
 
diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c
index 185457bcbf5..2ca29a9a8b2 100644
--- a/source4/winbind/wb_dom_info.c
+++ b/source4/winbind/wb_dom_info.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c
index 1b03116a6f7..8288c7921b6 100644
--- a/source4/winbind/wb_dom_info_trusted.c
+++ b/source4/winbind/wb_dom_info_trusted.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index b849dbadb23..853939c4f70 100644
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -33,7 +33,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 
 #include "libcli/auth/credentials.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 #include "libcli/ldap/ldap_client.h"
 
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index e4a74d16def..eeaf8439526 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -29,7 +29,7 @@
 #include "version.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "auth/pam_errors.h"
 
 /* 
diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c
index 793445e73b1..7ca4b67595f 100644
--- a/source4/winbind/wb_sid2domain.c
+++ b/source4/winbind/wb_sid2domain.c
@@ -25,7 +25,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "winbind/wb_async_helpers.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "include/dlinklist.h"
 
 static struct wbsrv_domain *find_domain_from_sid(struct wbsrv_service *service,