From: Nick Kew <niq@apache.org>
Date: Wed, 28 Jan 2009 16:23:11 +0000 (+0000)
Subject: Match up formats with args in error messages.
X-Git-Tag: 2.3.2~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7061cf07705eb7683ca92d2e568d1529f3093900;p=thirdparty%2Fapache%2Fhttpd.git

Match up formats with args in error messages.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@738526 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/arch/unix/mod_privileges.c b/modules/arch/unix/mod_privileges.c
index db1e3fe59de..6cdfb856572 100644
--- a/modules/arch/unix/mod_privileges.c
+++ b/modules/arch/unix/mod_privileges.c
@@ -121,7 +121,7 @@ static apr_status_t privileges_end_req(void *data)
     /* restore default privileges */
     if (setppriv(PRIV_SET, PRIV_EFFECTIVE, priv_default) == -1) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error restoring default privileges: %s");
+                      "Error restoring default privileges: %s", strerror(errno));
     }
     return APR_SUCCESS;
 }
@@ -157,19 +157,19 @@ static int privileges_req(request_rec *r)
     /* set vhost's privileges */
     if (setppriv(PRIV_SET, PRIV_EFFECTIVE, cfg->priv) == -1) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error setting effective privileges: %s");
+                      "Error setting effective privileges: %s", strerror(errno));
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
     /* ... including those of any subprocesses */
     if (setppriv(PRIV_SET, PRIV_INHERITABLE, cfg->child_priv) == -1) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error setting inheritable privileges: %s");
+                      "Error setting inheritable privileges: %s", strerror(errno));
         return HTTP_INTERNAL_SERVER_ERROR;
     }
     if (setppriv(PRIV_SET, PRIV_LIMIT, cfg->child_priv) == -1) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error setting limit privileges: %s");
+                      "Error setting limit privileges: %s", strerror(errno));
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -253,7 +253,7 @@ static int privileges_postconf(apr_pool_t *pconf, apr_pool_t *plog,
     priv_emptyset(priv_setid);
     if (priv_addset(priv_setid, PRIV_PROC_SETID) == -1) {
         ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, ptemp,
-                      "priv_addset: ", strerror(errno));
+                      "priv_addset: %s", strerror(errno));
         return !OK;
     }
     return OK;