From: joey <> Date: Wed, 24 Jan 2007 06:08:05 +0000 (+0000) Subject: Establish *PK* as mechanism for locked accounts with mail forwarding intact. X-Git-Tag: debian_userdir-ldap_0-3-14~17 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=186f30d63f9631fbfbda0b56f59d4f0339f8a9d2 Establish *PK* as mechanism for locked accounts with mail forwarding intact. No subscription to debian-private though, and no way to log in --- diff --git a/ud-generate b/ud-generate index bc85714..03a5186 100755 --- a/ud-generate +++ b/ud-generate @@ -4,7 +4,7 @@ # Copyright (c) 2000-2001 Jason Gunthorpe # Copyright (c) 2003-2004 James Troup -# Copyright (c) 2004-2005 Joey Schulze +# Copyright (c) 2004-2005,7 Joey Schulze # Copyright (c) 2001-2007 Ryan Murray # # This program is free software; you can redistribute it and/or modify @@ -180,7 +180,8 @@ def GenSSHShadow(l,File): # If the account is locked, do not write it. # This is a partial stop-gap. The ssh also needs to change this # to ignore ~/.ssh/authorized* files. - if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1): + if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1) \ + or (string.find(GetAttr(x,"userPassword"),"*PK*") != -1): continue; if x[1].has_key("uidNumber") == 0 or \ @@ -364,7 +365,8 @@ def GenPrivate(l,File): continue; # If the account is locked, do not write it - if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1): + if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1) \ + or (string.find(GetAttr(x,"userPassword"),"*PK*") != -1): continue; # If the account has no PGP key, do not write it