summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2012-05-02 12:24:34 -0400
committerSimo Sorce <idra@samba.org>2012-05-04 16:51:29 +0200
commiteb9e3e8a54aa7d6b805d280fd5586f9d1a2a094a (patch)
tree53cc4d01088f94dc2fe5450f77f47a7a9577a7e8 /source4
parent5832c61c5f9905f91ae6a010f5c90c674cdace91 (diff)
downloadsamba-eb9e3e8a54aa7d6b805d280fd5586f9d1a2a094a.tar.gz
samba-eb9e3e8a54aa7d6b805d280fd5586f9d1a2a094a.tar.bz2
samba-eb9e3e8a54aa7d6b805d280fd5586f9d1a2a094a.zip
auth-session: MIT doesn't have import/export cred yet
For now let's just loose this functionality with the MIT build. gss_import/export_cred should be availa ble when MIT 1.11 is released and this code is used only in some proxy scenario. Not normally needed for common configurations.
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/session.c8
-rwxr-xr-xsource4/heimdal_build/wscript_configure2
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/auth/session.c b/source4/auth/session.c
index 805659c5a4..de417cc54b 100644
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -156,6 +156,7 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
+
/* Fill out the auth_session_info with a cli_credentials based on the
* auth_session_info we were forwarded over named pipe forwarding.
*
@@ -169,7 +170,7 @@ struct auth_session_info *auth_session_info_from_transport(TALLOC_CTX *mem_ctx,
{
struct auth_session_info *session_info;
session_info = talloc_steal(mem_ctx, session_info_transport->session_info);
-
+#ifdef HAVE_GSS_IMPORT_CRED
if (session_info_transport->exported_gssapi_credentials.length) {
struct cli_credentials *creds;
OM_uint32 minor_status;
@@ -220,7 +221,7 @@ struct auth_session_info *auth_session_info_from_transport(TALLOC_CTX *mem_ctx,
CRED_MUST_USE_KERBEROS);
}
-
+#endif
return session_info;
}
@@ -246,7 +247,7 @@ NTSTATUS auth_session_info_transport_from_session(TALLOC_CTX *mem_ctx,
if (!session_info_transport->session_info) {
return NT_STATUS_NO_MEMORY;
};
-
+#ifdef HAVE_GSS_EXPORT_CRED
if (session_info->credentials) {
struct gssapi_creds_container *gcc;
OM_uint32 gret;
@@ -280,6 +281,7 @@ NTSTATUS auth_session_info_transport_from_session(TALLOC_CTX *mem_ctx,
NT_STATUS_HAVE_NO_MEMORY(session_info_transport->exported_gssapi_credentials.data);
}
}
+#endif
*transport_out = session_info_transport;
return NT_STATUS_OK;
}
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 8357f3aa42..a350a8bae9 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -87,6 +87,8 @@ conf.define('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID', 1)
conf.define('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT', 1)
conf.define('HAVE_GSSKRB5_GET_SUBKEY', 1)
conf.define('HAVE_GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT', 1)
+conf.define('HAVE_GSS_IMPORT_CRED', 1)
+conf.define('HAVE_GSS_EXPORT_CRED', 1)
conf.define('HAVE_LIBGSSAPI', 1)
conf.define('HAVE_ADDR_TYPE_IN_KRB5_ADDRESS', 1)
conf.define('HAVE_CHECKSUM_IN_KRB5_CHECKSUM', 1)