diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-06-16 13:43:38 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2010-06-16 14:07:28 +0200 |
| commit | 6dbcffb51d979094cbdac80df5e9480475230137 (patch) | |
| tree | 31a1405822da012949a811433981bb48dde26ca3 /source4/libnet | |
| parent | 8843eea2e06736f27080eedab883ffc51feacb33 (diff) | |
| download | samba-6dbcffb51d979094cbdac80df5e9480475230137.tar.gz samba-6dbcffb51d979094cbdac80df5e9480475230137.tar.bz2 samba-6dbcffb51d979094cbdac80df5e9480475230137.zip | |
s4:lib: merge LDB_WRAP and LDBSAMBA and make LDBSAMBA a library.
This is needed to remove samba specifc symbols from the bundled
ldb, in order to get the ABI right.
metze
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_unbecome_dc.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_vampire.c | 2 | ||||
| -rw-r--r-- | source4/libnet/wscript_build | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index 16ffb5c77d..d64e415f8c 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -23,7 +23,7 @@ #include "libcli/cldap/cldap.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb_wrap.h" +#include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" #include "../libds/common/flags.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index 66f73d594f..a8b53df56d 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -23,7 +23,7 @@ #include "libcli/cldap/cldap.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb_wrap.h" +#include "ldb_wrap.h" #include "dsdb/samdb/samdb.h" #include "../libds/common/flags.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 1d5489cc5a..9f1f9626bf 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -34,7 +34,7 @@ #include "librpc/gen_ndr/ndr_drsblobs.h" #include "librpc/gen_ndr/ndr_misc.h" #include "system/time.h" -#include "lib/ldb_wrap.h" +#include "ldb_wrap.h" #include "auth/auth.h" #include "auth/credentials/credentials.h" #include "param/param.h" diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index 9aa9aed5ae..5bf926b05e 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -3,7 +3,6 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA-NET', source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samdump_keytab.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c', autoproto='libnet_proto.h', - deps = 'LDB_WRAP', public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET' ) |