[SCM] Samba Shared Repository - branch master updated
Martin Schwenke
martins at samba.org
Tue Jul 2 04:45:01 UTC 2024
The branch, master has been updated
via 03e9575e38d s3:smbd: Avoid compiler warning for unused label
via e50a69334ea s4:dsdb: Remove unnecessary MIN()
via 50c37d618f8 lib:krb5_wrap: Fix code spelling
via 66928d858f3 s4:auth: Correct order of parameters in documentation
via ec73e99792d s3:rpc_server: Fix code spelling
via 239a8f277ca lib:crypto: Remove unused macro definitions
via 939481329ee perftest:ndr_pack_performance: Remove obselete comment
via 4844b1c34cb perftest:ndr_pack_performance: Remove unused import
via 32cd94b1e4a s3:rpc_server: Update deprecated directives
via a9ad964cf16 pyglue: Remove global variables used in only one place
via c4728578def s4:dsdb: Use appropriate type for userAccountControl flags
via 3dffd0fa677 s4:auth: Use appropriate type for userAccountControl flags
via 8a456f373f7 s3:param: Check return value of strlower_m() (CID 1598446)
via 9853bd69eb2 tests/krb5: Simplify code using dict.get()
via 7ae89d8d3c7 tests/krb5: Fix type errors by giving ‘pwd_last_set’ an appropriate type
from 60550fbe184 Fix starvation of pending writes in CTDB queues
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 03e9575e38d737e0972d4736a80949dcdb515c44
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Mon Jul 1 15:55:13 2024 +1200
s3:smbd: Avoid compiler warning for unused label
If either of HAVE_FSTATFS and HAVE_LINUX_MAGIC_H are not defined, gcc
produces the following error:
../../source3/smbd/open.c: In function ‘reopen_from_fsp’:
../../source3/smbd/open.c:1222:1: error: label ‘namebased_open’ defined but not used [-Werror=unused-label]
1222 | namebased_open:
| ^~~~~~~~~~~~~~
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Tue Jul 2 04:44:56 UTC 2024 on atb-devel-224
commit e50a69334eaf6cadcf3ce93ab8b48e64c8940058
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Thu Jan 18 15:16:36 2024 +1300
s4:dsdb: Remove unnecessary MIN()
Since we have ensured that val->length >= sizeof(hash->hash),
MIN(val->length, sizeof(hash->hash)) will here always be equal to
sizeof(hash->hash).
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 50c37d618f8037e5b7f9e3e0efd9aa0baea394bf
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Wed Jan 17 13:21:04 2024 +1300
lib:krb5_wrap: Fix code spelling
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 66928d858f31cc08b9999d2cbe69bf34cab8ab5e
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Wed Jan 17 12:45:15 2024 +1300
s4:auth: Correct order of parameters in documentation
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit ec73e99792d4b368d57d6d4d6f1e01b95e5c88e4
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Tue Jan 16 10:38:27 2024 +1300
s3:rpc_server: Fix code spelling
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 239a8f277ca5b30baac2255a720d8d43d12bfc69
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Tue Dec 5 15:40:30 2023 +1300
lib:crypto: Remove unused macro definitions
As we now require GnuTLS 3.6.13, we can rely on GnuTLS providing these
macros.
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 939481329ee06692ef832cfd374a994dabfbf8b6
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Mon Jan 8 17:22:39 2024 +1300
perftest:ndr_pack_performance: Remove obselete comment
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 4844b1c34cbc362b6103a13f7a67c95ad52c26af
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Mon Jan 8 17:22:21 2024 +1300
perftest:ndr_pack_performance: Remove unused import
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 32cd94b1e4a8cf98087819c7edff71aae0adc5ec
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Fri Dec 22 13:35:26 2023 +1300
s3:rpc_server: Update deprecated directives
‘api.prefix’ and ‘parse.error’ have both been supported since Bison 3.0.
/data/samba/source3/rpc_server/mdssvc/es_parser.y:98.1-21: warning: deprecated directive: ‘%name-prefix "mdsyyl"’, use ‘%define api.prefix {mdsyyl}’ [-Wdeprecated]
98 | %name-prefix "mdsyyl"
| ^~~~~~~~~~~~~~~~~~~~~
| %define api.prefix {mdsyyl}
/data/samba/source3/rpc_server/mdssvc/es_parser.y:100.1-14: warning: deprecated directive: ‘%error-verbose’, use ‘%define parse.error verbose’ [-Wdeprecated]
100 | %error-verbose
| ^~~~~~~~~~~~~~
| %define parse.error verbose
/data/samba/source3/rpc_server/mdssvc/es_parser.y: warning: fix-its can be applied. Rerun with option '--update'. [-Wother]
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit a9ad964cf16c691a8cd97c1e7fa6416b66c85e95
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Tue Dec 12 17:38:02 2023 +1300
pyglue: Remove global variables used in only one place
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c4728578def951666cfa525eca403cd1a2f90852
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Fri Jun 14 10:43:07 2024 +1200
s4:dsdb: Use appropriate type for userAccountControl flags
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 3dffd0fa6775e6c1d3bfddb4165a28d3f46980ae
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Fri Jun 14 10:42:51 2024 +1200
s4:auth: Use appropriate type for userAccountControl flags
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 8a456f373f74bc09d46a53604a71c0850d74b6d0
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Tue Jun 11 15:10:02 2024 +1200
s3:param: Check return value of strlower_m() (CID 1598446)
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 9853bd69eb2fe28a122431e497b09fc881dedc1e
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Tue Jul 2 14:55:45 2024 +1200
tests/krb5: Simplify code using dict.get()
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 7ae89d8d3c74e946125b7419f9a1459a5439f8d8
Author: Jo Sutton <josutton at catalyst.net.nz>
Date: Thu May 16 14:41:17 2024 +1200
tests/krb5: Fix type errors by giving ‘pwd_last_set’ an appropriate type
Signed-off-by: Jo Sutton <josutton at catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
lib/crypto/gnutls_helpers.h | 9 -------
lib/krb5_wrap/krb5_samba.c | 6 ++---
python/pyglue.c | 33 +++++++++--------------
python/samba/tests/krb5/pkinit_tests.py | 29 +++++---------------
source3/param/loadparm.c | 6 ++++-
source3/rpc_server/mdssvc/es_parser.y | 4 +--
source3/rpc_server/mdssvc/sparql_parser.y | 4 +--
source3/rpc_server/witness/srv_witness_nt.c | 2 +-
source3/smbd/open.c | 2 ++
source4/auth/kerberos/srv_keytab.c | 2 +-
source4/auth/sam.c | 2 +-
source4/dsdb/common/util.c | 4 +--
source4/dsdb/tests/python/ndr_pack_performance.py | 8 ------
13 files changed, 38 insertions(+), 73 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/crypto/gnutls_helpers.h b/lib/crypto/gnutls_helpers.h
index 6699ebc0196..b8117fe8335 100644
--- a/lib/crypto/gnutls_helpers.h
+++ b/lib/crypto/gnutls_helpers.h
@@ -24,15 +24,6 @@
#include "libcli/util/werror.h"
#include "lib/util/data_blob.h"
-/* Those macros are only available in GnuTLS >= 3.6.4 */
-#ifndef GNUTLS_FIPS140_SET_LAX_MODE
-#define GNUTLS_FIPS140_SET_LAX_MODE()
-#endif
-
-#ifndef GNUTLS_FIPS140_SET_STRICT_MODE
-#define GNUTLS_FIPS140_SET_STRICT_MODE()
-#endif
-
#ifdef DOXYGEN
/**
* @brief Convert a gnutls error code to a corresponding NTSTATUS.
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index e477aef37b3..517f190f217 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2245,7 +2245,7 @@ krb5_error_code smb_krb5_keyblock_init_contents(krb5_context context,
*
* @param[in] cc The credential cache to put the tgt in.
*
- * @param[in] principal The client princial
+ * @param[in] principal The client principal
*
* @param[in] keyblock The keyblock to use.
*
@@ -2358,7 +2358,7 @@ done:
*
* @param[in] cc The credential cache to put the tgt in.
*
- * @param[in] principal The client princial
+ * @param[in] principal The client principal
*
* @param[in] password The password (or NULL).
*
@@ -2431,7 +2431,7 @@ done:
*
* @param[in] cc The credential cache to store the tgt in.
*
- * @param[in] principal The initial client princial.
+ * @param[in] principal The initial client principal.
*
* @param[in] password The password (or NULL).
*
diff --git a/python/pyglue.c b/python/pyglue.c
index 27cd41d5b9c..042bf9e14f3 100644
--- a/python/pyglue.c
+++ b/python/pyglue.c
@@ -29,11 +29,6 @@
#include "lib/cmdline/cmdline.h"
#include "lib/crypto/gkdi.h"
-static PyObject *PyExc_NTSTATUSError;
-static PyObject *PyExc_WERRORError;
-static PyObject *PyExc_HRESULTError;
-static PyObject *PyExc_DsExtendedError;
-
static PyObject *py_generate_random_str(PyObject *self, PyObject *args)
{
Py_ssize_t len;
@@ -610,28 +605,24 @@ MODULE_INIT_FUNC(_glue)
PyModule_AddObject(m, "version",
PyUnicode_FromString(SAMBA_VERSION_STRING));
- PyExc_NTSTATUSError = PyErr_NewException("samba.NTSTATUSError", PyExc_RuntimeError, NULL);
- if (PyExc_NTSTATUSError != NULL) {
- Py_INCREF(PyExc_NTSTATUSError);
- PyModule_AddObject(m, "NTSTATUSError", PyExc_NTSTATUSError);
+ py_obj = PyErr_NewException("samba.NTSTATUSError", PyExc_RuntimeError, NULL);
+ if (py_obj != NULL) {
+ PyModule_AddObject(m, "NTSTATUSError", py_obj);
}
- PyExc_WERRORError = PyErr_NewException("samba.WERRORError", PyExc_RuntimeError, NULL);
- if (PyExc_WERRORError != NULL) {
- Py_INCREF(PyExc_WERRORError);
- PyModule_AddObject(m, "WERRORError", PyExc_WERRORError);
+ py_obj = PyErr_NewException("samba.WERRORError", PyExc_RuntimeError, NULL);
+ if (py_obj != NULL) {
+ PyModule_AddObject(m, "WERRORError", py_obj);
}
- PyExc_HRESULTError = PyErr_NewException("samba.HRESULTError", PyExc_RuntimeError, NULL);
- if (PyExc_HRESULTError != NULL) {
- Py_INCREF(PyExc_HRESULTError);
- PyModule_AddObject(m, "HRESULTError", PyExc_HRESULTError);
+ py_obj = PyErr_NewException("samba.HRESULTError", PyExc_RuntimeError, NULL);
+ if (py_obj != NULL) {
+ PyModule_AddObject(m, "HRESULTError", py_obj);
}
- PyExc_DsExtendedError = PyErr_NewException("samba.DsExtendedError", PyExc_RuntimeError, NULL);
- if (PyExc_DsExtendedError != NULL) {
- Py_INCREF(PyExc_DsExtendedError);
- PyModule_AddObject(m, "DsExtendedError", PyExc_DsExtendedError);
+ py_obj = PyErr_NewException("samba.DsExtendedError", PyExc_RuntimeError, NULL);
+ if (py_obj != NULL) {
+ PyModule_AddObject(m, "DsExtendedError", py_obj);
}
ret = PyModule_AddIntConstant(m, "GKDI_L1_KEY_ITERATION", gkdi_l1_key_iteration);
diff --git a/python/samba/tests/krb5/pkinit_tests.py b/python/samba/tests/krb5/pkinit_tests.py
index 1c87b041ad2..dbd158b2dc2 100755
--- a/python/samba/tests/krb5/pkinit_tests.py
+++ b/python/samba/tests/krb5/pkinit_tests.py
@@ -39,7 +39,7 @@ import ldb
import samba.tests
from samba import credentials, generate_random_password, ntstatus
from samba.nt_time import (nt_time_delta_from_timedelta,
- nt_now, string_from_nt_time)
+ nt_now, NtTime, string_from_nt_time)
from samba.dcerpc import security, netlogon
from samba.dsdb import UF_PASSWORD_EXPIRED, UF_DONT_EXPIRE_PASSWD
from samba.tests.pso import PasswordSettings
@@ -626,10 +626,7 @@ class PkInitTests(KDCBaseTest):
attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"])
msg = msgs[0]
- try:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]
- except KeyError:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = None
+ old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts")
self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts,
samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts)
@@ -752,10 +749,7 @@ class PkInitTests(KDCBaseTest):
attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"])
msg = msgs[0]
- try:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]
- except KeyError:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = None
+ old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts")
self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts,
samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts)
@@ -834,10 +828,7 @@ class PkInitTests(KDCBaseTest):
attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"])
msg = msgs[0]
- try:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]
- except KeyError:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = None
+ old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts")
self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts,
samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts)
@@ -1025,10 +1016,7 @@ class PkInitTests(KDCBaseTest):
attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"])
msg = msgs[0]
- try:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]
- except KeyError:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = None
+ old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts")
self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts,
samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts)
@@ -1117,10 +1105,7 @@ class PkInitTests(KDCBaseTest):
attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"])
msg = msgs[0]
- try:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]
- except KeyError:
- old_ExpirePasswordsOnSmartCardOnlyAccounts = None
+ old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts")
self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts,
samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts)
@@ -1218,7 +1203,7 @@ class PkInitTests(KDCBaseTest):
self._test_samlogon(creds=client_creds,
logon_type=netlogon.NetlogonNetworkInformation)
- pwd_last_set = int(res[0]["pwdLastSet"][0])
+ pwd_last_set = NtTime(int(res[0]["pwdLastSet"][0]))
self.assertGreater(pwd_last_set, 0)
# This just checks the value is sensible
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 12307846c48..663edb2c653 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4790,6 +4790,7 @@ const char *lp_dns_hostname(void)
const char *dns_hostname = lp__dns_hostname();
const char *dns_domain = lp_dnsdomain();
char *netbios_name = NULL;
+ bool ok;
if (dns_hostname != NULL && dns_hostname[0] != '\0') {
return dns_hostname;
@@ -4799,7 +4800,10 @@ const char *lp_dns_hostname(void)
if (netbios_name == NULL) {
return NULL;
}
- strlower_m(netbios_name);
+ ok = strlower_m(netbios_name);
+ if (!ok) {
+ return NULL;
+ }
/* If it isn't set, try to initialize with [netbios name].[realm] */
if (dns_domain != NULL && dns_domain[0] != '\0') {
diff --git a/source3/rpc_server/mdssvc/es_parser.y b/source3/rpc_server/mdssvc/es_parser.y
index 3fbdf93ec75..023f8790a14 100644
--- a/source3/rpc_server/mdssvc/es_parser.y
+++ b/source3/rpc_server/mdssvc/es_parser.y
@@ -95,9 +95,9 @@
struct es_attr_map *attr_map;
}
-%name-prefix "mdsyyl"
+%define api.prefix {mdsyyl}
%expect 1
-%error-verbose
+%define parse.error verbose
%type <sval> match expr line function value isodate
%type <attr_map> attribute
diff --git a/source3/rpc_server/mdssvc/sparql_parser.y b/source3/rpc_server/mdssvc/sparql_parser.y
index 68d4d870eb6..19d42d4e54d 100644
--- a/source3/rpc_server/mdssvc/sparql_parser.y
+++ b/source3/rpc_server/mdssvc/sparql_parser.y
@@ -66,9 +66,9 @@
time_t tval;
}
-%name-prefix "mdsyy"
+%define api.prefix {mdsyy}
%expect 5
-%error-verbose
+%define parse.error verbose
%type <sval> match expr line function
%type <tval> date
diff --git a/source3/rpc_server/witness/srv_witness_nt.c b/source3/rpc_server/witness/srv_witness_nt.c
index 7e5918e3aac..148de387017 100644
--- a/source3/rpc_server/witness/srv_witness_nt.c
+++ b/source3/rpc_server/witness/srv_witness_nt.c
@@ -435,7 +435,7 @@ static void swn_service_interface_changed(struct swn_service_globals *swn,
{
/*
* Remember the current state unless we already
- * hit WITNESS_STATE_UNAVAILAVLE before we notified
+ * hit WITNESS_STATE_UNAVAILABLE before we notified
* the client
*/
reg->change_notification.last_ip_state = iface->state;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3b1e9700db3..0c101c19b46 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1219,7 +1219,9 @@ static NTSTATUS reopen_from_fsp(struct files_struct *dirfsp,
return NT_STATUS_OK;
}
+#if defined(HAVE_FSTATFS) && defined(HAVE_LINUX_MAGIC_H)
namebased_open:
+#endif
/*
* Close the existing pathref fd and set the fsp flag
* is_pathref to false so we get a "normal" fd this time.
diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c
index 875d06971cc..20de668649b 100644
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -432,8 +432,8 @@ NTSTATUS smb_krb5_fill_keytab_gmsa_keys(TALLOC_CTX *mem_ctx,
* @param[in] num_SPNs Length of SPNs
* @param[in] saltPrincipal Salt used for AES encryption.
* Required, unless delete_all_kvno is set.
- * @param[in] old_secret Old password
* @param[in] new_secret New password
+ * @param[in] old_secret Old password
* @param[in] kvno Current key version number
* @param[in] supp_enctypes msDS-SupportedEncryptionTypes bit-field
* @param[in] delete_all_kvno Removes all obsolete entries, without
diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index 093d29080ec..f21827118cf 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -1003,7 +1003,7 @@ NTSTATUS authsam_reread_user_logon_data(
TALLOC_CTX *tmp_ctx = NULL;
const struct ldb_val *v = NULL;
struct ldb_result *res = NULL;
- uint16_t acct_flags = 0;
+ uint32_t acct_flags = 0;
const char *attr_name = "msDS-User-Account-Control-Computed";
NTSTATUS status = NT_STATUS_OK;
int ret;
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 689fbd22a38..757133eb277 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -539,7 +539,7 @@ struct samr_Password *samdb_result_hash(TALLOC_CTX *mem_ctx, const struct ldb_me
return NULL;
}
talloc_keep_secret(hash);
- memcpy(hash->hash, val->data, MIN(val->length, sizeof(hash->hash)));
+ memcpy(hash->hash, val->data, sizeof(hash->hash));
}
return hash;
}
@@ -645,7 +645,7 @@ NTSTATUS samdb_result_passwords(TALLOC_CTX *mem_ctx,
const struct ldb_message *msg,
struct samr_Password **nt_pwd)
{
- uint16_t acct_flags;
+ uint32_t acct_flags;
acct_flags = samdb_result_acct_flags(msg,
"msDS-User-Account-Control-Computed");
diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py
index 45c1816df39..75b0939ce09 100644
--- a/source4/dsdb/tests/python/ndr_pack_performance.py
+++ b/source4/dsdb/tests/python/ndr_pack_performance.py
@@ -1,19 +1,11 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-import optparse
import sys
sys.path.insert(0, 'bin/python')
import samba
import gzip
-# We try to use the test infrastructure of Samba 4.3+, but if it
-# doesn't work, we are probably in a back-ported patch and trying to
-# run on 4.1 or something.
-#
-# Don't copy this horror into ordinary tests -- it is special for
-# performance tests that want to apply to old versions.
-
from samba.tests.subunitrun import TestProgram
from samba.ndr import ndr_pack, ndr_unpack
--
Samba Shared Repository
More information about the samba-cvs
mailing list