[With respect to versus and/or , RFC1509 doesn't seem to address this, and draft-ietf-cat-gssv2-cbind-05.txt (draft to update RFC1509 for GSS-API version 2) is very vague. C'mon folks, this is suppose to be an API, which means Application Programming Interface, which means it specifies how an application is to access the functionality. Grr. My instinct is to tell the GSS folk "y'all need to standardize this; us application maintainers have better things to do than mess with configure.in hunting down the location du jour of the header files". With respect to `gss_nt_service_name' versus `GSS_C_NT_HOSTBASED_SERVICE', the latter is specified by RFC2078 and the former wasn't in any RFCs that I noticed. I'm reluctant to make the change without being able to test it, but at first glance it would seem to be correct and uncontroversial. -kingdon] To: bug-cvs@gnu.org Subject: cvs-1.9.28: patches for building with Heimdal Content-Type: multipart/mixed; boundary="Multipart_Sun_May_24_05:39:46_1998-1" From: Assar Westerlund Date: 24 May 1998 05:39:46 +0200 --Multipart_Sun_May_24_05:39:46_1998-1 Content-Type: text/plain; charset=US-ASCII Hi. I made some small changes to 1.9.28 to allow it to be built with the gssapi functionality from Heimdal . The changes should be fairly small and non-controversial. There's some difference in the location of header files and libraries between MIT Kerberos 5 and Heimdal but the changed configure.in tests for both. I also had to replace `gss_nt_service_name' with `GSS_C_NT_HOSTBASED_SERVICE'. I have no way of testing, but I believe that this should also work with the MIT code and it's the defined constant in draft-ietf-cat-gssv2-cbind-05.txt /assar --Multipart_Sun_May_24_05:39:46_1998-1 Content-Type: text/plain; charset=US-ASCII =================================================================== RCS file: RCS/ChangeLog,v retrieving revision 1.1 diff -uw -r1.1 ChangeLog --- ChangeLog 1998/05/24 03:32:10 1.1 +++ ChangeLog 1998/05/24 03:32:15 @@ -1,3 +1,9 @@ +Sun May 24 05:27:51 1998 Assar Westerlund + + * acconfig.h (HAVE_GSSAPI_H, HAVE_GSSAPI_GSSAPI_H): added + + * configure.in (GSSAPI): check for Heimdal gssapi + 1998-04-28 Jim Kingdon * TESTS: Add note about Solaris sort program (reported by Mark =================================================================== RCS file: RCS/acconfig.h,v retrieving revision 1.1 diff -uw -r1.1 acconfig.h --- acconfig.h 1998/05/23 18:14:02 1.1 +++ acconfig.h 1998/05/23 18:14:29 @@ -4,6 +4,12 @@ /* Define if you have GSSAPI with MIT Kerberos version 5 available. */ #undef HAVE_GSSAPI +/* Define if you have a gssapi.h */ +#undef HAVE_GSSAPI_H + +/* Define if you have a gssapi/gssapi.h */ +#undef HAVE_GSSAPI_GSSAPI_H + /* Define if you want CVS to be able to be a remote repository client. */ #undef CLIENT_SUPPORT =================================================================== RCS file: RCS/configure.in,v retrieving revision 1.1 diff -uw -r1.1 configure.in --- configure.in 1998/05/23 18:03:39 1.1 +++ configure.in 1998/05/23 19:11:38 @@ -260,20 +260,27 @@ AC_SUBST(GSSAPI)])dnl WITH_GSSAPI -AC_MSG_CHECKING([for gssapi.h]) +dnl checking for gssapi hold_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$GSSAPI/include " AC_CHECK_HEADER(gssapi/gssapi.h, [AC_DEFINE(HAVE_GSSAPI) + AC_DEFINE(HAVE_GSSAPI_GSSAPI_H) LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" includeopt="${includeopt} -I$GSSAPI/include" # This is necessary on Irix 5.3, in order to link against libkrb5 -- # there, an_to_ln.o refers to things defined only in -lgen. - AC_CHECK_LIB(gen, compile)]) + AC_CHECK_LIB(gen, compile) + AC_CHECK_HEADERS(gssapi/gssapi_generic.h)]) +AC_CHECK_HEADER(gssapi.h, + [AC_DEFINE(HAVE_GSSAPI) + AC_DEFINE(HAVE_GSSAPI_H) + LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken" + includeopt="${includeopt} -I$GSSAPI/include"]) CPPFLAGS=$hold_cppflags =================================================================== RCS file: RCS/ChangeLog,v retrieving revision 1.1 diff -uw -r1.1 src/ChangeLog --- src/ChangeLog 1998/05/24 03:31:52 1.1 +++ src/ChangeLog 1998/05/24 03:31:57 @@ -1,3 +1,13 @@ +Sun May 24 05:31:04 1998 Assar Westerlund + + * server.c (HAVE_GSSAPI): handle Heimdal gssapi.h as well + (gserver_authenticate_connection): `gss_nt_service_name' changed to + `GSS_C_NT_HOSTBASED_SERVICE' + + * client.c (HAVE_GSSAPI): handle Heimdal gssapi.h as well + (connect_to_gserver): `gss_nt_service_name' changed to + `GSS_C_NT_HOSTBASED_SERVICE' + 1998-05-23 Jim Kingdon * Version 1.9.28. =================================================================== RCS file: RCS/client.c,v retrieving revision 1.1 diff -uw -r1.1 src/client.c --- src/client.c 1998/05/23 18:08:16 1.1 +++ src/client.c 1998/05/23 18:18:00 @@ -78,8 +78,15 @@ #ifdef HAVE_GSSAPI +#ifdef HAVE_GSSAPI_H +#include +#endif +#ifdef HAVE_GSSAPI_GSSAPI_H #include +#endif +#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H #include +#endif /* This is needed for GSSAPI encryption. */ static gss_ctx_id_t gcontext; @@ -3861,7 +3868,8 @@ sprintf (buf, "cvs@%s", hostinfo->h_name); tok_in.length = strlen (buf); tok_in.value = buf; - gss_import_name (&stat_min, &tok_in, gss_nt_service_name, &server_name); + gss_import_name (&stat_min, &tok_in, GSS_C_NT_HOSTBASED_SERVICE, + &server_name); tok_in_ptr = GSS_C_NO_BUFFER; gcontext = GSS_C_NO_CONTEXT; =================================================================== RCS file: RCS/server.c,v retrieving revision 1.1 diff -uw -r1.1 src/server.c --- src/server.c 1998/05/23 18:09:56 1.1 +++ src/server.c 1998/05/23 18:19:30 @@ -42,8 +42,15 @@ #ifdef HAVE_GSSAPI #include +#ifdef HAVE_GSSAPI_H +#include +#endif +#ifdef HAVE_GSSAPI_GSSAPI_H #include +#endif +#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H #include +#endif /* We use Kerberos 5 routines to map the GSSAPI credential to a user name. */ @@ -5218,7 +5225,7 @@ tok_in.value = buf; tok_in.length = strlen (buf); - if (gss_import_name (&stat_min, &tok_in, gss_nt_service_name, + if (gss_import_name (&stat_min, &tok_in, GSS_C_NT_HOSTBASED_SERVICE, &server_name) != GSS_S_COMPLETE) error (1, 0, "could not import GSSAPI service name %s", buf); --Multipart_Sun_May_24_05:39:46_1998-1--