Improved the unsafe_symlink() code to not get fooled by extra '/' chars

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index d6384f8..be7cf8a 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -96,7 +96,7 @@
 /* This is used when working on a new protocol version in CVS, and should
  * be a new non-zero value for each CVS change that affects the protocol.
  * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
-#define SUBPROTOCOL_VERSION 4
+#define SUBPROTOCOL_VERSION 5
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
@@ -416,7 +416,7 @@ enum delret {
 # include <limits.h>
 #endif
 
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if defined USE_ICONV_OPEN && defined HAVE_ICONV_H
 #include <iconv.h>
 #ifndef ICONV_CONST
 #define ICONV_CONST