From e3fb71dac8856a67cac4514dca017dd4b939c520 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 24 Jun 2009 12:39:21 +0200 Subject: [PATCH] Only set the password if there is one --- source3/passdb/pdb_ads.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index d7a5db6b03d..f4ab2998446 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -267,12 +267,16 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state, "%s", pdb_get_fullname(sam)); blob = data_blob_const(pdb_get_nt_passwd(sam), NT_HASH_LEN); - ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE, - "unicodePwd", 1, &blob); + if (blob.data != NULL) { + ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE, + "unicodePwd", 1, &blob); + } blob = data_blob_const(pdb_get_lanman_passwd(sam), NT_HASH_LEN); - ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE, - "dBCSPwd", 1, &blob); + if (blob.data != NULL) { + ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE, + "dBCSPwd", 1, &blob); + } ret &= tldap_make_mod_fmt( existing, mem_ctx, pnum_mods, pmods, "userAccountControl",