[SCM] Samba Shared Repository - branch v4-13-test updated

Karolin Seeger kseeger at samba.org
Tue Feb 16 17:17:01 UTC 2021


The branch, v4-13-test has been updated
       via  ac0e7f6a0cd classicupgrade: treat old never expires value right
       via  5957cf2e2ca s3:pysmbd: fix fd leak in py_smbd_create_file()
       via  780fbc30041 HEIMDAL: krb5_storage_free(NULL) should work
      from  cf9066b2153 lib:util: Avoid free'ing our own pointer

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-13-test


- Log -----------------------------------------------------------------
commit ac0e7f6a0cd6a27679762556324a6ec755401824
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Feb 5 12:47:01 2021 +0100

    classicupgrade: treat old never expires value right
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14624
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Feb 10 15:06:49 UTC 2021 on sn-devel-184
    
    (cherry picked from commit df75d82c9de6977c466ee9f01886cb012a9c5fef)
    
    Autobuild-User(v4-13-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-13-test): Tue Feb 16 17:16:21 UTC 2021 on sn-devel-184

commit 5957cf2e2ca6265f233803c23212d307c3ccf530
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 9 13:48:36 2021 +0100

    s3:pysmbd: fix fd leak in py_smbd_create_file()
    
    Various 'samba-tool domain backup' commands use this and will
    fail if there's over ~1000 files in the sysvol folder.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13898
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit d8fa464a2dfb11df4e1db4ebffe8bd28ff118c75)

commit 780fbc3004126175c66ec906910453aed866b163
Author: Paul Wise <pabs3 at bonedaddy.net>
Date:   Mon Feb 29 11:58:45 2016 -0600

    HEIMDAL: krb5_storage_free(NULL) should work
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12505
    
    Signed-off-by: Paul Wise <pabs3 at bonedaddy.net>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Original-author: Nicolas Williams <nico at twosigma.com>
    (cherry-picked from heimdal commit b3db07d5f0e03f6a1a0a392e70f9675e19a6d6af)
    (cherry picked from commit f9ed4f7028a5ed29026ac8ef1b47b63755ba98f8)

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

Summary of changes:
 python/samba/upgrade.py          | 2 +-
 source3/smbd/pysmbd.c            | 3 +++
 source4/heimdal/lib/krb5/store.c | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index 8511bed2868..dff856a8d7c 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -74,7 +74,7 @@ def import_sam_policy(samdb, policy, logger):
 
     if 'maximum password age' in policy:
         max_pw_age_unix = policy['maximum password age']
-        if max_pw_age_unix == -1 or max_pw_age_unix == 0:
+        if max_pw_age_unix == -1 or max_pw_age_unix == 0 or max_pw_age_unix == 0xFFFFFFFF:
             max_pw_age_nt = -0x8000000000000000
         else:
             max_pw_age_nt = int(-max_pw_age_unix * (1e7))
diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index dd4a70ca256..2081a75d52c 100644
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -1144,9 +1144,12 @@ static PyObject *py_smbd_create_file(PyObject *self, PyObject *args, PyObject *k
 	if (!NT_STATUS_IS_OK(status)) {
 		DBG_ERR("init_files_struct failed: %s\n",
 			nt_errstr(status));
+	} else if (fsp != NULL) {
+		SMB_VFS_CLOSE(fsp);
 	}
 
 	TALLOC_FREE(frame);
+	PyErr_NTSTATUS_NOT_OK_RAISE(status);
 	Py_RETURN_NONE;
 }
 
diff --git a/source4/heimdal/lib/krb5/store.c b/source4/heimdal/lib/krb5/store.c
index 17de78e9e74..31afb23c983 100644
--- a/source4/heimdal/lib/krb5/store.c
+++ b/source4/heimdal/lib/krb5/store.c
@@ -270,6 +270,8 @@ krb5_storage_get_eof_code(krb5_storage *sp)
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_storage_free(krb5_storage *sp)
 {
+    if (sp == NULL)
+        return 0;
     if(sp->free)
 	(*sp->free)(sp);
     free(sp->data);


-- 
Samba Shared Repository



More information about the samba-cvs mailing list