summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-18 12:28:50 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:12 +1000
commit7b273df175679e80c9d29c6bb8beee85331c9f0e (patch)
treebc83bc5bfee99aa7dc0440a7b756b06778fdd014
parent86f2a197dfd61fbf25b170080a0796d2f77f0af8 (diff)
downloadsamba-7b273df175679e80c9d29c6bb8beee85331c9f0e.tar.gz
samba-7b273df175679e80c9d29c6bb8beee85331c9f0e.tar.bz2
samba-7b273df175679e80c9d29c6bb8beee85331c9f0e.zip
s3-auth import auth3_session_info into IDL
Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--librpc/idl/auth.idl24
-rw-r--r--source3/include/auth.h24
2 files changed, 23 insertions, 25 deletions
diff --git a/librpc/idl/auth.idl b/librpc/idl/auth.idl
index 2536777f06..00a6a6673a 100644
--- a/librpc/idl/auth.idl
+++ b/librpc/idl/auth.idl
@@ -9,7 +9,7 @@
*/
-import "misc.idl", "security.idl", "lsa.idl", "krb5pac.idl";
+import "misc.idl", "security.idl", "lsa.idl", "krb5pac.idl", "netlogon.idl";
[
pyhelper("librpc/ndr/py_auth.c"),
helper("../librpc/ndr/ndr_auth.h"),
@@ -101,6 +101,28 @@ interface auth
} auth_session_info;
typedef [public] struct {
+ security_token *security_token;
+ security_unix_token *unix_token;
+ netr_SamInfo3 *info3;
+ auth_user_info_unix *unix_info;
+ [value(NULL), ignore] auth_user_info_torture *torture;
+
+ /* This is the final session key, as used by SMB signing, and
+ * (truncated to 16 bytes) encryption on the SAMR and LSA pipes
+ * when over ncacn_np.
+ * It is calculated by NTLMSSP from the session key in the info3,
+ * and is set from the Kerberos session key using
+ * krb5_auth_con_getremotesubkey().
+ *
+ * Bottom line, it is not the same as the session keys in info3.
+ */
+
+ DATA_BLOB session_key;
+
+ [value(NULL), ignore] cli_credentials *credentials;
+ } auth3_session_info;
+
+ typedef [public] struct {
auth_session_info *session_info;
DATA_BLOB exported_gssapi_credentials;
} auth_session_info_transport;
diff --git a/source3/include/auth.h b/source3/include/auth.h
index da3a443a16..4f7cb9bb14 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -75,30 +75,6 @@ struct auth_serversupplied_info {
char *sanitized_username;
};
-struct auth3_session_info {
- struct security_unix_token *unix_token;
-
- /* NT group information taken from the info3 structure */
-
- struct security_token *security_token;
-
- /* This is the final session key, as used by SMB signing, and
- * (truncated to 16 bytes) encryption on the SAMR and LSA pipes
- * when over ncacn_np.
- * It is calculated by NTLMSSP from the session key in the info3,
- * and is set from the Kerberos session key using
- * krb5_auth_con_getremotesubkey().
- *
- * Bottom line, it is not the same as the session keys in info3.
- */
-
- DATA_BLOB session_key;
-
- struct netr_SamInfo3 *info3;
-
- struct auth_user_info_unix *unix_info;
-};
-
struct auth_context {
DATA_BLOB challenge;