[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  f448a1649cf pyldb: Fix a copy&paste error, CID 1524512 DEADCODE
       via  5533ae3be06 lib:talloc: Move talloc_get_size() out of the talloc reference group
      from  76573d6d8f1 s3: libcli: Refuse to connect to any server with zero values for max_trans_size, max_read_size, max_write_size.

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


- Log -----------------------------------------------------------------
commit f448a1649cf4af11f1ceba55ec62e9b2a3db24f1
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Mar 25 16:34:57 2023 +0100

    pyldb: Fix a copy&paste error, CID 1524512 DEADCODE
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Mar 30 08:08:32 UTC 2023 on atb-devel-224

commit 5533ae3be0689de763aa034311a7b12b6fba9775
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Mar 28 10:17:29 2023 +0200

    lib:talloc: Move talloc_get_size() out of the talloc reference group
    
    This is not specific to talloc references.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 lib/ldb/pyldb.c     |  2 +-
 lib/talloc/talloc.h | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index b7bc3bf0e62..4574f398c92 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -1768,7 +1768,7 @@ static PyObject *ldb_ldif_to_pyobject(struct ldb_context *ldb, struct ldb_ldif *
 			deleteoldrdn_obj = Py_False;
 		}
 		newdn_obj = pyldb_Dn_FromDn(newdn);
-		if (olddn_obj == NULL) {
+		if (newdn_obj == NULL) {
 			deleteoldrdn_obj = NULL;
 			Py_CLEAR(olddn_obj);
 			return NULL;
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index c466c36406b..711e70bd190 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -665,6 +665,19 @@ _PUBLIC_ void *talloc_parent(const void *ptr);
  */
 _PUBLIC_ const char *talloc_parent_name(const void *ptr);
 
+/**
+ * @brief Get the size of a talloc chunk.
+ *
+ * This function lets you know the amount of memory allocated so far by
+ * this context. It does NOT account for subcontext memory.
+ * This can be used to calculate the size of an array.
+ *
+ * @param[in]  ctx      The talloc chunk.
+ *
+ * @return              The size of the talloc chunk.
+ */
+_PUBLIC_ size_t talloc_get_size(const void *ctx);
+
 /**
  * @brief Get the total size of a talloc chunk including its children.
  *
@@ -1070,19 +1083,6 @@ _PUBLIC_ int talloc_unlink(const void *context, void *ptr);
  */
 _PUBLIC_ void *talloc_autofree_context(void) _DEPRECATED_;
 
-/**
- * @brief Get the size of a talloc chunk.
- *
- * This function lets you know the amount of memory allocated so far by
- * this context. It does NOT account for subcontext memory.
- * This can be used to calculate the size of an array.
- *
- * @param[in]  ctx      The talloc chunk.
- *
- * @return              The size of the talloc chunk.
- */
-_PUBLIC_ size_t talloc_get_size(const void *ctx);
-
 /**
  * @brief Show the parentage of a context.
  *


-- 
Samba Shared Repository