Pass just the pool to mag_error

This way this error reporting function can be used also when a
request_rec is not available, like i the configuration phase.

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

Author: simo5

src/environ.c

@@ -28,7 +28,7 @@ static bool mag_get_name_attr(request_rec *req,
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req,
                       "gss_get_name_attribute() failed on %.*s%s",
                       (int)attr->name.length, (char *)attr->name.value,
-                      mag_error(req, "", maj, min));
+                      mag_error(req->pool, "", maj, min));
         return false;
     }
 
@@ -209,7 +209,7 @@ void mag_get_name_attributes(request_rec *req, struct mag_config *cfg,
 
     maj = gss_inquire_name(&min, name, NULL, NULL, &attrs);
     if (GSS_ERROR(maj)) {
-        error = mag_error(req, "gss_inquire_name() failed", maj, min);
+        error = mag_error(req->pool, "gss_inquire_name() failed", maj, min);
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", error);
         apr_table_set(mc->env, "GSS_NAME_ATTR_ERROR", error);
         return;

src/mod_auth_gssapi.c

@@ -28,7 +28,7 @@ module AP_MODULE_DECLARE_DATA auth_gssapi_module;
 
 APLOG_USE_MODULE(auth_gssapi);
 
-static char *mag_status(request_rec *req, int type, uint32_t err)
+static char *mag_status(apr_pool_t *pool, int type, uint32_t err)
 {
     uint32_t maj_ret, min_ret;
     gss_buffer_desc text;
@@ -47,25 +47,25 @@ static char *mag_status(request_rec *req, int type, uint32_t err)
 
         len = text.length;
         if (msg_ret) {
-            msg_ret = apr_psprintf(req->pool, "%s, %*s",
+            msg_ret = apr_psprintf(pool, "%s, %*s",
                                    msg_ret, len, (char *)text.value);
         } else {
-            msg_ret = apr_psprintf(req->pool, "%*s", len, (char *)text.value);
+            msg_ret = apr_psprintf(pool, "%*s", len, (char *)text.value);
         }
         gss_release_buffer(&min_ret, &text);
     } while (msg_ctx != 0);
 
     return msg_ret;
 }
 
-char *mag_error(request_rec *req, const char *msg, uint32_t maj, uint32_t min)
+char *mag_error(apr_pool_t *pool, const char *msg, uint32_t maj, uint32_t min)
 {
     char *msg_maj;
     char *msg_min;
 
-    msg_maj = mag_status(req, GSS_C_GSS_CODE, maj);
-    msg_min = mag_status(req, GSS_C_MECH_CODE, min);
-    return apr_psprintf(req->pool, "%s: [%s (%s)]", msg, msg_maj, msg_min);
+    msg_maj = mag_status(pool, GSS_C_GSS_CODE, maj);
+    msg_min = mag_status(pool, GSS_C_MECH_CODE, min);
+    return apr_psprintf(pool, "%s: [%s (%s)]", msg, msg_maj, msg_min);
 }
 
 enum mag_err_code {
@@ -98,7 +98,7 @@ static void mag_post_error(request_rec *req, struct mag_config *cfg,
     const char *text = NULL;
 
     if (maj)
-        text = mag_error(req, msg, maj, min);
+        text = mag_error(req->pool, msg, maj, min);
 
     if (cfg->enverrs)
         mag_publish_error(req, maj, min, text ? text : msg, mag_err_text(err));
@@ -288,7 +288,7 @@ static void mag_store_deleg_creds(request_rec *req, const char *ccname,
                               GSS_C_NULL_OID, 1, 1, &store, NULL, NULL);
     if (GSS_ERROR(maj)) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s",
-                      mag_error(req, "failed to store delegated creds",
+                      mag_error(req->pool, "failed to store delegated creds",
                                 maj, min));
     }
 }
@@ -598,7 +598,7 @@ static bool mag_auth_basic(request_rec *req,
         if (maj != GSS_S_COMPLETE) {
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, req,
                           "Failed to restore per-thread ccache, %s",
-                          mag_error(req, "gss_krb5_ccache_name() "
+                          mag_error(req->pool, "gss_krb5_ccache_name() "
                                     "failed", maj, min));
         }
     }

src/mod_auth_gssapi.h

@@ -136,4 +136,4 @@ struct mag_conn {
 
 struct mag_conn *mag_new_conn_ctx(apr_pool_t *pool);
 const char *mag_str_auth_type(int auth_type);
-char *mag_error(request_rec *req, const char *msg, uint32_t maj, uint32_t min);
+char *mag_error(apr_pool_t *pool, const char *msg, uint32_t maj, uint32_t min);