ud-info: Change the "retired" status to "inactive". inactive covers memorial, remove...

diff --git a/debian/changelog b/debian/changelog
index b825cec..760db40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ userdir-ldap (0.3.XX) unstable; urgency=low
     we were missing prompt information so we got a backtrace.
   * ud-info: Warn when we don't have a prompt string for
     attributes on startup.
+  * ud-info: Change the "retired" status to "inactive".
+    inactive covers memorial, removed, expelled more clearly.
 
- -- Peter Palfrader <weasel@debian.org>  Tue, 08 Jul 2008 09:44:39 +0200
+ -- Peter Palfrader <weasel@debian.org>  Tue, 08 Jul 2008 10:33:51 +0200
 
 userdir-ldap (0.3.33) unstable; urgency=low
 

diff --git a/ud-info b/ud-info
index a94ff91..1c91f1c 100755 (executable)
--- a/ud-info
+++ b/ud-info
@@ -444,7 +444,7 @@ while(1):
 
       print "Set account to:"
       print "  1) retiring (lock account but do not disable mail):"
-      print "  2) retired (lock account and disable mail):"
+      print "  2) inactive (removed/emeritus/... - lock account and disable mail):"
       print "  3) memorial (lock account and disable mail):"
       print "  4) active (do not change other settings, you will have to deal with them)"
       print "  q) return (no change)"
@@ -454,7 +454,7 @@ while(1):
          if Resp == "1":
            newstatus = "retiring %s"%(time.strftime("%Y-%m-%d"))
          else:
-           newstatus = "retired %s"%(time.strftime("%Y-%m-%d"))
+           newstatus = "inactive %s"%(time.strftime("%Y-%m-%d"))
          l.modify_s(UserDn,[(ldap.MOD_REPLACE,"accountStatus",newstatus)])
          Attrs[0][1]["accountStatus"] = [newstatus]