diff options
Diffstat (limited to 'source4/auth/kerberos')
| -rw-r--r-- | source4/auth/kerberos/config.mk | 3 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk index 1c70ef2e63..7493a6d06d 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -5,11 +5,10 @@ PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = kerberos.o \ clikrb5.o \ kerberos_heimdal.o \ - kerberos_util.o \ kerberos_pac.o \ gssapi_parse.o \ krb5_init_context.o PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE -PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply CREDENTIALS_KRB5 +PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR # End SUBSYSTEM KERBEROS ################################# diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index e3479b12d1..a455fda398 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -30,6 +30,7 @@ #include "lib/events/events.h" #include "roken.h" #include "param/param.h" +#include "libcli/resolve/resolve.h" /* context structure for operations on cldap packets @@ -277,7 +278,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context, } status = socket_connect_ev(smb_krb5->sock, NULL, remote_addr, 0, - lp_name_resolve_order(global_loadparm), ev); + NULL, ev); if (!NT_STATUS_IS_OK(status)) { talloc_free(smb_krb5); continue; @@ -402,7 +403,7 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx, } /* Use our local krb5.conf file by default */ - ret = krb5_prepend_config_files_default(config_file, &config_files); + ret = krb5_prepend_config_files_default(config_file == NULL?"":config_file, &config_files); if (ret) { DEBUG(1,("krb5_prepend_config_files_default failed (%s)\n", smb_get_krb5_error_message((*smb_krb5_context)->krb5_context, ret, tmp_ctx))); |