From: rmurray <>
Date: Mon, 15 Jan 2007 22:14:23 +0000 (+0000)
Subject: only look for *LK*, and not base anything off the fingerprint when disabling mail... 
X-Git-Tag: userdir-ldap-0.3.13~1
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=9126d4b7859fcd0865b4c0d0e6681bae1c838df4

only look for *LK*, and not base anything off the fingerprint when disabling mail for locked accounts
---

diff --git a/ud-generate b/ud-generate
index 8baf226..bc85714 100755
--- a/ud-generate
+++ b/ud-generate
@@ -5,7 +5,7 @@
 #   Copyright (c) 2000-2001  Jason Gunthorpe <jgg@debian.org>
 #   Copyright (c) 2003-2004  James Troup <troup@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
-#   Copyright (c) 2001-2006  Ryan Murray <rmurray@debian.org>
+#   Copyright (c) 2001-2007  Ryan Murray <rmurray@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -403,8 +403,7 @@ def GenMailDisable(l,File):
       Reason = None
       
       # If the account is locked, disable incoming mail
-      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1) or \
-         x[1].has_key("keyFingerPrint") == 0:
+      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1):
          Reason = "user account locked"
       else:
          if x[1].has_key("mailDisableMessage"):