diff options
| -rw-r--r-- | source4/lib/cmdline/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/compression/mszip.c | 2 | ||||
| -rw-r--r-- | source4/lib/util/config.mk | 3 | ||||
| -rw-r--r-- | source4/ntptr/config.mk | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 4 | ||||
| -rwxr-xr-x | source4/script/tests/selftest.sh | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk index f8502596fa..8f2591bad6 100644 --- a/source4/lib/cmdline/config.mk +++ b/source4/lib/cmdline/config.mk @@ -12,4 +12,4 @@ PUBLIC_DEPENDENCIES = LIBPOPT PRIVATE_PROTO_HEADER = popt_credentials.h OBJ_FILES = popt_credentials.o PUBLIC_DEPENDENCIES = CREDENTIALS_KRB5 LIBCMDLINE_CREDENTIALS LIBPOPT - +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL diff --git a/source4/lib/compression/mszip.c b/source4/lib/compression/mszip.c index 7a6371528c..c25fb99b7f 100644 --- a/source4/lib/compression/mszip.c +++ b/source4/lib/compression/mszip.c @@ -641,7 +641,7 @@ static int32_t Zipinflate_block(struct decomp_state *decomp_state, int32_t *e) return 2; } -struct decomp_state *ZIPdecomp_state(TALLOC_CTX *mem_ctx) +_PUBLIC_ struct decomp_state *ZIPdecomp_state(TALLOC_CTX *mem_ctx) { return talloc_zero(mem_ctx, struct decomp_state); } diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 5d3e2cc4ca..4f3a17d505 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -29,7 +29,8 @@ OBJ_FILES = xfile.o \ module.o PUBLIC_DEPENDENCIES = \ LIBTALLOC LIBCRYPTO \ - SOCKET_WRAPPER EXT_NSL + SOCKET_WRAPPER EXT_NSL \ + CHARSET [SUBSYSTEM::UNIX_PRIVS] PRIVATE_PROTO_HEADER = unix_privs.h diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk index a80002662e..696f2ea10f 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 PUBLIC_DEPENDENCIES = \ - ldb NDR_SPOOLSS + ldb NDR_SPOOLSS DCERPC_COMMON # End MODULE ntptr_simple_ldb ################################################ diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index 2d7a4dc928..7845b21662 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -5,7 +5,7 @@ INIT_FUNCTION = pvfs_acl_xattr_init SUBSYSTEM = ntvfs OBJ_FILES = \ pvfs_acl_xattr.o -PRIVATE_DEPENDENCIES = NDR_XATTR +PRIVATE_DEPENDENCIES = NDR_XATTR ntvfs_posix # End MODULE pvfs_acl_xattr ################################################ @@ -16,6 +16,7 @@ INIT_FUNCTION = pvfs_acl_nfs4_init SUBSYSTEM = ntvfs OBJ_FILES = \ pvfs_acl_nfs4.o +PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB ntvfs_posix # End MODULE pvfs_acl_nfs4 ################################################ @@ -23,6 +24,7 @@ OBJ_FILES = \ # Start MODULE ntvfs_posix [MODULE::ntvfs_posix] SUBSYSTEM = ntvfs +OUTPUT_TYPE = INTEGRATED INIT_FUNCTION = ntvfs_posix_init PRIVATE_PROTO_HEADER = vfs_posix_proto.h OBJ_FILES = \ diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 6d99766995..a1483f48d6 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -44,7 +44,7 @@ export LD_LDB_MODULE_PATH LD_SAMBA_MODULE_PATH=$OLD_PWD/bin/modules export LD_SAMBA_MODULE_PATH -LD_LIBRARY_PATH=$OLD_PWD/bin:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=$OLD_PWD/bin/shared:$LD_LIBRARY_PATH export LD_LIBRARY_PATH incdir=`dirname $ARG0` |