s4-libcli/security Use seperate subsystem for session related functions

The merged I plan in this area require spliting security.h into
two header files, a common header and a session.h for the
remaining source4-specific code.

Andrew Bartlett

4 files changed, 41 insertions, 12 deletions

diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
index 12c95f1d83d..009ad64959d 100644
--- a/source4/libcli/security/security.h
+++ b/source4/libcli/security/security.h
@@ -25,17 +25,6 @@
 #define PRIMARY_USER_SID_INDEX 0
 #define PRIMARY_GROUP_SID_INDEX 1
 
-enum security_user_level {
-	SECURITY_ANONYMOUS            = 0,
-	SECURITY_USER                 = 10,
-	SECURITY_RO_DOMAIN_CONTROLLER = 20,
-	SECURITY_DOMAIN_CONTROLLER    = 30,
-	SECURITY_ADMINISTRATOR        = 40,
-	SECURITY_SYSTEM               = 50
-};
-
-struct auth_session_info;
-
 struct object_tree {
 	uint32_t remaining_access;
 	struct GUID guid;
diff --git a/source4/libcli/security/session.c b/source4/libcli/security/session.c
index cd09b6d403a..401e11c489f 100644
--- a/source4/libcli/security/session.c
+++ b/source4/libcli/security/session.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "auth/session.h"
+#include "libcli/security/session.h"
 #include "libcli/security/security.h"
 
 enum security_user_level security_session_user_level(struct auth_session_info *session_info,
diff --git a/source4/libcli/security/session.h b/source4/libcli/security/session.h
new file mode 100644
index 00000000000..851a37d7eb9
--- /dev/null
+++ b/source4/libcli/security/session.h
@@ -0,0 +1,33 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   session_info utility functions
+
+   Copyright (C) Andrew Bartlett 2008-2010
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "libcli/security/session_proto.h"
+
+enum security_user_level {
+	SECURITY_ANONYMOUS            = 0,
+	SECURITY_USER                 = 10,
+	SECURITY_RO_DOMAIN_CONTROLLER = 20,
+	SECURITY_DOMAIN_CONTROLLER    = 30,
+	SECURITY_ADMINISTRATOR        = 40,
+	SECURITY_SYSTEM               = 50
+};
+
+struct auth_session_info;
diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build
index 4187bcbebe0..02d79428d09 100644
--- a/source4/libcli/security/wscript_build
+++ b/source4/libcli/security/wscript_build
@@ -1,7 +1,13 @@
 #!/usr/bin/env python
 
+bld.SAMBA_SUBSYSTEM('LIBSECURITY_SESSION',
+	source='session.c',
+	autoproto='session_proto.h',
+	public_deps='LIBSECURITY_COMMON'
+	)
+
 bld.SAMBA_SUBSYSTEM('LIBSECURITY',
-	source='access_check.c create_descriptor.c object_tree.c session.c',
+	source='access_check.c create_descriptor.c object_tree.c',
 	autoproto='proto.h',
 	public_deps='LIBNDR LIBSECURITY_COMMON'
 	)