Fix build when cred store is not available.

simo5 · simo5 · commit 3652da99739c · 2016-01-13T09:48:31.000-05:00
Older distributions have versions of Kerberos that miss this feature.

Signed-off-by: Simo Sorce &lt;simo@redhat.com&gt;
diff --git a/src/environ.c b/src/environ.c
@@ -276,6 +276,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) {
         char *ccname;
         ccname = mag_gss_name_to_ccache_name(req,
@@ -285,4 +286,5 @@ void mag_set_req_data(request_rec *req,
             mag_set_KRB5CCANME(req, ccname);
         }
     }
+#endif
 }
diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c
@@ -630,6 +630,7 @@ struct mag_req_cfg *mag_init_cfg(request_rec *req)
     return req_cfg;
 }
 
+#ifdef HAVE_CRED_STORE
 static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {
     if (req_cfg->cfg->use_s4u2proxy) {
         if (req_cfg->cfg->deleg_ccache_dir != NULL) {
@@ -642,6 +643,7 @@ static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {
     }
     return false;
 }
+#endif
 
 static int mag_auth(request_rec *req)
 {

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ void mag_set_req_data(request_rec *req,`
`276`	`276`	`mag_set_name_attributes(req, mc);`
`277`	`277`	`}`
`278`	`278`
	`279`	`+#ifdef HAVE_CRED_STORE`
`279`	`280`	`if (cfg->deleg_ccache_dir && mc->delegated) {`
`280`	`281`	`char *ccname;`
`281`	`282`	`ccname = mag_gss_name_to_ccache_name(req,`
`@@ -285,4 +286,5 @@ void mag_set_req_data(request_rec *req,`
`285`	`286`	`mag_set_KRB5CCANME(req, ccname);`
`286`	`287`	`}`
`287`	`288`	`}`
	`289`	`+#endif`
`288`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -630,6 +630,7 @@ struct mag_req_cfg mag_init_cfg(request_rec req)`
`630`	`630`	`return req_cfg;`
`631`	`631`	`}`
`632`	`632`
	`633`	`+#ifdef HAVE_CRED_STORE`
`633`	`634`	`static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {`
`634`	`635`	`if (req_cfg->cfg->use_s4u2proxy) {`
`635`	`636`	`if (req_cfg->cfg->deleg_ccache_dir != NULL) {`
`@@ -642,6 +643,7 @@ static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {`
`642`	`643`	`}`
`643`	`644`	`return false;`
`644`	`645`	`}`
	`646`	`+#endif`
`645`	`647`
`646`	`648`	`static int mag_auth(request_rec *req)`
`647`	`649`	`{`