3 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index aefb077cf5..76f1ce5096 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -10,7 +10,8 @@ OBJ_FILES = tdbsam.o policy.o \
 		idmap.o winsdb.o samba3.o group.o \
 		registry.o secrets.o share_info.o
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBTDB NDR_SECURITY \
-					   CREDENTIALS SMBPASSWD
+					   SMBPASSWD LIBSECURITY 
+PUBLIC_DEPENDENCIES = CREDENTIALS 
 # End SUBSYSTEM LIBSAMBA3
 ################################################
 
@@ -19,5 +20,6 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBTDB NDR_SECURITY \
 [SUBSYSTEM::SMBPASSWD]
 PRIVATE_PROTO_HEADER = samba3_smbpasswd_proto.h
 OBJ_FILES = smbpasswd.o
+PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL
 # End SUBSYSTEM LIBSAMBA3
 ################################################
diff --git a/source4/lib/samba3/samba3.c b/source4/lib/samba3/samba3.c
index 74985fab8a..4bd08f188a 100644
--- a/source4/lib/samba3/samba3.c
+++ b/source4/lib/samba3/samba3.c
@@ -36,7 +36,7 @@ NTSTATUS samba3_read_passdb_backends(TALLOC_CTX *ctx, const char *libdir, struct
 	char *dbfile;
 	NTSTATUS status = NT_STATUS_OK;
 	int i;
-	const char **backends = param_get_string_list(samba3->configuration, NULL, "passdb backend", NULL);
+	const char **backends = param_get_string_list(samba3->configuration, "passdb backend", NULL, NULL);
 
 	/* Default to smbpasswd */
 	if (backends == NULL) 
@@ -59,7 +59,7 @@ NTSTATUS samba3_read_passdb_backends(TALLOC_CTX *ctx, const char *libdir, struct
 			const char *p = strchr(backends[i], ':');
 			if (p && p[1]) {
 				dbfile = talloc_strdup(ctx, p+1);
-			} else if ((p = param_get_string(samba3->configuration, NULL, "smb passwd file"))) {
+			} else if ((p = param_get_string(samba3->configuration, "smb passwd file", NULL))) {
 				dbfile = talloc_strdup(ctx, p);
 			} else {
 				dbfile = talloc_strdup(ctx, "/etc/samba/smbpasswd");
diff --git a/source4/lib/samba3/share_info.c b/source4/lib/samba3/share_info.c
index e0778fafb5..4dd15aa918 100644
--- a/source4/lib/samba3/share_info.c
+++ b/source4/lib/samba3/share_info.c
@@ -76,7 +76,7 @@ NTSTATUS samba3_read_share_info(const char *fn, TALLOC_CTX *ctx, struct samba3 *
 		blob.data = (uint8_t *)vbuf.dptr;
 		blob.length = vbuf.dsize;
 
-		pull = ndr_pull_init_blob(&blob, ctx);
+		pull = ndr_pull_init_blob(&blob, ctx, lp_iconv_convenience(global_loadparm));
 
 		ndr_pull_security_descriptor(pull, NDR_SCALARS|NDR_BUFFERS, &share->secdesc);