Use samba3's own iconv implementation for now, until all changes are

merged.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 28b543783841c4054c457d1d4a1d0d61dc6e1c01..e9f408189d7079f779f217b8f980df55b74ac5bd 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -366,7 +366,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
          lib/substitute.o lib/dbwrap_util.o \
          lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
          lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
-         ../lib/util/charset/iconv.o lib/pam_errors.o intl/lang_tdb.o \
+         lib/iconv.o lib/pam_errors.o intl/lang_tdb.o \
          lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
          lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \
          lib/ldap_escape.o @CHARSET_STATIC@ \

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index fa213a37c06beb94eccd73d82ff52d90264ca324..44500542f2baf8961217855a45a3922eacf610fc 100644 (file)
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -207,12 +207,12 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
        from = charsets;
        to = charsets;
 
-       ret = SMB_MALLOC_P(smb_iconv_t);
+       ret = SMB_MALLOC_P(struct smb_iconv_s);
        if (!ret) {
                errno = ENOMEM;
                return (smb_iconv_t)-1;
        }
-       memset(ret, 0, sizeof(smb_iconv_t));
+       memset(ret, 0, sizeof(struct smb_iconv_s));
 
        ret->from_name = SMB_STRDUP(fromcode);
        ret->to_name = SMB_STRDUP(tocode);