Skip to contentSkip to conversation

gssd: fix build against Heimdal and remove dependency on libgssglue

PATCH New Alex Dubov 1 participant 1 message Mar 27, 2013

Subsystems (2)
lore
Share & tools
lore

Alex Dubov

author
#0 lore raw

PATCH 1/1 gssd: fix build against Heimdal and remove dependency on libgssglue

This is a preliminary patch, aiming to enable a clean build of gssd on systems with Heimdal kerberos flavour. A major part of Heimdal breakage until now was caused by problems with gssglue. Now that libtirpc can be build independently from libgssglue, why not gssd?

Unfortunately, I could not test this patch againts mit-krb5, hopefully somebody can give me a hand here.

---
 aclocal/kerberos5.m4       |    5 ++-
 aclocal/rpcsec_vers.m4     |    2 +-
 utils/gssd/context_lucid.c |   10 ++++----
 utils/gssd/krb5_util.c     |   45 ++++++++++++++++++++++++++++++++++++-------
 utils/gssd/svcgssd_krb5.c  |    2 +-
 5 files changed, 47 insertions(+), 17 deletions(-)
aclocal/kerberos5.m4 +3 -2
index 7574e2d..76914d6 100644
@@ -54,9 +54,10 @@ AC_DEFUN([AC_KERBEROS_V5],[
          break
       dnl The following ugly hack brought on by the split installation
       dnl of Heimdal Kerberos on SuSe
-      elif test \( -f $dir/include/heim_err.h -o\
+      elif test \( \( -f $dir/include/heim_err.h -o\
       		 -f $dir/include/heimdal/heim_err.h \) -a \
-                -f $dir/lib/libroken.a; then
+                 \( -f $dir/lib/libroken.a -o\
+                 -f $dir/lib/libroken.so \) \) ; then
          AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos

libraries])

          KRBDIR="$dir"
          gssapi_lib=gssapi
aclocal/rpcsec_vers.m4 +1 -1
index 8218372..9cf7556 100644
@@ -1,7 +1,7 @@
 dnl Checks librpcsec version
 AC_DEFUN([AC_RPCSEC_VERSION], [
 
-  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
+#  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
 
   dnl TI-RPC replaces librpcsecgss
   if test "$enable_tirpc" = no; then
utils/gssd/context_lucid.c +0 -0
index 64146d7..82171da 100644
@@ -266,10 +266,10 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss_buffer_desc *buf,

int32_t *endtime)
int retcode = 0;

printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
- 1, &return_ctx);
+ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
+ 1, &return_ctx);
if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_export_lucid_sec_context",
+ pgsserr("gss_krb5_export_lucid_sec_context",
maj_stat, min_stat, &krb5oid);
goto out_err;
}
@@ -302,9 +302,9 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss_buffer_desc *buf, int32_t *endtime)
else
retcode = prepare_krb5_rfc4121_buffer(lctx, buf, endtime);

- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
+ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx);
if (maj_stat != GSS_S_COMPLETE) {
- pgsserr("gss_free_lucid_sec_context",
+ pgsserr("gss_krb5_free_lucid_sec_context",
maj_stat, min_stat, &krb5oid);
printerr(0, "WARN: failed to free lucid sec context\n");
}

utils/gssd/krb5_util.c +37 -8

78 lines not on this page · raw message

utils/gssd/svcgssd_krb5.c +1 -1
index 1d44d34..3b10bde 100644
@@ -217,7 +217,7 @@ svcgssd_limit_krb5_enctypes(void)
 			"enctypes from defaults\n", __func__, num_enctypes);
 	}
 
-	maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds,
+	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds,
 			&krb5oid, num_enctypes, enctypes);
 	if (maj_stat != GSS_S_COMPLETE) {
 		printerr(1, "WARNING: gss_set_allowable_enctypes failed\n");
Signature · 1 line
1.7.4.5