r26316: Use contexts for conversion functions.

[sfrench/samba-autobuild/.git] / source4 / torture / smbiconv.c

diff --git a/source4/torture/smbiconv.c b/source4/torture/smbiconv.c
index 02f053395d67514d370ee1515d414ef69803f6ba..1eb09cae45cbcfb5d7d1bbd9cfe75858af986ac9 100644 (file)
--- a/source4/torture/smbiconv.c
+++ b/source4/torture/smbiconv.c
@@ -8,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -206,7 +205,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       cd = smb_iconv_open(to, from);
+       cd = smb_iconv_open(to, from, lp_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true));
        if((int)cd == -1) {
                DEBUG(0,("unable to find from or to encoding, exiting...\n"));
                return 1;