[SCM] Samba Shared Repository - branch master updated

David Disseldorp ddiss at samba.org
Tue Nov 11 08:20:02 MST 2014


The branch, master has been updated
       via  c2bda5b pdb_tdb: Avoid a nasty error message with ctdb
       via  05f8e03 pdb_tdb: Fix a TALLOC/SAFE_FREE mixup
      from  ad35141 selftest: ignore flapping addprinter[ex].print_job_enum test

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


- Log -----------------------------------------------------------------
commit c2bda5bfae2cac4e473f2ae42775d2e35995c790
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 11 10:36:23 2014 +0000

    pdb_tdb: Avoid a nasty error message with ctdb
    
    ctdb gives us 0-sized records for deleted passdb entries
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Tue Nov 11 16:19:37 CET 2014 on sn-devel-104

commit 05f8e0371320b9031d665b0b5a30872213ee66cd
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 11 10:35:50 2014 +0000

    pdb_tdb: Fix a TALLOC/SAFE_FREE mixup
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

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

Summary of changes:
 source3/passdb/pdb_tdb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 0d31c47..d1ff006f 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -602,11 +602,17 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods,
 		return NT_STATUS_NO_SUCH_USER;
 	}
 
+	if (data.dsize == 0) {
+		DEBUG(5, ("%s: Got 0-sized record for key %s\n", __func__,
+			  keystr));
+		return NT_STATUS_NO_SUCH_USER;
+	}
+
   	/* unpack the buffer */
 
 	if (!init_samu_from_buffer(user, SAMU_BUFFER_LATEST, data.dptr, data.dsize)) {
 		DEBUG(0,("pdb_getsampwent: Bad struct samu entry returned from TDB!\n"));
-		SAFE_FREE(data.dptr);
+		TALLOC_FREE(data.dptr);
 		return NT_STATUS_NO_MEMORY;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list