use gensec_gssapi_try_kerberos in source3/librpc/crypto/gse.c

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 9a9f4261222f8d954e490d35b7b5a284513efe10..de8c986884842e86c57c2f07fb4c80745c6d8bca 100644 (file)
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -30,6 +30,7 @@
 #include "auth/gensec/gensec.h"
 #include "auth/gensec/gensec_internal.h"
 #include "auth/credentials/credentials.h"
+#include "auth/kerberos/gensec_gssapi_helper.h"
 #include "../librpc/gen_ndr/dcerpc.h"
 
 #if defined(HAVE_KRB5)
@@ -757,17 +758,9 @@ static NTSTATUS gensec_gse_client_start(struct gensec_security *gensec_security)
        const char *password = cli_credentials_get_password(creds);
        const char *realm = cli_credentials_get_realm(creds);
 
-       if (!hostname) {
-               DEBUG(1, ("Could not determine hostname for target computer, cannot use kerberos\n"));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       if (is_ipaddress(hostname)) {
-               DEBUG(2, ("Cannot do GSE to an IP address\n"));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       if (strcmp(hostname, "localhost") == 0) {
-               DEBUG(2, ("GSE to 'localhost' does not make sense\n"));
-               return NT_STATUS_INVALID_PARAMETER;
+       nt_status = gensec_gssapi_try_kerberos(gensec_security);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return nt_status;
        }
 
        if (gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) {

diff --git a/source3/wscript_build b/source3/wscript_build
index aa8fdc175674d8caafb9d8b327072fabe424024a..4b3754b256706e29c85a49b790e2d149a84f3ac7 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -46,7 +46,7 @@ bld.SAMBA3_LIBRARY('netapi',
 
 bld.SAMBA3_LIBRARY('gse',
                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
-                   deps='krb5samba gensec smbconf KRBCLIENT secrets3',
+                   deps='krb5samba gensec smbconf KRBCLIENT secrets3 GENSEC_GSSAPI_HELPER',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('msrpc3',