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/passdb/account_pol.c | 1 + source3/passdb/lookup_sid.c | 2 +- source3/passdb/machine_sid.c | 2 +- source3/passdb/passdb.c | 1 + source3/passdb/pdb_ads.c | 1 + source3/passdb/pdb_compat.c | 1 + source3/passdb/pdb_get_set.c | 2 +- source3/passdb/pdb_interface.c | 2 +- source3/passdb/pdb_ldap.c | 2 +- source3/passdb/pdb_smbpasswd.c | 2 +- source3/passdb/pdb_tdb.c | 1 + source3/passdb/secrets.c | 1 + source3/passdb/util_builtin.c | 2 +- source3/passdb/util_unixsids.c | 2 +- source3/passdb/util_wellknown.c | 2 +- 15 files changed, 15 insertions(+), 9 deletions(-) (limited to 'source3/passdb') diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c index a66c48d396..40d8ddd4c9 100644 --- a/source3/passdb/account_pol.c +++ b/source3/passdb/account_pol.c @@ -21,6 +21,7 @@ #include "includes.h" #include "dbwrap.h" +#include "../libcli/security/security.h" static struct db_context *db; /* cache all entries for 60 seconds for to save ldap-queries (cache is updated diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index fa855f3467..5c6118f8ce 100644 --- a/source3/passdb/lookup_sid.c +++ b/source3/passdb/lookup_sid.c @@ -24,7 +24,7 @@ #include "secrets.h" #include "memcache.h" #include "idmap_cache.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" /***************************************************************** Dissect a user-provided name into domain, name, sid and type. diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c index 6e5a970f4c..4de51b82c9 100644 --- a/source3/passdb/machine_sid.c +++ b/source3/passdb/machine_sid.c @@ -23,7 +23,7 @@ #include "includes.h" #include "secrets.h" #include "dbwrap.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" /* NOTE! the global_sam_sid is the SID of our local SAM. This is only equal to the domain SID when we are a DC, otherwise its our diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 1989f6d191..dafe55eef7 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -25,6 +25,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "secrets.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index e172f145de..01f730eb20 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -24,6 +24,7 @@ #include "secrets.h" #include "../librpc/gen_ndr/samr.h" #include "../libcli/ldap/ldap_ndr.h" +#include "../libcli/security/security.h" struct pdb_ads_state { struct sockaddr_un socket_address; diff --git a/source3/passdb/pdb_compat.c b/source3/passdb/pdb_compat.c index 13a7b5f69f..387ee2a322 100644 --- a/source3/passdb/pdb_compat.c +++ b/source3/passdb/pdb_compat.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index 493e9ed0dd..762c23fe52 100644 --- a/source3/passdb/pdb_get_set.c +++ b/source3/passdb/pdb_get_set.c @@ -23,7 +23,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index e57ee7bbfe..a0913a3ea9 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -25,7 +25,7 @@ #include "../librpc/gen_ndr/samr.h" #include "memcache.h" #include "nsswitch/winbind_client.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index d046a527a6..942fd7fc56 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -47,7 +47,7 @@ #include "../libcli/auth/libcli_auth.h" #include "secrets.h" #include "idmap_cache.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 9369726988..f188399f78 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -22,7 +22,7 @@ #include "includes.h" #include "../librpc/gen_ndr/samr.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index e1c2c437ff..da61e48a99 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -24,6 +24,7 @@ #include "includes.h" #include "dbwrap.h" +#include "../libcli/security/security.h" #if 0 /* when made a module use this */ diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 1bb0e25cf7..28a725a741 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -27,6 +27,7 @@ #include "librpc/gen_ndr/ndr_secrets.h" #include "secrets.h" #include "dbwrap.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c index cf483bbb96..a2cbbc76f6 100644 --- a/source3/passdb/util_builtin.c +++ b/source3/passdb/util_builtin.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" struct rid_name_map { uint32 rid; diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c index 24d2c45449..ce64dc2d88 100644 --- a/source3/passdb/util_unixsids.c +++ b/source3/passdb/util_unixsids.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" bool sid_check_is_unix_users(const struct dom_sid *sid) { diff --git a/source3/passdb/util_wellknown.c b/source3/passdb/util_wellknown.c index 4f6f3f308d..5ca26db711 100644 --- a/source3/passdb/util_wellknown.c +++ b/source3/passdb/util_wellknown.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" struct rid_name_map { uint32 rid; -- cgit