rediffed patches

[packages/samba.git] / unicodePwd-nthash-values-over-LDAP.patch

diff --git a/unicodePwd-nthash-values-over-LDAP.patch b/unicodePwd-nthash-values-over-LDAP.patch
index e7f7c420165558d0a9a5b0137d7939e6ac3d660d..5d50f43eff1da12f3b9d226e452ff206f558b63d 100644 (file)
--- a/unicodePwd-nthash-values-over-LDAP.patch
+++ b/unicodePwd-nthash-values-over-LDAP.patch
@@ -10,8 +10,8 @@ Allow setting unicodePwd with NTHash vlue over LDAP
 -      { DSDB_CONTROL_PASSWORD_HASH_VALUES_OID, NULL, NULL },
 +      { DSDB_CONTROL_PASSWORD_HASH_VALUES_OID, decode_flag_request, encode_flag_request },
        { DSDB_CONTROL_PASSWORD_CHANGE_OID, NULL, NULL },
+       { DSDB_CONTROL_PASSWORD_ACL_VALIDATION_OID, NULL, NULL },
        { DSDB_CONTROL_APPLY_LINKS, NULL, NULL },
-       { LDB_CONTROL_BYPASS_OPERATIONAL_OID, NULL, NULL },
 --- samba-4.0.7/source4/dsdb/samdb/ldb_modules/password_hash.c~        2013-07-02 20:01:42.731518064 +0200
 +++ samba-4.0.7/source4/dsdb/samdb/ldb_modules/password_hash.c 2013-07-02 20:39:24.909757777 +0200
 @@ -3386,10 +3386,29 @@