From: Dan Mick <dan.mick@inktank.com>
Date: Mon, 22 Jul 2013 18:31:09 +0000 (-0700)
Subject: ceph.in: reject --admin-daemon so it can't do harm
X-Git-Tag: v0.67-rc2~19^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e60d14d97da6ed5ea25e6d7d7cfe8df3c3c6feec;p=ceph.git

ceph.in: reject --admin-daemon so it can't do harm

Fixes: #3944
Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 6ba92c99b183..dbb7fb5a8cdc 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -118,6 +118,8 @@ def parse_cmdargs(args=None, target=''):
 
     parser.add_argument('--admin-daemon', dest='admin_socket',
                         help='submit admin-socket commands (\"help\" for help')
+    parser.add_argument('--admin-socket', dest='admin_socket_nope',
+                        help='you probably mean --admin-daemon')
 
     parser.add_argument('-s', '--status', action='store_true',
                         help='show cluster status')
@@ -489,6 +491,11 @@ def main():
     global verbose
     verbose = parsed_args.verbose
 
+    if parsed_args.admin_socket_nope:
+        print >> sys.stderr, '--admin-socket is used by daemons; '\
+        'you probably mean --admin-daemon/daemon'
+        return 1
+
     # pass on --id, --name, --conf
     name = 'client.admin'
     if parsed_args.client_id: