Commit 1fdeb284 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Rename configure option for restricted commands



It is no longer “--enable-remote-commands”, but rather
“--enable-restricted-commands”.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 6d846d0e
......@@ -1283,7 +1283,7 @@ lib/_autoconf.py: Makefile | stamp-directories
echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
echo "XEN_CMD = '$(XEN_CMD)'"; \
echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
echo "ENABLE_REMOTE_COMMANDS = $(ENABLE_REMOTE_COMMANDS)"; \
echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
} > $@
lib/_vcsversion.py: Makefile vcs-version | stamp-directories
......
......@@ -311,18 +311,18 @@ then
fi
AC_SUBST(SYSLOG_USAGE, $SYSLOG)
AC_ARG_ENABLE([remote-commands],
[AS_HELP_STRING([--enable-remote-commands],
m4_normalize([enable remote commands in the node daemon
AC_ARG_ENABLE([restricted-commands],
[AS_HELP_STRING([--enable-restricted-commands],
m4_normalize([enable restricted commands in the node daemon
(default: disabled)]))],
[[if test "$enableval" = no; then
enable_remote_commands=False
enable_restricted_commands=False
else
enable_remote_commands=True
enable_restricted_commands=True
fi
]],
[enable_remote_commands=False])
AC_SUBST(ENABLE_REMOTE_COMMANDS, $enable_remote_commands)
[enable_restricted_commands=False])
AC_SUBST(ENABLE_RESTRICTED_COMMANDS, $enable_restricted_commands)
# --with-disk-separator=...
AC_ARG_WITH([disk-separator],
......
......@@ -3714,7 +3714,7 @@ def RunRemoteCommand(cmd,
_sleep_fn=time.sleep,
_prepare_fn=_PrepareRemoteCommand,
_runcmd_fn=utils.RunCmd,
_enabled=constants.ENABLE_REMOTE_COMMANDS):
_enabled=constants.ENABLE_RESTRICTED_COMMANDS):
"""Executes a remote command after performing strict tests.
@type cmd: string
......
......@@ -140,7 +140,7 @@ ENABLE_FILE_STORAGE = _autoconf.ENABLE_FILE_STORAGE
ENABLE_SHARED_FILE_STORAGE = _autoconf.ENABLE_SHARED_FILE_STORAGE
ENABLE_CONFD = _autoconf.ENABLE_CONFD
ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY
ENABLE_REMOTE_COMMANDS = _autoconf.ENABLE_REMOTE_COMMANDS
ENABLE_RESTRICTED_COMMANDS = _autoconf.ENABLE_RESTRICTED_COMMANDS
NODED = "ganeti-noded"
CONFD = "ganeti-confd"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment