diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-09-20 17:42:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-10-12 03:35:36 +0000 |
| commit | 5742f5115cc5102a668f8debc86deec23a4081f1 (patch) | |
| tree | bd8126298ae55b5ce1fe40025c0a048e551013bf /source4/dsdb | |
| parent | 911169451b0f801c3fbe4c698d74e9801d973ee0 (diff) | |
| download | samba-5742f5115cc5102a668f8debc86deec23a4081f1.tar.gz samba-5742f5115cc5102a668f8debc86deec23a4081f1.tar.bz2 samba-5742f5115cc5102a668f8debc86deec23a4081f1.zip | |
libcli/security Use common security.h
This includes dom_sid.h and security_token.h and will be moved
to the top level shortly.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Oct 12 03:35:36 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/common/util_samr.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_out_pull.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_partitions.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/operational.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 3 |
6 files changed, 6 insertions, 7 deletions
diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c index 85bfbfd75e..c50b33c58a 100644 --- a/source4/dsdb/common/util_samr.c +++ b/source4/dsdb/common/util_samr.c @@ -26,7 +26,7 @@ #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" #include "../libds/common/flags.h" -#include "libcli/security/dom_sid.h" +#include "libcli/security/security.h" /* Add a user, SAMR style, including the correct transaction * semantics. Used by the SAMR server and by pdb_samba4 */ diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c index c13dadc986..3e59ee95ac 100644 --- a/source4/dsdb/repl/drepl_out_pull.c +++ b/source4/dsdb/repl/drepl_out_pull.c @@ -32,7 +32,7 @@ #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" #include "libcli/composite/composite.h" -#include "libcli/security/dom_sid.h" +#include "libcli/security/security.h" WERROR dreplsrv_schedule_partition_pull_source(struct dreplsrv_service *s, struct dreplsrv_partition_source_dsa *source, diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index fd0ffd954a..e272747d80 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -31,7 +31,7 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" -#include "libcli/security/dom_sid.h" +#include "libcli/security/security.h" #include "param/param.h" WERROR dreplsrv_load_partitions(struct dreplsrv_service *s) diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c index 2daae253ef..3126dd2d79 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c @@ -35,7 +35,7 @@ #include "ldb/include/ldb.h" #include "ldb/include/ldb_errors.h" #include "ldb/include/ldb_module.h" -#include "libcli/security/dom_sid.h" +#include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_security.h" #include "librpc/ndr/libndr.h" diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c index 687597da32..633fd8d28d 100644 --- a/source4/dsdb/samdb/ldb_modules/operational.c +++ b/source4/dsdb/samdb/ldb_modules/operational.c @@ -74,7 +74,7 @@ #include "dsdb/samdb/ldb_modules/util.h" #include "auth/auth.h" -#include "libcli/security/dom_sid.h" +#include "libcli/security/security.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0])) diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 3361a1c030..0ee7996a99 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -44,11 +44,10 @@ #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" #include "param/param.h" -#include "libcli/security/dom_sid.h" +#include "libcli/security/security.h" #include "lib/util/dlinklist.h" #include "dsdb/samdb/ldb_modules/util.h" #include "lib/util/binsearch.h" -#include "libcli/security/security.h" #include "libcli/security/session.h" #include "lib/util/tsort.h" |