diff options
| author | Björn Jacke <bj@sernet.de> | 2014-09-08 10:53:40 +0200 |
|---|---|---|
| committer | Bjoern Jacke <bj@sernet.de> | 2014-09-08 14:15:51 +0200 |
| commit | 815fdb493b2cd3aaa43d01edf3678f1e08812a22 (patch) | |
| tree | 5887c9031306fa056a4e34c9e6d864f9f217c24e /python | |
| parent | 01a18811cc7e8a7fb81c4656a0c9a426f0b8f8f2 (diff) | |
| download | samba-815fdb493b2cd3aaa43d01edf3678f1e08812a22.tar.gz samba-815fdb493b2cd3aaa43d01edf3678f1e08812a22.tar.xz samba-815fdb493b2cd3aaa43d01edf3678f1e08812a22.zip | |
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 <bj@sernet.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Mon Sep 8 14:15:51 CEST 2014 on sn-devel-104
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/netcmd/user.py | 8 |
1 files changed, 4 insertions, 4 deletions
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): |