[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  9f0d1c7 heimdal: Attempt to fix path of hdb_asn1.h
       via  cbd4891 dsdb: Module aliases require to be prefixed with the subsystem name.
      from  fb8bbd2 dcerpc_samr: Fix -l arguments for dcerpc_samr and dcerpc_atsvc.

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


- Log -----------------------------------------------------------------
commit 9f0d1c72be4f763f3323e7627158ea5a68faa02b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Oct 18 01:28:53 2010 +0200

    heimdal: Attempt to fix path of hdb_asn1.h
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Mon Oct 18 00:15:11 UTC 2010 on sn-devel-104

commit cbd4891808025bcb9ada4546cb343bf458821602
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Oct 18 01:17:56 2010 +0200

    dsdb: Module aliases require to be prefixed with the subsystem name.

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/wscript_build |    4 ++--
 source4/heimdal_build/wscript_build          |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index c6aa1d5..f5402ba 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
 
 bld.SAMBA_MODULE('ldb_simple_ldap_map',
 	source='simple_ldap_map.c',
-	aliases='entryuuid nsuniqueid',
+	aliases='ldb_entryuuid ldb_nsuniqueid',
 	subsystem='ldb',
 	init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
 	internal_module=False,
@@ -173,7 +173,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
 
 bld.SAMBA_MODULE('ldb_extended_dn_out',
 	source='extended_dn_out.c',
-	aliases='extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds',
+	aliases='ldb_extended_dn_out_ldb ldb_extended_dn_out_openldap ldb_extended_dn_out_fds',
 	subsystem='ldb',
 	deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB',
 	internal_module=False,
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f07a8ef..87ff3f5 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -378,6 +378,7 @@ HEIMDAL_ASN1('HEIMDAL_KX509_ASN1',
 
 
 HEIMDAL_ASN1('HEIMDAL_HDB_ASN1', 'lib/hdb/hdb.asn1',
+    directory='lib/asn1',
     includes='../heimdal/lib/asn1')
 
 HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET', 'lib/asn1/asn1_err.et')


-- 
Samba Shared Repository