r938: on an error save the original errno before calling iconv to reset

the conversion state
(This used to be commit 4a5a122b3a85c653bbf458342400f3b8a69dc615)

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 7df73192f24a6df5b25626dc041c60e5761efce3..4c9ecf992e6790190e0ee1e4e0598de9ff237863 100644 (file)
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -129,7 +129,11 @@ static size_t sys_iconv(void *cd,
        size_t ret = iconv((iconv_t)cd, 
                           inbuf, inbytesleft, 
                           outbuf, outbytesleft);
-       if (ret == (size_t)-1) iconv(cd, NULL, NULL, NULL, NULL);
+       if (ret == (size_t)-1) {
+               int saved_errno = errno;
+               iconv(cd, NULL, NULL, NULL, NULL);
+               errno = saved_errno;
+       }
        return ret;
 #else
        errno = EINVAL;