# HG changeset patch
# User Yi Qiang <yqiang@gmail.com>
# Date 1211868153 25200
# Node ID 4dc10f052453f49fb87c1efaf7147c404793d406
# Parent d4f7950871be9f64b52f9e4321ebe0bc128a4c1f
Fix adding default users.
diff -r d4f7950871be -r 4dc10f052453 sage/dsage/scripts/dsage_setup.py
|
a
|
b
|
|
| 70 | 70 | username = getuser() |
| 71 | 71 | pubkey_file = os.path.join(DSAGE_DIR, 'dsage_key.pub') |
| 72 | 72 | pubkey = keys.Key.fromFile(pubkey_file) |
| | 73 | pubkey_str = pubkey.toString(type='openssh') |
| 73 | 74 | if clientdb.get_client(username) is None: |
| 74 | | clientdb.add_client(username, pubkey.toString(type='openssh')) |
| | 75 | clientdb.add_client(username, pubkey_str) |
| 75 | 76 | print 'Added user %s.\n' % (username) |
| 76 | 77 | else: |
| 77 | 78 | client = clientdb.get_client(username) |
| 78 | | if client.public_key != pubkey |
| | 79 | if client.public_key != pubkey_str: |
| 79 | 80 | clientdb.del_client(username) |
| 80 | | clientdb.add_client(username, pubkey |
| | 81 | clientdb.add_client(username, pubkey_str) |
| 81 | 82 | print "User %s's pubkey changed, setting to new one." % (username) |
| 82 | 83 | else: |
| 83 | 84 | print 'User %s already exists.' % (username) |
