From f768b32e37788e6722217148b0a73e54c04bc03a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 12 Oct 2010 15:27:50 +1100 Subject: libcli/security Provide a common, top level libcli/security/security.h This will reduce the noise from merges of the rest of the libcli/security code, without this commit changing what code is actually used. This includes (along with other security headers) dom_sid.h and security_token.h Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Tue Oct 12 05:54:10 UTC 2010 on sn-devel-104 --- source3/winbindd/idmap_ad.c | 2 +- source3/winbindd/idmap_ldap.c | 2 +- source3/winbindd/idmap_tdb.c | 1 + source3/winbindd/idmap_util.c | 1 + source3/winbindd/wb_getgrsid.c | 2 +- source3/winbindd/wb_getpwsid.c | 1 + source3/winbindd/wb_gettoken.c | 1 + source3/winbindd/wb_gid2sid.c | 1 + source3/winbindd/wb_group_members.c | 1 + source3/winbindd/wb_lookupname.c | 1 + source3/winbindd/wb_lookupsid.c | 1 + source3/winbindd/wb_lookupusergroups.c | 1 + source3/winbindd/wb_queryuser.c | 1 + source3/winbindd/wb_sid2gid.c | 1 + source3/winbindd/wb_sid2uid.c | 1 + source3/winbindd/wb_uid2sid.c | 1 + source3/winbindd/winbindd_ads.c | 1 + source3/winbindd/winbindd_async.c | 1 + source3/winbindd/winbindd_cache.c | 2 +- source3/winbindd/winbindd_cm.c | 1 + source3/winbindd/winbindd_creds.c | 1 + source3/winbindd/winbindd_dual.c | 1 + source3/winbindd/winbindd_dual_srv.c | 1 + source3/winbindd/winbindd_getpwsid.c | 1 + source3/winbindd/winbindd_getsidaliases.c | 1 + source3/winbindd/winbindd_getuserdomgroups.c | 1 + source3/winbindd/winbindd_getusersids.c | 1 + source3/winbindd/winbindd_lookuprids.c | 1 + source3/winbindd/winbindd_lookupsid.c | 1 + source3/winbindd/winbindd_msrpc.c | 1 + source3/winbindd/winbindd_pam.c | 2 +- source3/winbindd/winbindd_rpc.c | 2 +- source3/winbindd/winbindd_samr.c | 1 + source3/winbindd/winbindd_sid_to_gid.c | 1 + source3/winbindd/winbindd_sid_to_uid.c | 1 + source3/winbindd/winbindd_util.c | 2 +- 36 files changed, 36 insertions(+), 7 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c index 9f2f260951..1567598060 100644 --- a/source3/winbindd/idmap_ad.c +++ b/source3/winbindd/idmap_ad.c @@ -33,8 +33,8 @@ #include "nss_info.h" #include "secrets.h" #include "idmap.h" -#include "../libcli/security/dom_sid.h" #include "../libcli/ldap/ldap_ndr.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index dcdc14f277..7b1f247c47 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -28,7 +28,7 @@ #include "secrets.h" #include "idmap.h" #include "idmap_rw.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c index 9a274fc9ff..778cfda0b9 100644 --- a/source3/winbindd/idmap_tdb.c +++ b/source3/winbindd/idmap_tdb.c @@ -28,6 +28,7 @@ #include "idmap.h" #include "idmap_rw.h" #include "dbwrap.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c index d743f8ce23..7525fa7620 100644 --- a/source3/winbindd/idmap_util.c +++ b/source3/winbindd/idmap_util.c @@ -22,6 +22,7 @@ #include "winbindd_proto.h" #include "idmap.h" #include "idmap_cache.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c index 8accc639af..3e9f52047b 100644 --- a/source3/winbindd/wb_getgrsid.c +++ b/source3/winbindd/wb_getgrsid.c @@ -20,7 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" struct wb_getgrsid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c index 4ccc51ae18..cc75ff5bdc 100644 --- a/source3/winbindd/wb_getpwsid.c +++ b/source3/winbindd/wb_getpwsid.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_getpwsid_state { struct winbindd_domain *user_domain; diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c index ca407b2117..5755ffa077 100644 --- a/source3/winbindd/wb_gettoken.c +++ b/source3/winbindd/wb_gettoken.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_gettoken_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_gid2sid.c b/source3/winbindd/wb_gid2sid.c index d4416f1a76..6bde2b5abf 100644 --- a/source3/winbindd/wb_gid2sid.c +++ b/source3/winbindd/wb_gid2sid.c @@ -22,6 +22,7 @@ #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" #include "idmap.h" +#include "../libcli/security/security.h" struct wb_gid2sid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c index c01bc5d211..1fb7af3694 100644 --- a/source3/winbindd/wb_group_members.c +++ b/source3/winbindd/wb_group_members.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" #include "../librpc/gen_ndr/ndr_security.h" +#include "../libcli/security/security.h" /* * We have 3 sets of routines here: diff --git a/source3/winbindd/wb_lookupname.c b/source3/winbindd/wb_lookupname.c index 564616eaed..c28b51a774 100644 --- a/source3/winbindd/wb_lookupname.c +++ b/source3/winbindd/wb_lookupname.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_lookupname_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_lookupsid.c b/source3/winbindd/wb_lookupsid.c index 6fe8a65c37..a831e9ff2d 100644 --- a/source3/winbindd/wb_lookupsid.c +++ b/source3/winbindd/wb_lookupsid.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_lookupsid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c index 3970daa5ac..e1478aa6bd 100644 --- a/source3/winbindd/wb_lookupusergroups.c +++ b/source3/winbindd/wb_lookupusergroups.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_lookupusergroups_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c index b7d6af846c..f14fbcbed6 100644 --- a/source3/winbindd/wb_queryuser.c +++ b/source3/winbindd/wb_queryuser.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_queryuser_state { struct dom_sid sid; diff --git a/source3/winbindd/wb_sid2gid.c b/source3/winbindd/wb_sid2gid.c index 15cf394e2f..76fe326996 100644 --- a/source3/winbindd/wb_sid2gid.c +++ b/source3/winbindd/wb_sid2gid.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" +#include "../libcli/security/security.h" struct wb_sid2gid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_sid2uid.c b/source3/winbindd/wb_sid2uid.c index 51c70c5715..21bf61b3fc 100644 --- a/source3/winbindd/wb_sid2uid.c +++ b/source3/winbindd/wb_sid2uid.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" +#include "../libcli/security/security.h" struct wb_sid2uid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_uid2sid.c b/source3/winbindd/wb_uid2sid.c index 857066844c..46b896a140 100644 --- a/source3/winbindd/wb_uid2sid.c +++ b/source3/winbindd/wb_uid2sid.c @@ -22,6 +22,7 @@ #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" #include "idmap.h" +#include "../libcli/security/security.h" struct wb_uid2sid_state { struct tevent_context *ev; diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index fa498d63df..6acdc0ba9e 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -28,6 +28,7 @@ #include "ads.h" #include "secrets.h" #include "../libcli/ldap/ldap_ndr.h" +#include "../libcli/security/security.h" #ifdef HAVE_ADS diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c index 4d52731273..8e53892bd8 100644 --- a/source3/winbindd/winbindd_async.c +++ b/source3/winbindd/winbindd_async.c @@ -22,6 +22,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 81317464ef..9ee8f6ab2a 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -30,7 +30,7 @@ #include "../librpc/gen_ndr/ndr_wbint.h" #include "ads.h" #include "nss_info.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 3d84b62652..9de15b08cf 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -72,6 +72,7 @@ #include "libsmb/clidgram.h" #include "ads.h" #include "secrets.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c index b1910b62c9..6bbd0ffd9d 100644 --- a/source3/winbindd/winbindd_creds.c +++ b/source3/winbindd/winbindd_creds.c @@ -22,6 +22,7 @@ #include "includes.h" #include "winbindd.h" #include "../libcli/auth/libcli_auth.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 5dfd123b7c..5058788e78 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -33,6 +33,7 @@ #include "librpc/gen_ndr/messaging.h" #include "secrets.h" #include "../lib/util/select.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index 4c6fb97e70..b661fb37e4 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/srv_wbint.h" #include "../librpc/gen_ndr/cli_netlogon.h" #include "idmap.h" +#include "../libcli/security/security.h" void _wbint_Ping(struct pipes_struct *p, struct wbint_Ping *r) { diff --git a/source3/winbindd/winbindd_getpwsid.c b/source3/winbindd/winbindd_getpwsid.c index 055de17f91..efea3fd2b3 100644 --- a/source3/winbindd/winbindd_getpwsid.c +++ b/source3/winbindd/winbindd_getpwsid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getpwsid_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c index 5fcb8922ce..f01dac9c4c 100644 --- a/source3/winbindd/winbindd_getsidaliases.c +++ b/source3/winbindd/winbindd_getsidaliases.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getsidaliases_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_getuserdomgroups.c b/source3/winbindd/winbindd_getuserdomgroups.c index 0bba024862..9fdff4fc66 100644 --- a/source3/winbindd/winbindd_getuserdomgroups.c +++ b/source3/winbindd/winbindd_getuserdomgroups.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getuserdomgroups_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_getusersids.c b/source3/winbindd/winbindd_getusersids.c index 257b7e4847..157c2ab644 100644 --- a/source3/winbindd/winbindd_getusersids.c +++ b/source3/winbindd/winbindd_getusersids.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getusersids_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c index 0889cffc8d..20ba79ee16 100644 --- a/source3/winbindd/winbindd_lookuprids.c +++ b/source3/winbindd/winbindd_lookuprids.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct winbindd_lookuprids_state { struct tevent_context *ev; diff --git a/source3/winbindd/winbindd_lookupsid.c b/source3/winbindd/winbindd_lookupsid.c index 6f4ae4d0c7..596699f4f1 100644 --- a/source3/winbindd/winbindd_lookupsid.c +++ b/source3/winbindd/winbindd_lookupsid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_lookupsid_state { struct tevent_context *ev; diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c index 500c279ff3..8b2e55084d 100644 --- a/source3/winbindd/winbindd_msrpc.c +++ b/source3/winbindd/winbindd_msrpc.c @@ -30,6 +30,7 @@ #include "rpc_client/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "rpc_client/cli_lsarpc.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 968ffcd9ca..6850b75d44 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -31,7 +31,7 @@ #include "rpc_client/cli_netlogon.h" #include "smb_krb5.h" #include "../lib/crypto/arcfour.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #include "ads.h" #include "../librpc/gen_ndr/krb5pac.h" diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 0a643f5644..88b1996258 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -33,7 +33,7 @@ #include "librpc/gen_ndr/srv_lsa.h" #include "rpc_client/cli_samr.h" #include "rpc_client/cli_lsarpc.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" /* Query display info for a domain */ NTSTATUS rpc_query_user_list(TALLOC_CTX *mem_ctx, diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c index 455d4941d7..c7528d1c66 100644 --- a/source3/winbindd/winbindd_samr.c +++ b/source3/winbindd/winbindd_samr.c @@ -34,6 +34,7 @@ #include "rpc_client/cli_lsarpc.h" #include "../librpc/gen_ndr/srv_lsa.h" #include "rpc_server/rpc_ncacn_np.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_sid_to_gid.c b/source3/winbindd/winbindd_sid_to_gid.c index 1e712cfbee..b0b0e6e211 100644 --- a/source3/winbindd/winbindd_sid_to_gid.c +++ b/source3/winbindd/winbindd_sid_to_gid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_sid_to_gid_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_sid_to_uid.c b/source3/winbindd/winbindd_sid_to_uid.c index 43cb43255b..bf2824f9d8 100644 --- a/source3/winbindd/winbindd_sid_to_uid.c +++ b/source3/winbindd/winbindd_sid_to_uid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_sid_to_uid_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 14be0e26fa..aec4cc60a2 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -23,7 +23,7 @@ #include "includes.h" #include "winbindd.h" #include "secrets.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -- cgit