From e60d14d97da6ed5ea25e6d7d7cfe8df3c3c6feec Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 22 Jul 2013 11:31:09 -0700 Subject: [PATCH] ceph.in: reject --admin-daemon so it can't do harm Fixes: #3944 Signed-off-by: Dan Mick --- src/ceph.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ceph.in b/src/ceph.in index 6ba92c99b1834..dbb7fb5a8cdc5 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: -- 2.39.5