ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

gsskrb5_register_acceptor_identity is not available on all platforms

Browse Source
This commit is contained in:
Mark Andrews
2010-12-18 14:46:21 +00:00
parent 009b1debed
commit c880d51849
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.505 $)
AC_REVISION($Revision: 1.506 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
@@ -796,10 +796,6 @@ case "$use_gssapi" in
AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h,
[ISC_PLATFORM_GSSAPI_KRB5_HEADER="#define ISC_PLATFORM_GSSAPI_KRB5_HEADER <$ac_header>"])
if test "$ISC_PLATFORM_GSSAPI_KRB5_HEADER" = ""; then
AC_MSG_ERROR([gssapi_krb5.h not found])
fi
AC_CHECK_HEADERS(krb5.h krb5/krb5.h kerberosv5/krb5.h,
[ISC_PLATFORM_KRB5HEADER="#define ISC_PLATFORM_KRB5HEADER <$ac_header>"])

27
lib/dns/gssapictx.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gssapictx.c,v 1.19 2010/12/18 01:56:22 each Exp $ */
/* $Id: gssapictx.c,v 1.20 2010/12/18 14:46:21 marka Exp $ */
#include <config.h>
@@ -746,16 +746,21 @@ dst_gssapi_acceptctx(gss_cred_id_t cred,
else
context = *ctxout;
if (gssapi_keytab) {
gret = gsskrb5_register_acceptor_identity(gssapi_keytab);
if (gret != GSS_S_COMPLETE) {
gss_log(3, "failed "
"gsskrb5_register_acceptor_identity(%s): %s",
gssapi_keytab,
gss_error_tostring(gret, minor,
buf, sizeof(buf)));
return (DNS_R_INVALIDTKEY);
}
if (gssapi_keytab != NULL) {
#ifdef ISC_PLATFORM_GSSAPI_KRB5_HEADER
return (ISC_R_NOTIMPLEMENTED);
#else
gret = gsskrb5_register_acceptor_identity(gssapi_keytab);
if (gret != GSS_S_COMPLETE) {
gss_log(3, "failed "
"gsskrb5_register_acceptor_identity(%s): %s",
gssapi_keytab,
gss_error_tostring(gret, minor,
buf, sizeof(buf)));
return (DNS_R_INVALIDTKEY);
}
#endif
}
gret = gss_accept_sec_context(&minor, &context, cred, &gintoken,

4
lib/dns/include/dst/gssapi.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gssapi.h,v 1.12 2010/12/18 01:56:22 each Exp $ */
/* $Id: gssapi.h,v 1.13 2010/12/18 14:46:21 marka Exp $ */
#ifndef DST_GSSAPI_H
#define DST_GSSAPI_H 1
@@ -37,8 +37,10 @@
#include <gssapi/gssapi_krb5.h>
#else
#include ISC_PLATFORM_GSSAPIHEADER
#ifdef ISC_PLATFORM_GSSAPI_KRB5_HEADER
#include ISC_PLATFORM_GSSAPI_KRB5_HEADER
#endif
#endif
#ifndef GSS_SPNEGO_MECHANISM
#define GSS_SPNEGO_MECHANISM ((void*)0)
#endif