[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-49-g17a6554

[Volker Lendecke]

The branch, master has been updated
       via  17a65541bd27ce852bec77ef404c6f57ae65a50c (commit)
       via  e3fb71dac8856a67cac4514dca017dd4b939c520 (commit)
      from  46167c1d1b2ee4d77338214494decd9326b7ab93 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 17a65541bd27ce852bec77ef404c6f57ae65a50c
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jun 24 12:41:16 2009 +0200

    Reenable the LDAPI socket for the merged build
    
    It seems that the samba4 part of the merged build does not pick up the
    DEVELOPER flag from the s3 configure.
    
    Jelmer, can you fix that properly?
    
    Thanks,
    
    Volker

commit e3fb71dac8856a67cac4514dca017dd4b939c520
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jun 24 12:39:21 2009 +0200

    Only set the password if there is one

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/pdb_ads.c          |   12 ++++++++----
 source4/ldap_server/ldap_server.c |    2 --
 2 files changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index d7a5db6..f4ab299 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",
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 05a095d..2f32bb6 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -458,9 +458,7 @@ static const struct stream_server_ops ldap_stream_nonpriv_ops = {
 /* The feature removed behind an #ifdef until we can do it properly
  * with an EXTERNAL bind. */
 
-#ifdef DEVELOPER
 #define WITH_LDAPI_PRIV_SOCKET
-#endif
 
 #ifdef WITH_LDAPI_PRIV_SOCKET
 static void ldapsrv_accept_priv(struct stream_connection *c)


-- 
Samba Shared Repository