From: Frank Lahm <franklahm@gmail.com>
Date: Mon, 28 Oct 2013 09:06:37 +0000 (+0100)
Subject: Build fixes for the Kerberos UAM
X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=commitdiff_plain;h=71d10aa713b9ba555f1fc962de2dd0c83253609e

Build fixes for the Kerberos UAM

o missing Kerberos includes and libraries
o conditional code that handled the case when Kerberos is not available
  was c/p from etc/afp/status.c and wasn't updated for the changes introduced
  in the bugfix for #531
---

diff --git a/NEWS b/NEWS
index e0f05502..8a8fb779 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 Changes in 3.0.7
 ================
+* FIX: Build fixes for the Kerberos UAM
 
 Changes in 3.0.6
 ================
diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
index 3a02b835..23fd3d1c 100644
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -93,7 +93,7 @@ AM_CFLAGS = @SSL_CFLAGS@ @LIBGCRYPT_CFLAGS@
 uams_pam_la_CFLAGS         = @PAM_CFLAGS@
 uams_dhx_pam_la_CFLAGS     = @SSL_CFLAGS@ @PAM_CFLAGS@
 uams_dhx2_pam_la_CFLAGS    = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
-uams_gss_la_CFLAGS   	   = @GSSAPI_CFLAGS@
+uams_gss_la_CFLAGS   	   = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@
 
 uams_guest_la_LDFLAGS      = -module -avoid-version
 uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
@@ -104,7 +104,7 @@ uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
 uams_dhx_pam_la_LDFLAGS		= -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
 uams_dhx2_passwd_la_LDFLAGS	= -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
 uams_dhx2_pam_la_LDFLAGS	= -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
-uams_gss_la_LDFLAGS   	   = -module -avoid-version @GSSAPI_LIBS@ 
+uams_gss_la_LDFLAGS   	   = -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
 
 #
 # module compilation
diff --git a/etc/uams/uams_gss.c b/etc/uams/uams_gss.c
index 28ed7444..325d1c13 100644
--- a/etc/uams/uams_gss.c
+++ b/etc/uams/uams_gss.c
@@ -601,14 +601,13 @@ krb5_cleanup:
     krb5_free_context(context);
 
 #else /* ! HAVE_KERBEROS */
-
-    if (!options->k5service || !options->fqdn || !options->k5realm)
+    if (!obj->options.k5service || !obj->options.fqdn || !obj->options.k5realm)
         goto exit;
 
     char principal[255];
     size_t len = snprintf(principal, sizeof(principal), "%s/%s@%s",
-                          options->k5service, options->fqdn, options->k5realm);
-    (void)set_principal(&obj, principal);
+                          obj->options.k5service, obj->options.fqdn, obj->options.k5realm);
+    (void)set_principal(obj, principal);
     rv = 0;
 #endif /* HAVE_KERBEROS */