Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix significant security holes with "use chroot = no" in an rsync daemon:
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
d24cdf7
..
03d38dd
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-17,6
+17,9
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define False 0
+#define True 1
+
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
@@
-29,7
+32,7
@@
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
- i
m
compatible with older versions :-( */
+ i
n
compatible with older versions :-( */
#define CHAR_OFFSET 0
#define CHAR_OFFSET 0
@@
-44,7
+47,7
@@
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION
19
+#define PROTOCOL_VERSION
21
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
@@
-270,6
+273,10
@@
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 256
+#endif
+
/* the length of the md4 checksum */
#define MD4_SUM_LENGTH 16
#define SUM_LENGTH 16
/* the length of the md4 checksum */
#define MD4_SUM_LENGTH 16
#define SUM_LENGTH 16
@@
-332,6
+339,7
@@
struct exclude_struct {
char *orig;
char *pattern;
int regular_exp;
char *orig;
char *pattern;
int regular_exp;
+ int fnmatch_flags;
int include;
int directory;
int local;
int include;
int directory;
int local;
@@
-457,6
+465,10
@@
extern int errno;
#ifndef ACCESSPERMS
#define ACCESSPERMS 0777
#endif
#ifndef ACCESSPERMS
#define ACCESSPERMS 0777
#endif
+/* Initial mask on permissions given to temporary files. Mask off setuid
+ bits and group access because of potential race-condition security
+ holes, and mask other access because mode 707 is bizarre */
+#define INITACCESSPERMS 0700
/* handler for null strings in printf format */
#define NS(s) ((s)?(s):"<NULL>")
/* handler for null strings in printf format */
#define NS(s) ((s)?(s):"<NULL>")