diff options
| author | Wayne Davison <wayned@samba.org> | 2008-02-18 16:48:20 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2008-02-18 16:48:20 -0800 |
| commit | 15dbffc2150c77ef50616af268359e579e679bcd (patch) | |
| tree | f6f4f7e2b25d5cb4ad6a2c74f8c1fa499b8ecce1 /clientserver.c | |
| parent | 0099e423325e3c4ad919f6379f41cfe6618ad154 (diff) | |
| download | rsync-15dbffc2150c77ef50616af268359e579e679bcd.tar.gz rsync-15dbffc2150c77ef50616af268359e579e679bcd.tar.bz2 rsync-15dbffc2150c77ef50616af268359e579e679bcd.zip | |
Fixed a compilation problem when iconv support is disabled.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clientserver.c b/clientserver.c index 2d7c28ff..3619810b 100644 --- a/clientserver.c +++ b/clientserver.c @@ -391,7 +391,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) pid_t pre_exec_pid = 0; char *request = NULL; -#ifdef ICONV_CONST +#ifdef ICONV_OPTION iconv_opt = lp_charset(i); if (*iconv_opt) setup_iconv(); @@ -806,6 +806,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) exit_cleanup(RERR_UNSUPPORTED); } +#ifdef ICONV_OPTION if (!iconv_opt) { if (ic_send != (iconv_t)-1) { iconv_close(ic_send); @@ -816,6 +817,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) ic_recv = (iconv_t)-1; } } +#endif if (!numeric_ids && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True)) |