[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Mon Sep 8 06:16:04 MDT 2014


The branch, master has been updated
       via  815fdb4 samba-tool: fix reply when zero day pwd expiry is set
      from  01a1881 s3: smbd: smb2-sessionsetup. Fix use after free when the sessionsetup request state is freed before struct smbXsrv_session struct.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 815fdb493b2cd3aaa43d01edf3678f1e08812a22
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Sep 8 10:53:40 2014 +0200

    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 at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Mon Sep  8 14:15:51 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 python/samba/netcmd/user.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 24dd77d..344f35f 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):


-- 
Samba Shared Repository


More information about the samba-cvs mailing list