r14860: create libcli/security/security.h

metze
(This used to be commit 9ec706238c)

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

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"
 

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, 

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

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"

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"

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:
  *

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"
 

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"

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"
 
 /*

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

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. */

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"

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"
 
 /*

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"
 
 
 /*

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;

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"

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)

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"
 
 /*

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 */

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"

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"

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"
 

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"

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"
 
 /*

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"
 
 
 /*

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"
 
 
 /*

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"
 
 /*

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"

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"
 

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

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"
 

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"
 

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"
 
 

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"
 

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"

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"
 

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)

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 */

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"

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"

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"
 

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;

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"

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"

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;

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"

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

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"
 
 

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"

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"

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"
 

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"
 
 /* 

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,