merge the differences in apache-1.3 from tag mpm-merge-1 up to

APACHE_1_3_9 (a.k.a. mpm-merge-2) onto the mpm tree

prior to the merge, the mpm tree was tagged with apache-1_3-merge-2-pre,
and after the merge, the mpm tree will be tagged with
apache-1_3-merge-2-post

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

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 09b2c431134b04fcde092f0cfaa10ea7c6cd7525..e9196dc387b6480b49c86fedd370497f3798e923 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -198,7 +198,8 @@ int unixd_setup_child(void)
        if (setuid(unixd_config.user_id) == -1) {
            GETUSERMODE();
            ap_log_error(APLOG_MARK, APLOG_ALERT, NULL,
-                       "setuid: unable to change to uid: %d", unixd_config.user_id);
+                       "setuid: unable to change to uid: %ld",
+                        (long) unixd_config.user_id);
            exit(1);
        }
        GETUSERMODE();
@@ -211,7 +212,8 @@ int unixd_setup_child(void)
 #endif
        setuid(unixd_config.user_id) == -1)) {
        ap_log_error(APLOG_MARK, APLOG_ALERT, NULL,
-                   "setuid: unable to change to uid: %d", unixd_config.user_id);
+                   "setuid: unable to change to uid: %ld",
+                    (long) unixd_config.user_id);
        return -1;
     }
 #endif