r14860: create libcli/security/security.h

metze

diff --git a/source/auth/auth_developer.c b/source/auth/auth_developer.c
index 6cbba4ca7af415dc82b13a2adaa0fa94467cd61d..25c828c2a17d2a48024342958803c6152fb078a5 100644 (file)
--- a/source/auth/auth_developer.c
+++ b/source/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/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 9772a819a7a4484833482d48bbe4517cce7e4a1c..9ccab13dcfbd4ee23b3627635ae109f88e6a6ad0 100644 (file)
--- a/source/auth/auth_sam.c
+++ b/source/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/source/auth/auth_sam_reply.c b/source/auth/auth_sam_reply.c
index 5ba2ab43064daf8c9ce7ece8d3df72f7ce6d8114..0ea501d585fbf9269e98977fffe5094e2eccc7aa 100644 (file)
--- a/source/auth/auth_sam_reply.c
+++ b/source/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/source/auth/auth_util.c b/source/auth/auth_util.c
index 6dfc292d6dd8c96bd859581f0159341ec559b5b1..4c6bf04fcbb9d9436084ee63cc4055d9f1904c3d 100644 (file)
--- a/source/auth/auth_util.c
+++ b/source/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/source/client/client.c b/source/client/client.c
index 6a2ba6e98ecbf43cc03675a8aaad9b163b3423a7..ceb949ffd9689ef44040730cdbe5ec1a93c7a798 100644 (file)
--- a/source/client/client.c
+++ b/source/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/source/dsdb/samdb/cracknames.c b/source/dsdb/samdb/cracknames.c
index 2f27dc6aeed7b763f0a96fa459da6a269faca7c0..2b9e7e31f7b72900e6841835dad3aba966c0ebb0 100644 (file)
--- a/source/dsdb/samdb/cracknames.c
+++ b/source/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/source/dsdb/samdb/ldb_modules/kludge_acl.c b/source/dsdb/samdb/ldb_modules/kludge_acl.c
index f7efdb65e4aebed64b80ca454cb4933a8bad1c4a..88e1831d14e6eab2d2bdcdad9b86ef684fbe6923 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source/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/source/dsdb/samdb/ldb_modules/samldb.c b/source/dsdb/samdb/ldb_modules/samldb.c
index 6ab33031df49e5e801d4a4996e3af9080a45ca81..cfc7192543fe4a4834e3601bd31c310d0b0417f5 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/samldb.c
+++ b/source/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/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index 35de578f38a5c0a2a8bc43769882d9294af286bd..bd133c87452f53d29d1e194fa8f674a0c0c8a933 100644 (file)
--- a/source/dsdb/samdb/samdb.c
+++ b/source/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/source/dsdb/samdb/samdb_privilege.c b/source/dsdb/samdb/samdb_privilege.c
index d4c1471e1cc9515b65edf9a3adad9f5b782204b3..6ca8aa7ae20106252b5e8c4657d823efcd6d8e4d 100644 (file)
--- a/source/dsdb/samdb/samdb_privilege.c
+++ b/source/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/source/lib/ldb/samba/ldif_handlers.c b/source/lib/ldb/samba/ldif_handlers.c
index e57cd970b110671fa72193ef56dc81d1ec925337..e84dfea60047ea2adf3666da3735793fba13b04d 100644 (file)
--- a/source/lib/ldb/samba/ldif_handlers.c
+++ b/source/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/source/lib/samba3/group.c b/source/lib/samba3/group.c
index 74190e24ea919002f385b3e97bb695fa60187ec1..13b21ed21feb33ebbe04a843690ce366b754fff9 100644 (file)
--- a/source/lib/samba3/group.c
+++ b/source/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/source/lib/samba3/idmap.c b/source/lib/samba3/idmap.c
index 6958f8d004e47f49be28355c2e0dbb3e2cbbd1c8..47cbdd89e1fc782914d0a2b9af79247b11e420e2 100644 (file)
--- a/source/lib/samba3/idmap.c
+++ b/source/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/source/libcli/cldap/cldap.c b/source/libcli/cldap/cldap.c
index 2773dba1d758963d60b397197f83dd721b824ad7..7a484607a7ac0eebf2e36306256a7c39441f4fe1 100644 (file)
--- a/source/libcli/cldap/cldap.c
+++ b/source/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/source/libcli/security/access_check.c b/source/libcli/security/access_check.c
index 1617963998c2b512c6c8d2642a52aa2591668460..cd877db9c5971d8f7ad025f0e08784014ae54c56 100644 (file)
--- a/source/libcli/security/access_check.c
+++ b/source/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/source/libcli/security/sddl.c b/source/libcli/security/sddl.c
index 38192fc60cee93e5f6de10cb76c2a5ff80935519..46183ce2371622c8506c1c7c8250623d2741b1bb 100644 (file)
--- a/source/libcli/security/sddl.c
+++ b/source/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/source/libcli/security/security.h b/source/libcli/security/security.h
new file mode 100644 (file)
index 0000000..eca6878
--- /dev/null
+++ b/source/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/source/libcli/security/security_descriptor.c b/source/libcli/security/security_descriptor.c
index 1da3e2e7508e5187cc00b537c4b7ff1c2058e0c7..f7972f57ac9b26aa054e39b63a574e89090fcf1f 100644 (file)
--- a/source/libcli/security/security_descriptor.c
+++ b/source/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/source/libcli/security/security_token.c b/source/libcli/security/security_token.c
index 5fcde246ef8ded5586b00ee98bc83badecbf3fab..6e380a62add258ce488930b84ef8e8944363be49 100644 (file)
--- a/source/libcli/security/security_token.c
+++ b/source/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/source/libcli/smb_composite/appendacl.c b/source/libcli/smb_composite/appendacl.c
index 55aa72772917d8bffb35f7c1211d1c8c1cff1aac..f82714de5b4519ff28aa75330d14a91a0506df77 100644 (file)
--- a/source/libcli/smb_composite/appendacl.c
+++ b/source/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/source/libcli/util/clilsa.c b/source/libcli/util/clilsa.c
index fab392ac0479f879d9316098dc18dc115bca485a..f5e49dd577558e292093d8a3f48fea1e0e8f67ed 100644 (file)
--- a/source/libcli/util/clilsa.c
+++ b/source/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/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index b105ce78ef20f0d965a79e69fd3046b8c15d611b..e50755229dcb6cc1e30ce2a856441e80cc0c248a 100644 (file)
--- a/source/libnet/libnet_join.c
+++ b/source/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/source/libnet/libnet_samsync_ldb.c b/source/libnet/libnet_samsync_ldb.c
index 5985a4864f982b831f172d4ad3590ec78f42c5c9..7ef2a753fa7d6a04790cfa7e1192d269d583770b 100644 (file)
--- a/source/libnet/libnet_samsync_ldb.c
+++ b/source/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/source/libnet/userinfo.c b/source/libnet/userinfo.c
index 444a18845705d9a0620b27fae33ef387f3e01b07..25a2ac42b09e8e80b5cb6b9b8a96b07930d68317 100644 (file)
--- a/source/libnet/userinfo.c
+++ b/source/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/source/ntvfs/common/sidmap.c b/source/ntvfs/common/sidmap.c
index c22d29a72324055501676aca560c822ec98f2337..cac238c70d5f170bc3e5458da0f2c800f1843e74 100644 (file)
--- a/source/ntvfs/common/sidmap.c
+++ b/source/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/source/ntvfs/posix/pvfs_acl.c b/source/ntvfs/posix/pvfs_acl.c
index f7647ae3e4dba9f845fd15ee0dc14bc1f40564e3..53ee63dc0acb3d840aab63086b7c223edd912c03 100644 (file)
--- a/source/ntvfs/posix/pvfs_acl.c
+++ b/source/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/source/ntvfs/posix/vfs_posix.c b/source/ntvfs/posix/vfs_posix.c
index 28cf2cc6cdc5b633b441ee50fce776ecd3ebbb92..d161dac5a4eaf65e1c1df8ae6ca4b75b755d0d3f 100644 (file)
--- a/source/ntvfs/posix/vfs_posix.c
+++ b/source/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/source/rpc_server/dcerpc_server.c b/source/rpc_server/dcerpc_server.c
index f161075fa62655c373f2322b80e945b9c8432d03..d5012c06095e82ee6c59b8e6774b4be41bd8f472 100644 (file)
--- a/source/rpc_server/dcerpc_server.c
+++ b/source/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/source/rpc_server/lsa/dcesrv_lsa.c b/source/rpc_server/lsa/dcesrv_lsa.c
index c3debc88becb1c393ffc744892303a1c0d1e55f4..1c2d48330fae86495e9f7cb5645707fbafb272c9 100644 (file)
--- a/source/rpc_server/lsa/dcesrv_lsa.c
+++ b/source/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/source/rpc_server/samr/dcesrv_samr.c b/source/rpc_server/samr/dcesrv_samr.c
index 580cf842f962179fb247e35f4432bff1b2962760..ab8144c7358ccf43a28962b17431557cebe2e610 100644 (file)
--- a/source/rpc_server/samr/dcesrv_samr.c
+++ b/source/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/source/scripting/ejs/ejsrpc.c b/source/scripting/ejs/ejsrpc.c
index 36d67790cd230c4ad6cedfb3803ebe21c0889992..f3ec36c5504217204d9aa1011a3d252c09971aac 100644 (file)
--- a/source/scripting/ejs/ejsrpc.c
+++ b/source/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/source/torture/auth/pac.c b/source/torture/auth/pac.c
index 964dc822fbf6fb004c640e6ec8e277630b847fe1..2abea01e7dd1a846b37a7825ea30c9b077b7a9cd 100644 (file)
--- a/source/torture/auth/pac.c
+++ b/source/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/source/torture/libnet/userinfo.c b/source/torture/libnet/userinfo.c
index e49112ef5403949105344ed5f6b6f31b819e4c96..5d3a515b4282a3b9da4ecdb12bedfdf7cbb65201 100644 (file)
--- a/source/torture/libnet/userinfo.c
+++ b/source/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/source/torture/local/sddl.c b/source/torture/local/sddl.c
index b491c0b8e8ade1a1e8a257cb00bd84bc16ead6be..601cb3353abe40ab26463ac5ad3488aa16ab0b4a 100644 (file)
--- a/source/torture/local/sddl.c
+++ b/source/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/source/torture/raw/acls.c b/source/torture/raw/acls.c
index f461b0f30cb98c17d35abf3d8d7c4939897c5f01..8d6166015f09c79254364664f5374329a7d3af21 100644 (file)
--- a/source/torture/raw/acls.c
+++ b/source/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/source/torture/raw/composite.c b/source/torture/raw/composite.c
index 2ce827df6a37012a692a5bd407b71e54a0468a2f..8d824d24f2a2f62d6deb6ff161649f74cc9ae8eb 100644 (file)
--- a/source/torture/raw/composite.c
+++ b/source/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/source/torture/rpc/lsa.c b/source/torture/rpc/lsa.c
index ffc1863f22f53a806e33c560644ff4fcff35103d..28b3b615bac84785adea0a14cbef819b5244b8b2 100644 (file)
--- a/source/torture/rpc/lsa.c
+++ b/source/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/source/torture/rpc/lsa_lookup.c b/source/torture/rpc/lsa_lookup.c
index fa2bc724e57fed7c7e881359224ae6ff0954209c..28a4f59b3a31959e0b292c318115c874c2a1b5ee 100644 (file)
--- a/source/torture/rpc/lsa_lookup.c
+++ b/source/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/source/torture/rpc/rpc.c b/source/torture/rpc/rpc.c
index 35ec8c0f76a8b40786049910a6d482e591a73b4f..c22eb833a02ff862228f091ca5c97da72e188017 100644 (file)
--- a/source/torture/rpc/rpc.c
+++ b/source/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/source/torture/rpc/samr.c b/source/torture/rpc/samr.c
index 3501ab300d31d58806c0e1bf5d7d3ae741adef87..8ff4d37273956c95b997e045397fc411bc4b011c 100644 (file)
--- a/source/torture/rpc/samr.c
+++ b/source/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/source/torture/rpc/samsync.c b/source/torture/rpc/samsync.c
index b61282d37e07263aee02c36438b0866db7d6cdf9..dd1180c27ded6eb57ab04d7612b92192cc817801 100644 (file)
--- a/source/torture/rpc/samsync.c
+++ b/source/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/source/torture/rpc/schannel.c b/source/torture/rpc/schannel.c
index b8145437309e70f5f29f6e836ce621a387112e0d..a80b94ab3bb9c2a888172aeaaf3c6c570b8e32d2 100644 (file)
--- a/source/torture/rpc/schannel.c
+++ b/source/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/source/torture/rpc/testjoin.c b/source/torture/rpc/testjoin.c
index 55fa25fb38763df2ffd29d78ea103a618429bc11..c83fda79abb11acc36ec2533da1d299658d72120 100644 (file)
--- a/source/torture/rpc/testjoin.c
+++ b/source/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/source/torture/rpc/winreg.c b/source/torture/rpc/winreg.c
index e477c25e3eabeb347a85e87c36849096030f7474..5a05e669a2c3e0c14cdc741e6cbe8a90d2a9e24e 100644 (file)
--- a/source/torture/rpc/winreg.c
+++ b/source/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/source/winbind/wb_async_helpers.c b/source/winbind/wb_async_helpers.c
index eb8ccd22bca2241999b0a3678b9185380e2d70d9..7fe64ebcd132689c31d78dc2a85fda8a36702a14 100644 (file)
--- a/source/winbind/wb_async_helpers.c
+++ b/source/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/source/winbind/wb_cmd_lookupsid.c b/source/winbind/wb_cmd_lookupsid.c
index fbc01d60b816269f6bfdd164f61da72dae2c072a..f5549a9a7fa70a7e5c77ec982a8a5a77b7233384 100644 (file)
--- a/source/winbind/wb_cmd_lookupsid.c
+++ b/source/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/source/winbind/wb_cmd_userdomgroups.c b/source/winbind/wb_cmd_userdomgroups.c
index 65c709345549dd90c890cdf8c526f66b8b53284b..2f994e8ea1449986793572a6112ddd9259645eda 100644 (file)
--- a/source/winbind/wb_cmd_userdomgroups.c
+++ b/source/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/source/winbind/wb_cmd_usersids.c b/source/winbind/wb_cmd_usersids.c
index 480698f08acdc5f3a559e4f86a44d411dbb24405..1aebeae91361d9aee555a1f92acb99df64b5e926 100644 (file)
--- a/source/winbind/wb_cmd_usersids.c
+++ b/source/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/source/winbind/wb_connect_sam.c b/source/winbind/wb_connect_sam.c
index e496cc3c58fc7a9c5d93ec17280bfafb39ee36a7..5e5a33d2c1be2b2b9ca1013cd0cf28d811fe4b06 100644 (file)
--- a/source/winbind/wb_connect_sam.c
+++ b/source/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/source/winbind/wb_dom_info.c b/source/winbind/wb_dom_info.c
index 185457bcbf58acafe9f49cc7e1730984f2204078..2ca29a9a8b2cf413e88c3b193ea29437f6025242 100644 (file)
--- a/source/winbind/wb_dom_info.c
+++ b/source/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/source/winbind/wb_dom_info_trusted.c b/source/winbind/wb_dom_info_trusted.c
index 1b03116a6f7abdf9c9184fa5b60c74956c2bf2ea..8288c7921b6d29317d85589df9c506f9ca28b6f6 100644 (file)
--- a/source/winbind/wb_dom_info_trusted.c
+++ b/source/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/source/winbind/wb_init_domain.c b/source/winbind/wb_init_domain.c
index b849dbadb234c36de50a7aaf9baa9e1f798e5ac3..853939c4f70be54d84f85fb4832b92d9c3265ae7 100644 (file)
--- a/source/winbind/wb_init_domain.c
+++ b/source/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/source/winbind/wb_samba3_cmd.c b/source/winbind/wb_samba3_cmd.c
index e4a74d16def55a22c1c60bc63793b62a9d068257..eeaf8439526358d800beb03f898907cf8c492ce0 100644 (file)
--- a/source/winbind/wb_samba3_cmd.c
+++ b/source/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/source/winbind/wb_sid2domain.c b/source/winbind/wb_sid2domain.c
index 793445e73b18c01f11551fa359870975c387c41b..7ca4b67595f75c1ff32140fbad8f2e7b6975800e 100644 (file)
--- a/source/winbind/wb_sid2domain.c
+++ b/source/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,