s3-auth import auth3_session_info into IDL

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/librpc/idl/auth.idl b/librpc/idl/auth.idl
index 2536777f06937179f53b6dfe8b9189ddc1f4ea46..00a6a6673a599c26ae88d112f88cb6524c98594a 100644 (file)
--- 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"),
@@ -100,6 +100,28 @@ interface auth
                [value(NULL), ignore] cli_credentials *credentials;
        } 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;

diff --git a/source3/include/auth.h b/source3/include/auth.h
index da3a443a163b476614021525a2a8604401d13bfd..4f7cb9bb1487d1aab6727b571954e762352b963e 100644 (file)
--- 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;