X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-info;h=e05cb86e47bb0cfd736577bab588093c57e21798;hb=595923978a9ad55f4ec55b1aabef44683b111911;hp=7000ce9258394ee91c5fe3de611eafa9d693927f;hpb=f27db3e7f5d3bb3fe0d36e1ab15e143ce45d269d;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-info b/ud-info
index 7000ce9..e05cb86 100755
--- a/ud-info
+++ b/ud-info
@@ -17,6 +17,28 @@
 #    -r    Enable 'root' functions, do this if your uid has access to
 #          restricted variables.
 
+#   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2004-2005,7  Joey Schulze <joey@infodrom.org>
+#   Copyright (c) 2001-2006  Ryan Murray <rmurray@debian.org>
+#   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+#   Copyright (c) 2008 Martin Zobel-Helas <zobel@debian.org>
+#   Copyright (c) 2008 Marc 'HE' Brockschmidt <he@debian.org>
+#   Copyright (c) 2008 Mark Hymers <mhy@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
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 import time, os, pwd, sys, getopt, ldap, crypt, readline, copy;
 from userdir_ldap import *;
 
@@ -106,8 +128,8 @@ def PrintShadow(Attrs):
    MinDays = int(GetAttr(Attrs,"shadowMin","0"));
    MaxDays = int(GetAttr(Attrs,"shadowMax","0"));
    WarnDays = int(GetAttr(Attrs,"shadowWarning","0"));
-   InactDays = int(GetAttr(Attrs,"shadowinactive","0"));
-   Expire = int(GetAttr(Attrs,"shadowexpire","0"));
+   InactDays = int(GetAttr(Attrs,"shadowInactive","0"));
+   Expire = int(GetAttr(Attrs,"shadowExpire","0"));
 
    print "%-24s:" % ("Password last changed"),
    print time.strftime("%a %d/%m/%Y %Z",time.localtime(Changed*24*60*60));
@@ -293,7 +315,7 @@ if (BindUser != ""):
    Password = getpass(BindUser + "'s password: ");
 
 # Connect to the ldap server
-l = ldap.open(LDAPServer);
+l = connectLDAP()
 UserDn = "uid=" + BindUser + "," + BaseDn;
 if (BindUser != ""):
    l.simple_bind_s(UserDn,Password);
@@ -417,10 +439,12 @@ while(1):
       l.modify_s(UserDn,[
          (ldap.MOD_REPLACE,"userPassword","{crypt}*LK*"),
          (ldap.MOD_REPLACE,"mailDisableMessage","account locked"),
-         (ldap.MOD_REPLACE,"shadowLastChange",shadowLast)]);
+         (ldap.MOD_REPLACE,"shadowLastChange",shadowLast),
+         (ldap.MOD_REPLACE,"shadowExpire","1")]);
       Attrs[0][1]["userPassword"] = ["{crypt}*LK*"];
       Attrs[0][1]["mailDisableMessage"] = ["account locked"];
       Attrs[0][1]["shadowLastChange"] = [shadowLast];
+      Attrs[0][1]["shadowExpire"] = ["1"];
       continue;
 
    # Handle changing an arbitary value