The branch, master has been updated
via 9e676b2 dsdb: Fix CID 1364520 Incorrect expression
(EVALUATION_ORDER)
from add6442 ldb_ldb: Do not re-scan the index list for new DNs
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9e676b25ddf562b7abbdc7a0193b20f7ca980986
Author: Volker Lendecke <[email protected]>
Date: Tue Jul 26 12:42:49 2016 +0200
dsdb: Fix CID 1364520 Incorrect expression (EVALUATION_ORDER)
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Tue Jul 26 23:48:19 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/password_hash.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c
b/source4/dsdb/samdb/ldb_modules/password_hash.c
index a6131e2..bb8679c 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2215,9 +2215,8 @@ static int setup_password_fields(struct
setup_password_fields_io *io)
static int setup_smartcard_reset(struct setup_password_fields_io *io)
{
struct ldb_context *ldb = ldb_module_get_ctx(io->ac->module);
- struct loadparm_context *lp_ctx =
- lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),
- struct loadparm_context);
+ struct loadparm_context *lp_ctx = talloc_get_type(
+ ldb_get_opaque(ldb, "loadparm"), struct loadparm_context);
struct supplementalCredentialsBlob scb = { .__ndr_size = 0 };
enum ndr_err_code ndr_err;
--
Samba Shared Repository
