X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-lock;h=7e8725d16e18acbd9a32c2aad95251a1a9748b01;hb=ab9b6db10f47351659f37b0d75acfad2d40d2493;hp=7035ed0cbae281a444c9f6e38fd30ee1ce211d47;hpb=521c785c598eb9981c6c0f81a3c3b680e1f0300d;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-lock b/ud-lock
index 7035ed0..7e8725d 100755
--- a/ud-lock
+++ b/ud-lock
@@ -48,8 +48,12 @@ def connect(user):
     return l
 
 def do_one_user(lc, user, ticket):
-    u = UDLdap.Account(user)
-    if not u.account_status() == 'active':
+    try:
+        u = UDLdap.Account.from_search(lc, BaseDn, user)
+    except IndexError, e:
+        sys.stderr.write("Cannot instantiate account from LDAP: %s"%(str(e)))
+        return
+    if not u['accountStatus'] == 'active':
         sys.stderr.write('%s: Account is not active, skipping.  (details: %s)\n'%(user, u.verbose_status()))
         return