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

diff --git a/libcli/security/security.h b/libcli/security/security.h
index 39ae3ec6cc5c610168c68f6062c96f4ea22663c2..bb7bc7208ab9d9870fa86577b563661f814c22f8 100644 (file)
--- a/libcli/security/security.h
+++ b/libcli/security/security.h
@@ -105,5 +105,6 @@ struct object_tree {
 #include "libcli/security/sddl.h"
 #include "libcli/security/privileges.h"
 #include "libcli/security/access_check.h"
+#include "libcli/security/session.h"
 
 #endif

diff --git a/source4/libcli/security/session.c b/libcli/security/session.c
similarity index 96%
rename from source4/libcli/security/session.c
rename to libcli/security/session.c
index 401e11c489f535c886073c918d9a9affb3342e61..0c32556fa446e47f82c292455bfd0aca090da921 100644 (file)
--- a/source4/libcli/security/session.c
+++ b/libcli/security/session.c
@@ -20,9 +20,8 @@
 */
 
 #include "includes.h"
-#include "auth/session.h"
-#include "libcli/security/session.h"
 #include "libcli/security/security.h"
+#include "librpc/gen_ndr/auth.h"
 
 enum security_user_level security_session_user_level(struct auth_session_info *session_info,
                                                     const struct dom_sid *domain_sid)

diff --git a/source4/libcli/security/session.h b/libcli/security/session.h
similarity index 65%
rename from source4/libcli/security/session.h
rename to libcli/security/session.h
index cf6966549735d59450b1254509ba5e79b2b4750f..36da09b8dfcc027a81f4f2be0f04bfccf4ca255a 100644 (file)
--- a/source4/libcli/security/session.h
+++ b/libcli/security/session.h
@@ -19,6 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _LIBCLI_SECURITY_SESSION_H_
+#define _LIBCLI_SECURITY_SESSION_H_
+
 enum security_user_level {
        SECURITY_ANONYMOUS            = 0,
        SECURITY_USER                 = 10,
@@ -28,6 +31,20 @@ enum security_user_level {
        SECURITY_SYSTEM               = 50
 };
 
-#include "libcli/security/session_proto.h"
+struct cli_credentials;
+struct security_token;
+struct auth_user_info;
+struct auth_user_info_torture;
+
+struct auth_session_info {
+       struct security_token *security_token;
+       struct auth_user_info *info;
+       struct auth_user_info_torture *torture;
+       DATA_BLOB session_key;
+       struct cli_credentials *credentials;
+};
+
+enum security_user_level security_session_user_level(struct auth_session_info *session_info,
+                                                    const struct dom_sid *domain_sid);
 
-struct auth_session_info;
+#endif

diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index 3526e66aa27c04963ca3ab5948d615bff6eb7ea0..3f2e06a908ba8236f012ce155fad5a412d83e1c9 100644 (file)
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -2,7 +2,7 @@
 
 
 bld.SAMBA_LIBRARY('security',
-                  source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c',
+                  source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c session.c',
                   private_library=True,
                   deps='talloc ndr NDR_SECURITY'
                   )

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index ccc5695a2e3ab6b85260f8f8d34b69da09b54e01..70df694b1ed5ba3495ba348639627aae4cbf4a02 100644 (file)
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -162,6 +162,7 @@ struct auth_critical_sizes {
 struct ldb_message;
 struct ldb_context;
 struct gensec_security;
+struct cli_credentials;
 
 NTSTATUS auth_get_challenge(struct auth_context *auth_ctx, uint8_t chal[8]);
 NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,

diff --git a/source4/auth/session.h b/source4/auth/session.h
index 795497ea8fe761d8a329ae7beec8099c62552242..8ab6288d64203d7133d3b43cc61499b560afd936 100644 (file)
--- a/source4/auth/session.h
+++ b/source4/auth/session.h
@@ -21,14 +21,7 @@
 #ifndef _SAMBA_AUTH_SESSION_H
 #define _SAMBA_AUTH_SESSION_H
 
-struct auth_session_info {
-       struct security_token *security_token;
-       struct auth_user_info *info;
-       struct auth_user_info_torture *torture;
-       DATA_BLOB session_key;
-       struct cli_credentials *credentials;
-};
-
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/auth.h"
 

diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index 893eb3bbcd9f5c90e96f2e0d09d67c635e31f261..ebf2f77708123540aad734f79c84ebc52bae3a8e 100644 (file)
--- 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 53d53d9021b94a0c989f70d9c5171214dd06a715..6fd6d7fa14e9668cf18b7e072a48fabe3eb755d4 100644 (file)
--- 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 98889125f323f050e647e0447332e1209d2c9cc6..be60d896387e653fafd84fa0ae95714fcfa8ce27 100644 (file)
--- 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 37ab4707f392d58f0ef18c444f31357c54e4700c..49939e2ff457b75dbc681866192209a679f31621 100644 (file)
--- 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 d639a221b498825bf8aad5592a051930088c2de2..6e4b7a4c423f68515eba9b324fcd9dcc7293a5c9 100644 (file)
--- 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'
        )
 
 

diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build
deleted file mode 100644 (file)
index 9c27723..0000000
--- a/source4/libcli/security/wscript_build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_LIBRARY('security-session',
-       source='session.c',
-       autoproto='session_proto.h',
-       public_deps='security',
-       private_library=True
-       )
-

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 950c179d7e8bbe41d786a88b3326d8ffe81acaf8..f91900d371913034319c8f2e63b781411ef71dea 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 bld.RECURSE('ldap')
-bld.RECURSE('security')
 bld.RECURSE('wbclient')
 
 bld.SAMBA_LIBRARY('errors',

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index b796728dad2a4a1c5083683a6cc83b9026629ba3..815459baaf830678f30232941a05644774a71f3f 100644 (file)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -77,7 +77,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
        source='winreg/rpc_winreg.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_winreg_init',
-       deps='registry ndr-standard security-session',
+       deps='registry ndr-standard',
        internal_module=True
        )
 
@@ -95,7 +95,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
        autoproto='lsa/proto.h',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_lsa_init',
-       deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security-session kdc-policy'
+       deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security kdc-policy'
        )
 
 
@@ -121,7 +121,7 @@ bld.SAMBA_MODULE('dcerpc_drsuapi',
        source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_drsuapi_init',
-       deps='samdb DCERPC_COMMON NDR_DRSUAPI security-session'
+       deps='samdb DCERPC_COMMON NDR_DRSUAPI security'
        )