Make requirement on gss_acquire_cred_with_password() hard

Not all uses of this function were previously guarded.  It was added
to MIT in 1.9 (2010), and to Heimdal in 2011.

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>

Author: frozencemetery

configure.ac

@@ -80,9 +80,10 @@ AC_CHECK_LIB([gssapi_krb5], [gss_accept_sec_context], [],
              [AC_MSG_ERROR([GSSAPI library check failed])])
 AC_CHECK_FUNCS(gss_krb5_ccache_name, [],
                [AC_MSG_ERROR([gss_krb5_ccache_name() not found])])
+AC_CHECK_FUNCS(gss_acquire_cred_with_password, [],
+               [AC_MSG_ERROR([gss_acquire_with_password() not found])])
 AC_CHECK_FUNCS(gss_acquire_cred_from)
 AC_CHECK_FUNCS(gss_store_cred_into)
-AC_CHECK_FUNCS(gss_acquire_cred_with_password)
 
 AC_SUBST([GSSAPI_CFLAGS])
 AC_SUBST([GSSAPI_LIBS])

src/mod_auth_gssapi.c

@@ -1593,15 +1593,13 @@ static const char *mag_deleg_ccache_perms(cmd_parms *parms, void *mconfig,
 }
 #endif
 
-#ifdef HAVE_GSS_ACQUIRE_CRED_WITH_PASSWORD
 static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on)
 {
     struct mag_config *cfg = (struct mag_config *)mconfig;
 
     cfg->use_basic_auth = on ? true : false;
     return NULL;
 }
-#endif
 
 static bool mag_list_of_mechs(cmd_parms *parms, gss_OID_set *oidset,
                               const char *w)
@@ -1753,7 +1751,6 @@ static const char *required_name_attrs(cmd_parms *parms, void *mconfig,
     return NULL;
 }
 
-#ifdef HAVE_GSS_ACQUIRE_CRED_WITH_PASSWORD
 static const char *mag_basic_auth_mechs(cmd_parms *parms, void *mconfig,
                                         const char *w)
 {
@@ -1764,7 +1761,6 @@ static const char *mag_basic_auth_mechs(cmd_parms *parms, void *mconfig,
 
     return NULL;
 }
-#endif
 
 static const char *mag_acceptor_name(cmd_parms *parms, void *mconfig,
                                      const char *w)
@@ -1848,12 +1844,10 @@ static const command_rec mag_commands[] = {
                "Do impersonation call (S4U2Self) "
                "based on already authentication username"),
 #endif
-#ifdef HAVE_GSS_ACQUIRE_CRED_WITH_PASSWORD
     AP_INIT_FLAG("GssapiBasicAuth", mag_use_basic_auth, NULL, OR_AUTHCFG,
                      "Allows use of Basic Auth for authentication"),
     AP_INIT_ITERATE("GssapiBasicAuthMech", mag_basic_auth_mechs, NULL,
                     OR_AUTHCFG, "Mechanisms to use for basic auth"),
-#endif
     AP_INIT_ITERATE("GssapiAllowedMech", mag_allow_mech, NULL, OR_AUTHCFG,
                     "Allowed Mechanisms"),
     AP_INIT_FLAG("GssapiNegotiateOnce", mag_negotiate_once, NULL, OR_AUTHCFG,