Fix build without cred store extensions

Refactor mag_set_ccname_envvar() logic slightly to hide contents.  Add
conditional logic to mag_create_dir_config().  Cleanup definition of
HAVE_CRED_STORE in mod_auth_gssapi.h.

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

Closes #149

Author: frozencemetery

src/environ.c

@@ -399,12 +399,16 @@ static void mag_set_name_attributes(request_rec *req, struct mag_conn *mc)
 static void mag_set_ccname_envvar(request_rec *req, struct mag_config *cfg,
                                   struct mag_conn *mc)
 {
+#ifdef HAVE_CRED_STORE
     apr_status_t status;
     apr_int32_t wanted = APR_FINFO_MIN | APR_FINFO_OWNER | APR_FINFO_PROT;
     apr_finfo_t finfo = { 0 };
     char *path;
     char *value;
 
+    if (!cfg->deleg_ccache_dir || !mc->delegated || !mc->ccname)
+        return;
+
     path = apr_psprintf(req->pool, "%s/%s", cfg->deleg_ccache_dir, mc->ccname);
 
     status = apr_stat(&finfo, path, wanted, req->pool);
@@ -441,6 +445,7 @@ static void mag_set_ccname_envvar(request_rec *req, struct mag_config *cfg,
 
     value = apr_psprintf(req->pool, "FILE:%s", path);
     apr_table_set(mc->env, cfg->ccname_envvar, value);
+#endif
 }
 
 void mag_export_req_env(request_rec *req, apr_table_t *env)
@@ -467,11 +472,7 @@ void mag_set_req_data(request_rec *req,
         mag_set_name_attributes(req, mc);
     }
 
-#ifdef HAVE_CRED_STORE
-    if (cfg->deleg_ccache_dir && mc->delegated && mc->ccname) {
-        mag_set_ccname_envvar(req, cfg, mc);
-    }
-#endif
+    mag_set_ccname_envvar(req, cfg, mc);
 
     ap_set_module_config(req->request_config, &auth_gssapi_module, mc->env);
     mag_export_req_env(req, mc->env);

src/mod_auth_gssapi.c

@@ -1286,7 +1286,9 @@ static void *mag_create_dir_config(apr_pool_t *p, char *dir)
 
     cfg = (struct mag_config *)apr_pcalloc(p, sizeof(struct mag_config));
     cfg->pool = p;
+#ifdef HAVE_CRED_STORE
     cfg->ccname_envvar = "KRB5CCNAME";
+#endif
 
     return cfg;
 }

src/mod_auth_gssapi.h

@@ -46,10 +46,8 @@
 
 #define MIN_SESS_EXP_TIME 300 /* 5 minutes validity minimum */
 
-#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
-#  ifdef HAVE_GSS_STORE_CRED_INTO
-#define HAVE_CRED_STORE 1
-#  endif
+#if defined(HAVE_GSS_ACQUIRE_CRED_FROM) && defined(HAVE_GSS_STORE_CRED_INTO)
+#  define HAVE_CRED_STORE 1
 #endif
 
 extern module AP_MODULE_DECLARE_DATA auth_gssapi_module;