Rename configure option for restricted commands

It is no longer “--enable-remote-commands”, but rather
“--enable-restricted-commands”.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/Makefile.am b/Makefile.am
index b1e8ee9..afc106c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/configure.ac b/configure.ac
index 7bf9580..30136d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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],

diff --git a/lib/backend.py b/lib/backend.py
index d5c0e92..4bd4700 100644 (file)
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -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

diff --git a/lib/constants.py b/lib/constants.py
index 3f32d5e..4f78766 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -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"