From 8a420b08be4c97a11aa8c3e79b2713961d203e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Mon, 8 Sep 2014 10:53:40 +0200 Subject: [PATCH] samba-tool: fix reply when zero day pwd expiry is set BUG: https://bugzilla.samba.org/show_bug.cgi?id=10318 Signed-off-by: Bjoern Jacke --- python/samba/netcmd/user.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index b98ec34..5106d3a 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): -- 2.1.0