diff options
| author | Dan Mick <dan.mick@inktank.com> | 2013-07-22 11:31:09 -0700 |
|---|---|---|
| committer | Dan Mick <dan.mick@inktank.com> | 2013-07-22 13:12:33 -0700 |
| commit | e60d14d97da6ed5ea25e6d7d7cfe8df3c3c6feec (patch) | |
| tree | 5a795238e1bc06a231c3cd70031eac7d12a76385 | |
| parent | 58c78dbaf357def4c7bf6fb95a0248a1ccf6c3c6 (diff) | |
| download | ceph-e60d14d97da6ed5ea25e6d7d7cfe8df3c3c6feec.tar.gz | |
ceph.in: reject --admin-daemon so it can't do harm
Fixes: #3944
Signed-off-by: Dan Mick <dan.mick@inktank.com>
| -rwxr-xr-x | src/ceph.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ceph.in b/src/ceph.in index 6ba92c99b18..dbb7fb5a8cd 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: |