[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  1593654 s3-waf: fix some unresolved symbols in idmap ad modules.
       via  e00a6c4 s3-registry: fix bug #8401 - registry/reg_format.c must include includes.h.
      from  68a42bd s4-dsdb: fixed use of RMD flags in ldb search in dirsync module

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


- Log -----------------------------------------------------------------
commit 1593654914afacbeb529b64711eedb19edf14bdc
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 25 13:40:08 2011 +0200

    s3-waf: fix some unresolved symbols in idmap ad modules.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Aug 25 15:15:57 CEST 2011 on sn-devel-104

commit e00a6c40bf13d9c1225022129e4cb1d617aa49bf
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 25 13:39:25 2011 +0200

    s3-registry: fix bug #8401 - registry/reg_format.c must include includes.h.
    
    Guenther

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

Summary of changes:
 source3/registry/reg_format.c  |    1 +
 source3/winbindd/wscript_build |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_format.c b/source3/registry/reg_format.c
index f2b0846..658076c 100644
--- a/source3/registry/reg_format.c
+++ b/source3/registry/reg_format.c
@@ -24,6 +24,7 @@
  * @date   Sep 2010
  */
 
+#include "includes.h"
 #include "reg_format.h"
 #include "reg_parse.h"
 #include "reg_parse_internal.h"
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 3a2e297..12f1bf9 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -31,6 +31,7 @@ bld.SAMBA3_LIBRARY('idmap',
 
 bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX',
                     source=IDMAP_ADEX_SRC,
+                    deps='ads',
                     vars=locals(),
                     enabled=bld.env.HAVE_LDAP)
 
@@ -41,6 +42,7 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
 
 bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
                     source=IDMAP_AD_SRC,
+                    deps='ads',
                     vars=locals(),
                     enabled=bld.env.HAVE_LDAP)
 


-- 
Samba Shared Repository