From 9aea6b7bd33ea6a48a10283bc8593980c026bcba Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 2 Aug 2010 21:31:04 +0000 Subject: [PATCH] GenSSHShadow --- UDLdap.py | 2 +- ud-generate | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/UDLdap.py b/UDLdap.py index 6494c0d..f11c8b3 100644 --- a/UDLdap.py +++ b/UDLdap.py @@ -3,7 +3,7 @@ import time import userdir_ldap class Account: - array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL', 'supplementaryGid'] + array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL', 'supplementaryGid', 'sshRSAAuthKey'] int_values = ['shadowExpire', 'gidNumber'] defaults = { 'accountStatus': 'active', diff --git a/ud-generate b/ud-generate index 490376a..412e210 100755 --- a/ud-generate +++ b/ud-generate @@ -324,21 +324,17 @@ def GenSSHShadow(): safe_makedirs(os.path.join(GlobalDir, 'userkeys')) for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not 'sshRSAAuthKey' in a: continue - if x[1].has_key("uidNumber") == 0 or \ - x[1].has_key("sshRSAAuthKey") == 0: - continue - - User = GetAttr(x, "uid") F = None - try: OldMask = os.umask(0077) - File = os.path.join(GlobalDir, 'userkeys', User) + File = os.path.join(GlobalDir, 'userkeys', a['uid']) F = open(File + ".tmp", "w", 0600) os.umask(OldMask) - for I in x[1]["sshRSAAuthKey"]: + for I in a['sshRSAAuthKey']: MultipleLine = "%s" % I MultipleLine = Sanitize(MultipleLine) + "\n" F.write(MultipleLine) -- 2.20.1