From 815fdb493b2cd3aaa43d01edf3678f1e08812a22 Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Mon, 8 Sep 2014 10:53:40 +0200 Subject: samba-tool: fix reply when zero day pwd expiry is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=10318 Signed-off-by: Bjoern Jacke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Björn Jacke Autobuild-Date(master): Mon Sep 8 14:15:51 CEST 2014 on sn-devel-104 --- python/samba/netcmd/user.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'python/samba/netcmd/user.py') diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index 24dd77df56..344f35fc20 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -450,12 +450,12 @@ Example4 shows how to set the account expiration so that it will never expire. # FIXME: Catch more specific exception raise CommandError("Failed to set expiry for user '%s': %s" % ( username or filter, msg)) - if days: - self.outf.write("Expiry for user '%s' set to %u days.\n" % ( - username or filter, days)) - else: + if noexpiry: self.outf.write("Expiry for user '%s' disabled.\n" % ( username or filter)) + else: + self.outf.write("Expiry for user '%s' set to %u days.\n" % ( + username or filter, days)) class cmd_user_password(Command): -- cgit