diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-01-09 00:45:33 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-01-09 00:45:33 +0000 |
commit | 301d219ad3278d715cd99b3a0a539434b2c481ae (patch) | |
tree | 0f5801447de61ddc3a07199ec786f59cff50fa75 | |
parent | 0f21ce35a90163e1d34fde1138d534c719566ad8 (diff) |
adapt to rename
28 files changed, 66 insertions, 66 deletions
diff --git a/usr.sbin/hoststatectl/Makefile b/usr.sbin/hoststatectl/Makefile index cf9a63acd8b..f2260e3e920 100644 --- a/usr.sbin/hoststatectl/Makefile +++ b/usr.sbin/hoststatectl/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.1 2006/12/16 11:45:07 reyk Exp $ +# $OpenBSD: Makefile,v 1.2 2007/01/09 00:45:32 deraadt Exp $ -.PATH: ${.CURDIR}/../hostated +.PATH: ${.CURDIR}/../hoststated -PROG= hostatectl -SRCS= buffer.c imsg.c log.c hostatectl.c parser.c +PROG= hoststatectl +SRCS= buffer.c imsg.c log.c hoststatectl.c parser.c -MAN= hostatectl.8 +MAN= hoststatectl.8 -CFLAGS+= -Wall -Werror -I${.CURDIR} -I${.CURDIR}/../hostated +CFLAGS+= -Wall -Werror -I${.CURDIR} -I${.CURDIR}/../hoststated CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual diff --git a/usr.sbin/hoststatectl/hoststatectl.c b/usr.sbin/hoststatectl/hoststatectl.c index 9c81a0f6811..90ad447aa22 100644 --- a/usr.sbin/hoststatectl/hoststatectl.c +++ b/usr.sbin/hoststatectl/hoststatectl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hoststatectl.c,v 1.6 2006/12/16 18:50:33 reyk Exp $ */ +/* $OpenBSD: hoststatectl.c,v 1.7 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -36,7 +36,7 @@ #include <unistd.h> #include <event.h> -#include "hostated.h" +#include "hoststated.h" #include "parser.h" __dead void usage(void); diff --git a/usr.sbin/hoststatectl/parser.c b/usr.sbin/hoststatectl/parser.c index 43703a6622b..7112c06b2de 100644 --- a/usr.sbin/hoststatectl/parser.c +++ b/usr.sbin/hoststatectl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.4 2006/12/16 18:50:33 reyk Exp $ */ +/* $OpenBSD: parser.c,v 1.5 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -32,7 +32,7 @@ #include <string.h> #include <event.h> -#include "hostated.h" +#include "hoststated.h" #include "parser.h" diff --git a/usr.sbin/hoststated/Makefile b/usr.sbin/hoststated/Makefile index 16a06450a62..d6bf86856dc 100644 --- a/usr.sbin/hoststated/Makefile +++ b/usr.sbin/hoststated/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2007/01/08 13:37:26 reyk Exp $ +# $OpenBSD: Makefile,v 1.3 2007/01/09 00:45:32 deraadt Exp $ -PROG= hostated -SRCS= parse.y log.c control.c buffer.c imsg.c hostated.c \ +PROG= hoststated +SRCS= parse.y log.c control.c buffer.c imsg.c hoststated.c \ pfe.c pfe_filter.c hce.c \ check_icmp.c check_tcp.c check_http.c check_send_expect.c MAN= hostated.8 hostated.conf.5 diff --git a/usr.sbin/hoststated/buffer.c b/usr.sbin/hoststated/buffer.c index 6f462a2d44f..7133094ddfc 100644 --- a/usr.sbin/hoststated/buffer.c +++ b/usr.sbin/hoststated/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.3 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: buffer.c,v 1.4 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -30,7 +30,7 @@ #include <string.h> #include <unistd.h> -#include "hostated.h" +#include "hoststated.h" int buf_realloc(struct buf *, size_t); void buf_enqueue(struct msgbuf *, struct buf *); diff --git a/usr.sbin/hoststated/check_http.c b/usr.sbin/hoststated/check_http.c index 1abc40d0059..d7ace782be6 100644 --- a/usr.sbin/hoststated/check_http.c +++ b/usr.sbin/hoststated/check_http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_http.c,v 1.6 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: check_http.c,v 1.7 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> * @@ -29,7 +29,7 @@ #include <unistd.h> #include <fcntl.h> -#include "hostated.h" +#include "hoststated.h" void check_http_code(struct ctl_tcp_event *); void check_http_digest(struct ctl_tcp_event *); diff --git a/usr.sbin/hoststated/check_icmp.c b/usr.sbin/hoststated/check_icmp.c index 52f5feb45c2..d48222910cf 100644 --- a/usr.sbin/hoststated/check_icmp.c +++ b/usr.sbin/hoststated/check_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_icmp.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -34,7 +34,7 @@ #include <string.h> #include <stdlib.h> -#include "hostated.h" +#include "hoststated.h" int icmp6_checks_done(struct ctl_icmp_event *); int icmp4_checks_done(struct ctl_icmp_event *); diff --git a/usr.sbin/hoststated/check_send_expect.c b/usr.sbin/hoststated/check_send_expect.c index 16b14eeddd7..528dd8b1fc1 100644 --- a/usr.sbin/hoststated/check_send_expect.c +++ b/usr.sbin/hoststated/check_send_expect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_send_expect.c,v 1.2 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: check_send_expect.c,v 1.3 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> * @@ -29,7 +29,7 @@ #include <fcntl.h> #include <fnmatch.h> -#include "hostated.h" +#include "hoststated.h" void se_validate(struct ctl_tcp_event *); void se_read(int, short, void *); diff --git a/usr.sbin/hoststated/check_tcp.c b/usr.sbin/hoststated/check_tcp.c index 2f11cfe1869..86b8244093f 100644 --- a/usr.sbin/hoststated/check_tcp.c +++ b/usr.sbin/hoststated/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -30,7 +30,7 @@ #include <stdlib.h> #include <errno.h> -#include "hostated.h" +#include "hoststated.h" void tcp_write(int, short, void *); void tcp_host_up(int s, struct ctl_tcp_event *); diff --git a/usr.sbin/hoststated/control.c b/usr.sbin/hoststated/control.c index 2368ce43e27..c2392cd15dc 100644 --- a/usr.sbin/hoststated/control.c +++ b/usr.sbin/hoststated/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.6 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: control.c,v 1.7 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,7 +31,7 @@ #include <unistd.h> #include <signal.h> -#include "hostated.h" +#include "hoststated.h" #define CONTROL_BACKLOG 5 diff --git a/usr.sbin/hoststated/hce.c b/usr.sbin/hoststated/hce.c index 065c7f316b5..308a8d7166b 100644 --- a/usr.sbin/hoststated/hce.c +++ b/usr.sbin/hoststated/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: hce.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -36,7 +36,7 @@ #include <err.h> #include <pwd.h> -#include "hostated.h" +#include "hoststated.h" void hce_sig_handler(int sig, short, void *); void hce_shutdown(void); diff --git a/usr.sbin/hoststated/imsg.c b/usr.sbin/hoststated/imsg.c index 37c1808e293..fb110a45fb8 100644 --- a/usr.sbin/hoststated/imsg.c +++ b/usr.sbin/hoststated/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.3 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: imsg.c,v 1.4 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -28,7 +28,7 @@ #include <string.h> #include <unistd.h> -#include "hostated.h" +#include "hoststated.h" void imsg_init(struct imsgbuf *ibuf, int fd, void (*handler)(int, short, void *)) diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index 38af6b6808a..66c0e120541 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.13 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.14 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -41,7 +41,7 @@ #include <netdb.h> #include <string.h> -#include "hostated.h" +#include "hoststated.h" struct hostated *conf = NULL; static FILE *fin = NULL; diff --git a/usr.sbin/hoststated/pfe.c b/usr.sbin/hoststated/pfe.c index 573662922fd..1ee1c529937 100644 --- a/usr.sbin/hoststated/pfe.c +++ b/usr.sbin/hoststated/pfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe.c,v 1.5 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: pfe.c,v 1.6 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -31,7 +31,7 @@ #include <unistd.h> #include <pwd.h> -#include "hostated.h" +#include "hoststated.h" void pfe_sig_handler(int sig, short, void *); void pfe_shutdown(void); diff --git a/usr.sbin/hoststated/pfe_filter.c b/usr.sbin/hoststated/pfe_filter.c index 4e80d6dc412..50fe7456ad9 100644 --- a/usr.sbin/hoststated/pfe_filter.c +++ b/usr.sbin/hoststated/pfe_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe_filter.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: pfe_filter.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> -#include "hostated.h" +#include "hoststated.h" struct pfdata { int dev; diff --git a/usr.sbin/relayctl/Makefile b/usr.sbin/relayctl/Makefile index cf9a63acd8b..f2260e3e920 100644 --- a/usr.sbin/relayctl/Makefile +++ b/usr.sbin/relayctl/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.1 2006/12/16 11:45:07 reyk Exp $ +# $OpenBSD: Makefile,v 1.2 2007/01/09 00:45:32 deraadt Exp $ -.PATH: ${.CURDIR}/../hostated +.PATH: ${.CURDIR}/../hoststated -PROG= hostatectl -SRCS= buffer.c imsg.c log.c hostatectl.c parser.c +PROG= hoststatectl +SRCS= buffer.c imsg.c log.c hoststatectl.c parser.c -MAN= hostatectl.8 +MAN= hoststatectl.8 -CFLAGS+= -Wall -Werror -I${.CURDIR} -I${.CURDIR}/../hostated +CFLAGS+= -Wall -Werror -I${.CURDIR} -I${.CURDIR}/../hoststated CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual diff --git a/usr.sbin/relayctl/parser.c b/usr.sbin/relayctl/parser.c index 43703a6622b..7112c06b2de 100644 --- a/usr.sbin/relayctl/parser.c +++ b/usr.sbin/relayctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.4 2006/12/16 18:50:33 reyk Exp $ */ +/* $OpenBSD: parser.c,v 1.5 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -32,7 +32,7 @@ #include <string.h> #include <event.h> -#include "hostated.h" +#include "hoststated.h" #include "parser.h" diff --git a/usr.sbin/relayctl/relayctl.c b/usr.sbin/relayctl/relayctl.c index 0fb2c655b67..026a2747895 100644 --- a/usr.sbin/relayctl/relayctl.c +++ b/usr.sbin/relayctl/relayctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayctl.c,v 1.6 2006/12/16 18:50:33 reyk Exp $ */ +/* $OpenBSD: relayctl.c,v 1.7 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -36,7 +36,7 @@ #include <unistd.h> #include <event.h> -#include "hostated.h" +#include "hoststated.h" #include "parser.h" __dead void usage(void); diff --git a/usr.sbin/relayd/Makefile b/usr.sbin/relayd/Makefile index 16a06450a62..d6bf86856dc 100644 --- a/usr.sbin/relayd/Makefile +++ b/usr.sbin/relayd/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2007/01/08 13:37:26 reyk Exp $ +# $OpenBSD: Makefile,v 1.3 2007/01/09 00:45:32 deraadt Exp $ -PROG= hostated -SRCS= parse.y log.c control.c buffer.c imsg.c hostated.c \ +PROG= hoststated +SRCS= parse.y log.c control.c buffer.c imsg.c hoststated.c \ pfe.c pfe_filter.c hce.c \ check_icmp.c check_tcp.c check_http.c check_send_expect.c MAN= hostated.8 hostated.conf.5 diff --git a/usr.sbin/relayd/buffer.c b/usr.sbin/relayd/buffer.c index 6f462a2d44f..7133094ddfc 100644 --- a/usr.sbin/relayd/buffer.c +++ b/usr.sbin/relayd/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.3 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: buffer.c,v 1.4 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -30,7 +30,7 @@ #include <string.h> #include <unistd.h> -#include "hostated.h" +#include "hoststated.h" int buf_realloc(struct buf *, size_t); void buf_enqueue(struct msgbuf *, struct buf *); diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c index 52f5feb45c2..d48222910cf 100644 --- a/usr.sbin/relayd/check_icmp.c +++ b/usr.sbin/relayd/check_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_icmp.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -34,7 +34,7 @@ #include <string.h> #include <stdlib.h> -#include "hostated.h" +#include "hoststated.h" int icmp6_checks_done(struct ctl_icmp_event *); int icmp4_checks_done(struct ctl_icmp_event *); diff --git a/usr.sbin/relayd/check_tcp.c b/usr.sbin/relayd/check_tcp.c index 2f11cfe1869..86b8244093f 100644 --- a/usr.sbin/relayd/check_tcp.c +++ b/usr.sbin/relayd/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -30,7 +30,7 @@ #include <stdlib.h> #include <errno.h> -#include "hostated.h" +#include "hoststated.h" void tcp_write(int, short, void *); void tcp_host_up(int s, struct ctl_tcp_event *); diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c index 2368ce43e27..c2392cd15dc 100644 --- a/usr.sbin/relayd/control.c +++ b/usr.sbin/relayd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.6 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: control.c,v 1.7 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,7 +31,7 @@ #include <unistd.h> #include <signal.h> -#include "hostated.h" +#include "hoststated.h" #define CONTROL_BACKLOG 5 diff --git a/usr.sbin/relayd/hce.c b/usr.sbin/relayd/hce.c index 065c7f316b5..308a8d7166b 100644 --- a/usr.sbin/relayd/hce.c +++ b/usr.sbin/relayd/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: hce.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -36,7 +36,7 @@ #include <err.h> #include <pwd.h> -#include "hostated.h" +#include "hoststated.h" void hce_sig_handler(int sig, short, void *); void hce_shutdown(void); diff --git a/usr.sbin/relayd/imsg.c b/usr.sbin/relayd/imsg.c index 37c1808e293..fb110a45fb8 100644 --- a/usr.sbin/relayd/imsg.c +++ b/usr.sbin/relayd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.3 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: imsg.c,v 1.4 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -28,7 +28,7 @@ #include <string.h> #include <unistd.h> -#include "hostated.h" +#include "hoststated.h" void imsg_init(struct imsgbuf *ibuf, int fd, void (*handler)(int, short, void *)) diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 38af6b6808a..66c0e120541 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.13 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.14 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -41,7 +41,7 @@ #include <netdb.h> #include <string.h> -#include "hostated.h" +#include "hoststated.h" struct hostated *conf = NULL; static FILE *fin = NULL; diff --git a/usr.sbin/relayd/pfe.c b/usr.sbin/relayd/pfe.c index 573662922fd..1ee1c529937 100644 --- a/usr.sbin/relayd/pfe.c +++ b/usr.sbin/relayd/pfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe.c,v 1.5 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: pfe.c,v 1.6 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -31,7 +31,7 @@ #include <unistd.h> #include <pwd.h> -#include "hostated.h" +#include "hoststated.h" void pfe_sig_handler(int sig, short, void *); void pfe_shutdown(void); diff --git a/usr.sbin/relayd/pfe_filter.c b/usr.sbin/relayd/pfe_filter.c index 4e80d6dc412..50fe7456ad9 100644 --- a/usr.sbin/relayd/pfe_filter.c +++ b/usr.sbin/relayd/pfe_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe_filter.c,v 1.7 2007/01/08 20:46:18 reyk Exp $ */ +/* $OpenBSD: pfe_filter.c,v 1.8 2007/01/09 00:45:32 deraadt Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> -#include "hostated.h" +#include "hoststated.h" struct pfdata { int dev; |