build: Rename idmap to samba_idmap to make library name more unique

We may wish to store the BUNDLED_LIBRARY_EXTENSION for private, unbundled libs to avoid
this in the future, but for now this fixes OpenIndiana which has a libidmap.so

Andrew Bartlett

diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index aacd859680b6be2684e303b9cbacfd56a8f5c911..869a929244d4e756f35f33e047de6548e3fe621e 100644 (file)
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -17,7 +17,7 @@ IDMAP_AUTORID_SRC = '''idmap_autorid.c'''
 IDMAP_RW_SRC = 'idmap_rw.c'
 IDMAP_SRC = 'idmap.c idmap_util.c idmap_tdb_common.c ${IDMAP_RW_SRC}'
 
-bld.SAMBA3_LIBRARY('idmap',
+bld.SAMBA3_LIBRARY('samba_idmap',
                    source=IDMAP_SRC,
                    deps='samba-util',
                    vars=locals(),
@@ -36,7 +36,7 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
                     enabled=bld.CONFIG_SET("HAVE_LDAP"))
 
 bld.SAMBA3_MODULE('idmap_ad',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  allow_undefined_symbols=True,
                  source='',
                  deps='IDMAP_AD',
@@ -45,7 +45,7 @@ bld.SAMBA3_MODULE('idmap_ad',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
 
 bld.SAMBA3_MODULE('idmap_rfc2307',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  allow_undefined_symbols=True,
                  source=IDMAP_RFC2307_SRC,
                  init_function='',
@@ -54,7 +54,7 @@ bld.SAMBA3_MODULE('idmap_rfc2307',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rfc2307') and bld.CONFIG_SET("HAVE_LDAP"))
 
 bld.SAMBA3_MODULE('idmap_rid',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  allow_undefined_symbols=True,
                  source=IDMAP_RID_SRC,
                  init_function='',
@@ -62,7 +62,7 @@ bld.SAMBA3_MODULE('idmap_rid',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rid'))
 
 bld.SAMBA3_MODULE('idmap_passdb',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source=IDMAP_PASSDB_SRC,
                  deps='samba-util pdb',
                  init_function='',
@@ -70,7 +70,7 @@ bld.SAMBA3_MODULE('idmap_passdb',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
 
 bld.SAMBA3_MODULE('idmap_ldap',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source=IDMAP_LDAP_SRC,
                  deps='smbldap smbldaphelper pdb',
                  init_function='',
@@ -79,7 +79,7 @@ bld.SAMBA3_MODULE('idmap_ldap',
                   allow_undefined_symbols=True)
 
 bld.SAMBA3_MODULE('idmap_nss',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source=IDMAP_NSS_SRC,
                  deps='samba-util',
                  init_function='',
@@ -87,7 +87,7 @@ bld.SAMBA3_MODULE('idmap_nss',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss'))
 
 bld.SAMBA3_MODULE('idmap_tdb',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source=IDMAP_TDB_SRC,
                  deps='samba-util tdb',
                  init_function='',
@@ -95,7 +95,7 @@ bld.SAMBA3_MODULE('idmap_tdb',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
 
 bld.SAMBA3_MODULE('idmap_tdb2',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source=IDMAP_TDB2_SRC,
                  deps='samba-util tdb',
                  init_function='',
@@ -103,7 +103,7 @@ bld.SAMBA3_MODULE('idmap_tdb2',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
 
 bld.SAMBA3_MODULE('idmap_hash',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source='',
                  deps='IDMAP_HASH',
                  allow_undefined_symbols=True,
@@ -112,7 +112,7 @@ bld.SAMBA3_MODULE('idmap_hash',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
 
 bld.SAMBA3_MODULE('idmap_autorid',
-                 subsystem='idmap',
+                 subsystem='samba_idmap',
                  source=IDMAP_AUTORID_SRC,
                  deps='samba-util tdb',
                  init_function='',

diff --git a/source3/wscript_build b/source3/wscript_build
index 2e07fad796847898d5ed2690e81833af51664ae5..c21b4ae0cd4de06c6864488cab51510bcc2074e2 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1198,7 +1198,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  tevent
                  pdb
                  popt_samba3
-                 idmap
+                 samba_idmap
                  ads
                  msrpc3
                  nss_info
@@ -1442,7 +1442,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  WB_REQTRANS
                  LOCKING
                 NDR_OPEN_FILES
-                idmap
+                samba_idmap
                  ''',
                  install=False,
                  vars=locals())