pgpool2.git / summary / log / commit / refs
commit 4bb4cd5818834c9987b7363eafa0d7360b4742e7
Author: Yugo Nagata <nagata@sraoss.co.jp>
Date: Fri Apr 26 12:21:49 2013 +0000
Merge branch 'feature/watchdog_for_v3_3'
Conflicts:
pool_config.c
aclocal.m4 | 7877 +----------------------------------------------
configure | 22 +-
main.c | 126 +-
parser/Makefile.in | 7 +-
pcp/Makefile.in | 7 +-
pgpool.conf.sample | 35 +
pool_config.c | 1606 +++++-----
pool_config.h | 47 +-
pool_config.l | 183 +-
pool_memqcache.c | 98 +
pool_memqcache.h | 1 +
watchdog/Makefile.am | 4 +-
watchdog/Makefile.in | 16 +-
watchdog/watchdog.c | 271 +-
watchdog/watchdog.h | 125 +-
watchdog/wd_child.c | 105 +-
watchdog/wd_ext.h | 42 +-
watchdog/wd_if.c | 1 +
watchdog/wd_init.c | 34 +-
watchdog/wd_interlock.c | 217 ++
watchdog/wd_lifecheck.c | 263 +-
watchdog/wd_list.c | 159 +-
watchdog/wd_packet.c | 280 +-
watchdog/wd_udp.c | 533 ++++
24 files changed, 3141 insertions(+), 8918 deletions(-)
diff --cc main.c
index 5d7659504,2b3e9f47b..c16d7c982
--- a/main.c
+++ b/main.c
@@@ -423,12 -423,22 +423,12 @@@ int main(int argc, char **argv
/* watchdog must be started under the privileged user */
if (pool_config->use_watchdog )
{
- /* check sticky bit of network interface control commands */
- if (wd_chk_sticky() == 1)
+ /* check setuid bit of network interface control commands */
+ if (wd_chk_setuid() == 1)
{
- /* if_up, if_down and arping command have a sticky bit */
- pool_log("watchdog might call network commands which using sticky bit.");
+ /* if_up, if_down and arping command have a setuid bit */
+ pool_log("watchdog might call network commands which using setuid bit.");
}
- else
- {
- /* check root */
- if (geteuid() != 0)
- {
- pool_error("watchdog must be started under the privileged user ID to up/down virtual network interface.");
- pool_shmem_exit(1);
- exit(1);
- }
- }
}
/* set signal masks */
diff --cc parser/Makefile.in
index 5ee6d25da,fb4ef0a54..b17db4f13
--- a/parser/Makefile.in
+++ b/parser/Makefile.in
@@@ -35,11 -35,14 +35,14 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = parser
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in gram.c \
- gram.h
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ gram.c gram.h
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/c-compiler.m4 \
- $(top_srcdir)/c-library.m4 $(top_srcdir)/general.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/c-compiler.m4 $(top_srcdir)/c-library.m4 \
+ $(top_srcdir)/general.m4 \
$(top_srcdir)/ac_func_accept_argtypes.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
[parent: d549074d3035]