The branch, master has been updated via 6d53d9f s4:password_hash LDB module - fix indentation from f2456cd s3: Allow disabling of mdns registrations
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6d53d9f2ce68db1cc2cf6fc0ebaca548bcfb9a42 Author: Matthias Dieter Wallnöfer <m...@samba.org> Date: Fri Nov 5 12:49:42 2010 +0100 s4:password_hash LDB module - fix indentation Autobuild-User: Matthias Dieter Wallnöfer <m...@samba.org> Autobuild-Date: Fri Nov 5 12:31:28 UTC 2010 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source4/dsdb/samdb/ldb_modules/password_hash.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 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 2c7f436..7b02479 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -1300,11 +1300,11 @@ static int setup_given_passwords(struct setup_password_fields_io *io, return ldb_oom(ldb); } if (!convert_string_talloc(io->ac, - CH_UTF8, CH_UTF16, - g->cleartext_utf8->data, - g->cleartext_utf8->length, - (void *)&cleartext_utf16_str, - &converted_pw_len, false)) { + CH_UTF8, CH_UTF16, + g->cleartext_utf8->data, + g->cleartext_utf8->length, + (void *)&cleartext_utf16_str, + &converted_pw_len, false)) { ldb_asprintf_errstring(ldb, "setup_password_fields: " "failed to generate UTF16 password from cleartext UTF8 password"); @@ -1323,11 +1323,11 @@ static int setup_given_passwords(struct setup_password_fields_io *io, return ldb_oom(ldb); } if (!convert_string_talloc(io->ac, - CH_UTF16MUNGED, CH_UTF8, - g->cleartext_utf16->data, - g->cleartext_utf16->length, - (void *)&cleartext_utf8_str, - &converted_pw_len, false)) { + CH_UTF16MUNGED, CH_UTF8, + g->cleartext_utf16->data, + g->cleartext_utf16->length, + (void *)&cleartext_utf8_str, + &converted_pw_len, false)) { /* We can't bail out entirely, as these unconvertable passwords are frustratingly valid */ talloc_free(cleartext_utf8_blob); } else { -- Samba Shared Repository