From e3821f2c40691cc747d887bac14d4e3d37f0763b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 10 Feb 2011 20:21:11 +1100 Subject: s4-auth Move libcli/security/session.c to the top level This code is now useful in common, as the elements of the auth_session_info structure have now been defined in common IDL. Andrew Bartlett --- source4/dsdb/repl/drepl_out_helpers.c | 1 + source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 1 - source4/dsdb/samdb/ldb_modules/rootdse.c | 1 - source4/dsdb/samdb/ldb_modules/util.c | 1 - source4/dsdb/samdb/ldb_modules/wscript_build | 6 +++--- 5 files changed, 4 insertions(+), 6 deletions(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index 893eb3bbcd..ebf2f77708 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -34,6 +34,7 @@ #include "auth/gensec/gensec.h" #include "param/param.h" #include "../lib/util/tevent_ntstatus.h" +#include "libcli/security/security.h" struct dreplsrv_out_drsuapi_state { struct tevent_context *ev; diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 53d53d9021..6fd6d7fa14 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -48,7 +48,6 @@ #include "lib/util/dlinklist.h" #include "dsdb/samdb/ldb_modules/util.h" #include "lib/util/binsearch.h" -#include "libcli/security/session.h" #include "lib/util/tsort.h" struct replmd_private { diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index 98889125f3..be60d89638 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -28,7 +28,6 @@ #include "version.h" #include "dsdb/samdb/ldb_modules/util.h" #include "libcli/security/security.h" -#include "libcli/security/session.h" #include "librpc/ndr/libndr.h" #include "auth/auth.h" #include "param/param.h" diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 37ab4707f3..49939e2ff4 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -27,7 +27,6 @@ #include "dsdb/samdb/samdb.h" #include "util.h" #include "libcli/security/security.h" -#include "libcli/security/session.h" /* search for attrs on one DN, in the modules below diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 5925165afd..4ff5bdfda9 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('dsdb-module', bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', source='util.c acl_util.c schema_util.c', autoproto='util_proto.h', - deps='ldb ndr samdb-common security-session' + deps='ldb ndr samdb-common security' ) bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC', @@ -60,7 +60,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data', init_function='ldb_repl_meta_data_module_init', module_init_name='ldb_init_module', internal_module=False, - deps='samdb talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session' + deps='samdb talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security' ) @@ -150,7 +150,7 @@ bld.SAMBA_MODULE('ldb_rootdse', init_function='ldb_rootdse_module_init', module_init_name='ldb_init_module', internal_module=False, - deps='talloc events samdb MESSAGING security-session DSDB_MODULE_HELPERS' + deps='talloc events samdb MESSAGING security DSDB_MODULE_HELPERS' ) -- cgit