diff options
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/config.mk | 38 | ||||
| -rw-r--r-- | source4/kdc/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/basic.mk | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 6 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 51 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map.c (renamed from source4/lib/ldb/modules/ldb_map.c) | 31 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map.h (renamed from source4/lib/ldb/modules/ldb_map.h) | 31 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map_inbound.c (renamed from source4/lib/ldb/modules/ldb_map_inbound.c) | 31 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map_outbound.c (renamed from source4/lib/ldb/modules/ldb_map_outbound.c) | 31 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map_private.h (renamed from source4/lib/ldb/modules/ldb_map_private.h) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/samba/config.mk | 12 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 2 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 2 | ||||
| -rw-r--r-- | source4/nbt_server/config.mk | 4 | ||||
| -rw-r--r-- | source4/ntptr/config.mk | 2 | ||||
| -rw-r--r-- | source4/param/config.mk | 2 |
16 files changed, 130 insertions, 119 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 52945499ee..f49753586e 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -1,7 +1,7 @@ ################################################ # Start MODULE ldb_objectguid [MODULE::ldb_objectguid] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC INIT_FUNCTION = objectguid_module_init OBJ_FILES = \ @@ -12,7 +12,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_repl_mata_data [MODULE::ldb_repl_meta_data] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS INIT_FUNCTION = repl_meta_data_module_init OBJ_FILES = \ @@ -23,7 +23,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_dsdb_cache [MODULE::ldb_dsdb_cache] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC INIT_FUNCTION = dsdb_cache_module_init OBJ_FILES = \ @@ -34,7 +34,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_schema_fsmo [MODULE::ldb_schema_fsmo] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC INIT_FUNCTION = schema_fsmo_module_init OBJ_FILES = \ @@ -45,7 +45,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_naming_fsmo [MODULE::ldb_naming_fsmo] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC INIT_FUNCTION = naming_fsmo_module_init OBJ_FILES = \ @@ -56,7 +56,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_pdc_fsmo [MODULE::ldb_pdc_fsmo] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC INIT_FUNCTION = pdc_fsmo_module_init OBJ_FILES = \ @@ -67,7 +67,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_samldb [MODULE::ldb_samldb] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = samldb_module_init OBJ_FILES = \ @@ -79,7 +79,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_samba3sam [MODULE::ldb_samba3sam] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB INIT_FUNCTION = ldb_samba3sam_module_init PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD OBJ_FILES = \ @@ -91,7 +91,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_entryUUID [MODULE::ldb_entryUUID] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB INIT_FUNCTION = ldb_entryUUID_module_init PRIVATE_DEPENDENCIES = LIBTALLOC ENABLE = YES @@ -104,7 +104,7 @@ OBJ_FILES = \ # ################################################ # # Start MODULE ldb_proxy # [MODULE::ldb_proxy] -# SUBSYSTEM = ldb +# SUBSYSTEM = LIBLDB # INIT_FUNCTION = proxy_module_init # OBJ_FILES = \ # proxy.o @@ -116,7 +116,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_rootdse [MODULE::ldb_rootdse] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = rootdse_module_init OBJ_FILES = \ @@ -128,7 +128,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_password_hash [MODULE::ldb_password_hash] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB INIT_FUNCTION = password_hash_module_init OBJ_FILES = password_hash.o PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 @@ -140,7 +140,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 # Start MODULE ldb_local_password [MODULE::ldb_local_password] PRIVATE_DEPENDENCIES = LIBTALLOC -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB INIT_FUNCTION = local_password_module_init OBJ_FILES = local_password.o # @@ -151,7 +151,7 @@ OBJ_FILES = local_password.o # Start MODULE ldb_kludge_acl [MODULE::ldb_kludge_acl] PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB INIT_FUNCTION = ldb_kludge_acl_init OBJ_FILES = \ kludge_acl.o @@ -162,7 +162,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_extended_dn [MODULE::ldb_extended_dn] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_extended_dn_init OBJ_FILES = \ @@ -174,7 +174,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_show_deleted [MODULE::ldb_show_deleted] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_show_deleted_init OBJ_FILES = \ @@ -186,7 +186,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_partition [MODULE::ldb_partition] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_partition_init OBJ_FILES = \ @@ -198,7 +198,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_schema [MODULE::ldb_schema] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_schema_init OBJ_FILES = \ @@ -210,7 +210,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_update_kt [MODULE::ldb_update_kt] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB PRIVATE_DEPENDENCIES = LIBTALLOC CREDENTIALS_KRB5 #Also depends on credentials, but that would loop INIT_FUNCTION = ldb_update_kt_init diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk index 1e860d27b7..d129332ba2 100644 --- a/source4/kdc/config.mk +++ b/source4/kdc/config.mk @@ -9,7 +9,7 @@ OBJ_FILES = \ kdc.o \ kpasswdd.o PRIVATE_DEPENDENCIES = \ - ldb KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB SAMDB + LIBLDB KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB SAMDB # End SUBSYSTEM KDC ####################### @@ -22,7 +22,7 @@ OBJ_FILES = \ hdb-ldb.o \ pac-glue.o PRIVATE_DEPENDENCIES = \ - ldb auth_sam KERBEROS + LIBLDB auth_sam KERBEROS # End SUBSYSTEM KDC ####################### diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 813ddf649d..823057fbc7 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -43,5 +43,5 @@ OBJ_FILES = gencache/gencache.o \ PUBLIC_PROTO_HEADER = db_wrap_proto.h PUBLIC_HEADERS = db_wrap.h OBJ_FILES = db_wrap.o gendb.o -PUBLIC_DEPENDENCIES = LIBTDB ldb +PUBLIC_DEPENDENCIES = LIBTDB LIBLDB PRIVATE_DEPENDENCIES = LDBSAMBA diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index 2ce27338a2..398efc9fe8 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -41,6 +41,10 @@ LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \ $(LDB_TDB_DIR)/ldb_pack.o $(LDB_TDB_DIR)/ldb_search.o $(LDB_TDB_DIR)/ldb_index.o \ $(LDB_TDB_DIR)/ldb_cache.o $(LDB_TDB_DIR)/ldb_tdb_wrap.o +LDB_MAP_DIR=ldb_map +LDB_MAP_OBJ=$(LDB_MAP_DIR)/ldb_map.o $(LDB_MAP_DIR)/ldb_map_inbound.o \ + $(LDB_MAP_DIR)/ldb_map_outbound.o + COMDIR=common COMMON_OBJ=$(COMDIR)/ldb.o $(COMDIR)/ldb_ldif.o \ $(COMDIR)/ldb_parse.o $(COMDIR)/ldb_msg.o $(COMDIR)/ldb_utf8.o \ @@ -57,7 +61,7 @@ NSSDIR=nssldb NSS_OBJ= $(NSSDIR)/ldb-nss.o $(NSSDIR)/ldb-pwd.o $(NSSDIR)/ldb-grp.o NSS_LIB = lib/libnss_ldb.so.2 -OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) +OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) LDB_LIB = lib/libldb.a diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index adf12f5418..e60f51f2d5 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -4,7 +4,7 @@ PRIVATE_DEPENDENCIES = LIBTALLOC CFLAGS = -Ilib/ldb/include INIT_FUNCTION = ldb_asq_init -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB OBJ_FILES = \ modules/asq.o # End MODULE ldb_asq @@ -16,7 +16,7 @@ OBJ_FILES = \ PRIVATE_DEPENDENCIES = LIBTALLOC CFLAGS = -Ilib/ldb/include INIT_FUNCTION = ldb_sort_init -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB OBJ_FILES = \ modules/sort.o # End MODULE ldb_sort @@ -28,7 +28,7 @@ OBJ_FILES = \ INIT_FUNCTION = ldb_paged_results_init CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB OBJ_FILES = \ modules/paged_results.o # End MODULE ldb_paged_results @@ -40,7 +40,7 @@ OBJ_FILES = \ INIT_FUNCTION = ldb_paged_searches_init CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB OBJ_FILES = \ modules/paged_searches.o # End MODULE ldb_paged_results @@ -49,7 +49,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_operational [MODULE::ldb_operational] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_operational_init @@ -64,7 +64,7 @@ OBJ_FILES = \ INIT_FUNCTION = ldb_objectclass_init CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB OBJ_FILES = \ modules/objectclass.o # End MODULE ldb_objectclass @@ -73,7 +73,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_rdn_name [MODULE::ldb_rdn_name] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_rdn_name_init @@ -85,7 +85,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_ildap [MODULE::ldb_ildap] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP INIT_FUNCTION = ldb_ildap_init @@ -99,19 +99,19 @@ OBJ_FILES = \ # Start MODULE ldb_map [MODULE::ldb_map] PRIVATE_DEPENDENCIES = LIBTALLOC -CFLAGS = -Ilib/ldb/include -Ilib/ldb/modules -SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_map +SUBSYSTEM = LIBLDB OBJ_FILES = \ - modules/ldb_map_inbound.o \ - modules/ldb_map_outbound.o \ - modules/ldb_map.o + ldb_map/ldb_map_inbound.o \ + ldb_map/ldb_map_outbound.o \ + ldb_map/ldb_map.o # End MODULE ldb_map ################################################ ################################################ # Start MODULE ldb_skel [MODULE::ldb_skel] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_skel_init @@ -122,7 +122,7 @@ OBJ_FILES = modules/skel.o ################################################ # Start MODULE ldb_sqlite3 [MODULE::ldb_sqlite3] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC INIT_FUNCTION = ldb_sqlite3_init @@ -134,7 +134,7 @@ OBJ_FILES = \ ################################################ # Start MODULE ldb_tdb [MODULE::ldb_tdb] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_tdb INIT_FUNCTION = ldb_tdb_init OBJ_FILES = \ @@ -155,7 +155,7 @@ PRIVATE_DEPENDENCIES = \ ################################################ # Start SUBSYSTEM ldb -[LIBRARY::ldb] +[LIBRARY::LIBLDB] VERSION = 0.0.1 SO_VERSION = 0 CFLAGS = -Ilib/ldb/include @@ -187,23 +187,12 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h ################################################ ################################################ -# Start SUBSYSTEM LDBSAMBA -[SUBSYSTEM::LDBSAMBA] -PUBLIC_DEPENDENCIES = ldb -PRIVATE_PROTO_HEADER = samba/ldif_handlers.h -PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB -OBJ_FILES = \ - samba/ldif_handlers.o -# End SUBSYSTEM LDBSAMBA -################################################ - -################################################ # Start SUBSYSTEM LIBLDB_CMDLINE [SUBSYSTEM::LIBLDB_CMDLINE] CFLAGS = -Ilib/ldb OBJ_FILES= \ tools/cmdline.o -PUBLIC_DEPENDENCIES = ldb LIBPOPT +PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec # End SUBSYSTEM LIBLDB_CMDLINE ################################################ @@ -319,8 +308,10 @@ PRIVATE_DEPENDENCIES = \ ####################### # Start LIBRARY swig_ldb [LIBRARY::swig_ldb] -PUBLIC_DEPENDENCIES = ldb DYNCONFIG +PUBLIC_DEPENDENCIES = LIBLDB DYNCONFIG LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT) OBJ_FILES = swig/ldb_wrap.o # End LIBRARY swig_ldb ####################### + +include samba/config.mk diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c index 0fccbba702..64484220b5 100644 --- a/source4/lib/ldb/modules/ldb_map.c +++ b/source4/lib/ldb/ldb_map/ldb_map.c @@ -4,23 +4,24 @@ Copyright (C) Jelmer Vernooij 2005 Copyright (C) Martin Kuehl <mkhl@samba.org> 2006 - * NOTICE: this module is NOT released under the GNU LGPL license as - * other ldb code. This module is release under the GNU GPL v2 or - * later license. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + ** NOTE! The following LGPL license applies to the ldb + ** library. This does NOT imply that all of Samba is released + ** under the LGPL - This program is distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ /* diff --git a/source4/lib/ldb/modules/ldb_map.h b/source4/lib/ldb/ldb_map/ldb_map.h index e8de2e3698..f2f4e80467 100644 --- a/source4/lib/ldb/modules/ldb_map.h +++ b/source4/lib/ldb/ldb_map/ldb_map.h @@ -4,23 +4,24 @@ Copyright (C) Jelmer Vernooij 2005 Copyright (C) Martin Kuehl <mkhl@samba.org> 2006 - * NOTICE: this module is NOT released under the GNU LGPL license as - * other ldb code. This module is release under the GNU GPL v2 or - * later license. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + ** NOTE! The following LGPL license applies to the ldb + ** library. This does NOT imply that all of Samba is released + ** under the LGPL - This program is distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #ifndef __LDB_MAP_H__ diff --git a/source4/lib/ldb/modules/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c index 9cc1b4e89f..bb1e0cca36 100644 --- a/source4/lib/ldb/modules/ldb_map_inbound.c +++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c @@ -4,23 +4,24 @@ Copyright (C) Jelmer Vernooij 2005 Copyright (C) Martin Kuehl <mkhl@samba.org> 2006 - * NOTICE: this module is NOT released under the GNU LGPL license as - * other ldb code. This module is release under the GNU GPL v2 or - * later license. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + ** NOTE! The following LGPL license applies to the ldb + ** library. This does NOT imply that all of Samba is released + ** under the LGPL - This program is distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "ldb_includes.h" diff --git a/source4/lib/ldb/modules/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c index 1ef1b36b20..ae36367111 100644 --- a/source4/lib/ldb/modules/ldb_map_outbound.c +++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c @@ -5,23 +5,24 @@ Copyright (C) Martin Kuehl <mkhl@samba.org> 2006 Copyright (C) Andrew Bartlett <abartlet@samba.org> 2006 - * NOTICE: this module is NOT released under the GNU LGPL license as - * other ldb code. This module is release under the GNU GPL v2 or - * later license. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + ** NOTE! The following LGPL license applies to the ldb + ** library. This does NOT imply that all of Samba is released + ** under the LGPL - This program is distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "ldb_includes.h" diff --git a/source4/lib/ldb/modules/ldb_map_private.h b/source4/lib/ldb/ldb_map/ldb_map_private.h index 2c35097069..2c35097069 100644 --- a/source4/lib/ldb/modules/ldb_map_private.h +++ b/source4/lib/ldb/ldb_map/ldb_map_private.h diff --git a/source4/lib/ldb/samba/config.mk b/source4/lib/ldb/samba/config.mk new file mode 100644 index 0000000000..d29b3f319c --- /dev/null +++ b/source4/lib/ldb/samba/config.mk @@ -0,0 +1,12 @@ +################################################ +# Start SUBSYSTEM LDBSAMBA +[SUBSYSTEM::LDBSAMBA] +PUBLIC_DEPENDENCIES = LIBLDB +PRIVATE_PROTO_HEADER = ldif_handlers.h +PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB +OBJ_FILES = \ + ldif_handlers.o +# End SUBSYSTEM LDBSAMBA +################################################ + + diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 4f44c3ca1f..cea37e7e2f 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -68,7 +68,7 @@ SUBSYSTEM = registry OBJ_FILES = \ reg_backend_ldb.o PRIVATE_DEPENDENCIES = \ - ldb + LIBLDB # End MODULE registry_ldb ################################################ diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 6aba69c2af..74af8185e6 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -77,7 +77,7 @@ DESCRIPTION = CLDAP client library OBJ_FILES = cldap/cldap.o PUBLIC_HEADERS = cldap/cldap.h PUBLIC_DEPENDENCIES = LIBCLI_LDAP -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL ldb +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB [LIBRARY::LIBCLI_WREPL] PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk index 6c54134378..5e8cfa61da 100644 --- a/source4/nbt_server/config.mk +++ b/source4/nbt_server/config.mk @@ -8,14 +8,14 @@ OBJ_FILES = \ wins/wins_hook.o PRIVATE_PROTO_HEADER = wins/winsdb_proto.h PUBLIC_DEPENDENCIES = \ - ldb + LIBLDB # End SUBSYSTEM WINSDB ####################### ####################### # Start MODULE ldb_wins_ldb [MODULE::ldb_wins_ldb] -SUBSYSTEM = ldb +SUBSYSTEM = LIBLDB INIT_FUNCTION = wins_ldb_module_init OBJ_FILES = \ wins/wins_ldb.o diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk index c47ccac755..38a582291f 100644 --- a/source4/ntptr/config.mk +++ b/source4/ntptr/config.mk @@ -8,7 +8,7 @@ SUBSYSTEM = ntptr OBJ_FILES = \ simple_ldb/ntptr_simple_ldb.o PRIVATE_DEPENDENCIES = \ - ldb NDR_SPOOLSS DCERPC_COMMON + LIBLDB NDR_SPOOLSS DCERPC_COMMON # End MODULE ntptr_simple_ldb ################################################ diff --git a/source4/param/config.mk b/source4/param/config.mk index e035437ade..cac95a63dd 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -41,7 +41,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL SUBSYSTEM = share INIT_FUNCTION = share_ldb_init OBJ_FILES = share_ldb.o -PRIVATE_DEPENDENCIES = ldb +PRIVATE_DEPENDENCIES = LIBLDB # End MODULE share_ldb ################################################ |