From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Mon, 17 Mar 2014 14:37:09 +0000 (+0000)
Subject: ceph.in: do not allow using 'tell' with interactive mode
X-Git-Tag: v0.67.8~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21ed54201bd4b0f02c07f6f96a63a5720057f011;p=ceph.git

ceph.in: do not allow using 'tell' with interactive mode

This avoids a lot of hassle when dealing with to whom tell each command
on interactive mode, and even more so if multiple targets are specified.

As so, 'tell' commands should be used while on interactive mode instead.

Backport: dumpling,emperor

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit e39c213c1d230271d23b74086664c2082caecdb9)
---

diff --git a/src/ceph.in b/src/ceph.in
index 1e7315a6c74..ada451ba2f9 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -659,8 +659,15 @@ def main():
     # Repulsive hack to handle tell: lop off 'tell' and target
     # and validate the rest of the command.  'target' is already
     # determined in our callers, so it's ok to remove it here.
+    is_tell = False
     if len(childargs) and childargs[0] == 'tell':
         childargs = childargs[2:]
+        is_tell = True
+
+    if is_tell and not len(childargs):
+        print >> sys.stderr, \
+                'Cannot use \'tell\' with interactive mode'
+        return errno.EINVAL
 
     # fetch JSON sigs from command
     # each line contains one command signature (a placeholder name