Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.1pre3.
[rsync/rsync-patches.git]
/
nameconverter.diff
diff --git
a/nameconverter.diff
b/nameconverter.diff
index
33a990c
..
bc3f941
100644
(file)
--- a/
nameconverter.diff
+++ b/
nameconverter.diff
@@
-23,7
+23,7
@@
To use this patch, run these commands for a successful build:
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
-@@ -6
4,6 +64
,7 @@ char *auth_user;
+@@ -6
7,6 +67
,7 @@ char *auth_user;
int read_only = 0;
int module_id = -1;
int munge_symlinks = 0;
int read_only = 0;
int module_id = -1;
int munge_symlinks = 0;
@@
-31,7
+31,7
@@
diff --git a/clientserver.c b/clientserver.c
struct chmod_mode_struct *daemon_chmod_modes;
/* module_dirlen is the length of the module_dir string when in daemon
struct chmod_mode_struct *daemon_chmod_modes;
/* module_dirlen is the length of the module_dir string when in daemon
-@@ -7
3,6 +74
,7 @@ char *module_dir = NULL;
+@@ -7
6,6 +77
,7 @@ char *module_dir = NULL;
unsigned int module_dirlen = 0;
static int rl_nulls = 0;
unsigned int module_dirlen = 0;
static int rl_nulls = 0;
@@
-39,7
+39,7
@@
diff --git a/clientserver.c b/clientserver.c
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
-@@ -5
39,7 +541
,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
+@@ -5
55,7 +557
,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
log_init(1);
#ifdef HAVE_PUTENV
log_init(1);
#ifdef HAVE_PUTENV
@@
-48,7
+48,7
@@
diff --git a/clientserver.c b/clientserver.c
char *modname, *modpath, *hostaddr, *hostname, *username;
int status;
char *modname, *modpath, *hostaddr, *hostname, *username;
int status;
-@@ -6
35,6 +637
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
+@@ -6
51,6 +653
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
set_blocking(fds[1]);
pre_exec_fd = fds[1];
}
set_blocking(fds[1]);
pre_exec_fd = fds[1];
}
@@
-93,7
+93,7
@@
diff --git a/clientserver.c b/clientserver.c
umask(0);
}
#endif
umask(0);
}
#endif
-@@ -8
48,6 +888
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
+@@ -8
80,6 +920
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
return 0;
}
return 0;
}
@@
-273,10
+273,10
@@
diff --git a/t_stub.c b/t_stub.c
char *partial_dir;
char *module_dir;
+pid_t namecvt_pid;
char *partial_dir;
char *module_dir;
+pid_t namecvt_pid;
- struct filter_list_struct
server
_filter_list;
+ struct filter_list_struct
daemon
_filter_list;
void rprintf(UNUSED(enum logcode code), const char *format, ...)
void rprintf(UNUSED(enum logcode code), const char *format, ...)
-@@ -69,6 +70,11 @@ struct filter_list_struct
server
_filter_list;
+@@ -69,6 +70,11 @@ struct filter_list_struct
daemon
_filter_list;
return -1;
}
return -1;
}
@@
-341,7
+341,7
@@
diff --git a/util.c b/util.c
extern char *partial_dir;
+extern pid_t namecvt_pid;
+extern unsigned int module_dirlen;
extern char *partial_dir;
+extern pid_t namecvt_pid;
+extern unsigned int module_dirlen;
- extern struct filter_list_struct
server
_filter_list;
+ extern struct filter_list_struct
daemon
_filter_list;
int sanitize_paths = 0;
@@ -468,24 +469,44 @@ void kill_all(int sig)
int sanitize_paths = 0;
@@ -468,24 +469,44 @@ void kill_all(int sig)