valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:saltstack/salt into develop

Browse Source
This commit is contained in:
Thomas S Hatch 2012-03-20 12:24:17 -06:00
commit cbe04a5095
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/modules/ssh.py
View File

@ -149,12 +149,21 @@ def _validate_keys(key_file):
options = []
if not options:
enc = comps[0]
key = comps[1]
comment = ' '.join(comps[2:])
# check if key has a space
if len(comps) == 3:
key = comps[1] + ' ' + comps[2]
comment = ' '.join(comps[3:])
else:
key = comps[1]
comment = ' '.join(comps[2:])
else:
enc = comps[1]
key = comps[2]
comment = ' '.join(comps[3:])
if len(comps) == 4:
key = comps[2] + ' ' + comps[3]
comment = ' '.join(comps[4:])
else:
key = comps[2]
comment = ' '.join(comps[3:])
ret[key] = {'enc': enc,
'comment': comment,
'options': options}
@ -196,9 +205,15 @@ def rm_auth_key(user, key, config='.ssh/authorized_keys'):
else:
options = []
if not options:
pkey = comps[1]
if len(comps) == 3:
pkey = comps[1] + ' ' + comps[2]
else:
pkey = comps[1]
else:
pkey = comps[2]
if len(comps) == 3:
pkey = comps[2] + ' ' + comps[3]
else:
pkey = comps[2]
if pkey == key:
continue
else: