Declare mag_complete outside the ifdef block

simo5 · simo5 · commit 1e3ebb216779 · 2016-10-11T08:59:32.000-04:00
Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Isaac Boukris <iboukris@gmail.com> Reviewed-by: Robbie Harwood <rharwood@redhat.com> Fixes #106 Closes #107
diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c
@@ -612,6 +612,10 @@ struct mag_req_cfg *mag_init_cfg(request_rec *req)
     return req_cfg;
 }
 
+static int mag_complete(struct mag_req_cfg *req_cfg, struct mag_conn *mc,
+                        gss_name_t client, gss_OID mech_type,
+                        uint32_t vtime, gss_cred_id_t delegated_cred);
+
 #ifdef HAVE_CRED_STORE
 static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {
     if (req_cfg->cfg->use_s4u2proxy) {
@@ -626,10 +630,6 @@ static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {
     return false;
 }
 
-static int mag_complete(struct mag_req_cfg *req_cfg, struct mag_conn *mc,
-                        gss_name_t client, gss_OID mech_type,
-                        uint32_t vtime, gss_cred_id_t delegated_cred);
-
 static apr_status_t mag_s4u2self(request_rec *req)
 {
     apr_status_t ret = DECLINED;

Original file line number	Diff line number	Diff line change
`@@ -612,6 +612,10 @@ struct mag_req_cfg mag_init_cfg(request_rec req)`
`612`	`612`	`return req_cfg;`
`613`	`613`	`}`
`614`	`614`
	`615`	`+static int mag_complete(struct mag_req_cfg req_cfg, struct mag_conn mc,`
	`616`	`+ gss_name_t client, gss_OID mech_type,`
	`617`	`+ uint32_t vtime, gss_cred_id_t delegated_cred);`
	`618`	`+`
`615`	`619`	`#ifdef HAVE_CRED_STORE`
`616`	`620`	`static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {`
`617`	`621`	`if (req_cfg->cfg->use_s4u2proxy) {`
`@@ -626,10 +630,6 @@ static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) {`
`626`	`630`	`return false;`
`627`	`631`	`}`
`628`	`632`
`629`		`-static int mag_complete(struct mag_req_cfg req_cfg, struct mag_conn mc,`
`630`		`- gss_name_t client, gss_OID mech_type,`
`631`		`- uint32_t vtime, gss_cred_id_t delegated_cred);`
`632`		`-`
`633`	`633`	`static apr_status_t mag_s4u2self(request_rec *req)`
`634`	`634`	`{`
`635`	`635`	`apr_status_t ret = DECLINED;`