summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-02-10 12:59:30 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-02-10 12:59:30 +0000
commitdd7cdd2b1177b7e366142f160210c518c7c7ded0 (patch)
tree24493354612a3439d3dcca5fd8d40f8f25dcb966 /usr.sbin/httpd
parent95d9486163b5e0ee7ad41709467c83170b154ae0 (diff)
ap_server_strip_chroot() is void not int, found by otto while playing with
a etoh diff
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/src/include/http_main.h2
-rw-r--r--usr.sbin/httpd/src/main/http_main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/src/include/http_main.h b/usr.sbin/httpd/src/include/http_main.h
index f8b84a65302..b0d3020750e 100644
--- a/usr.sbin/httpd/src/include/http_main.h
+++ b/usr.sbin/httpd/src/include/http_main.h
@@ -127,7 +127,7 @@ API_EXPORT(int) ap_update_child_status(int child_num, int status, request_rec *r
void ap_time_process_request(int child_num, int status);
API_EXPORT(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x);
API_EXPORT(int) ap_check_alarm(void);
-API_EXPORT(int) ap_server_strip_chroot(char *src, int force);
+API_EXPORT(void) ap_server_strip_chroot(char *, int);
API_EXPORT(int) ap_server_is_chrooted(void);
API_EXPORT(int) ap_server_chroot_desired(void);
diff --git a/usr.sbin/httpd/src/main/http_main.c b/usr.sbin/httpd/src/main/http_main.c
index a91e8eaab6b..7cb8a39c204 100644
--- a/usr.sbin/httpd/src/main/http_main.c
+++ b/usr.sbin/httpd/src/main/http_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: http_main.c,v 1.34 2003/11/17 18:57:05 henning Exp $ */
+/* $OpenBSD: http_main.c,v 1.35 2004/02/10 12:59:29 henning Exp $ */
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -8140,7 +8140,7 @@ const XML_LChar *suck_in_expat(void)
}
#endif /* USE_EXPAT */
-API_EXPORT(int) ap_server_strip_chroot(char *src, int force)
+API_EXPORT(void) ap_server_strip_chroot(char *src, int force)
{
char buf[MAX_STRING_LEN];