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
Applying uid/gid fix from trunk.
[rsync/rsync-patches.git]
/
nameconverter.diff
diff --git
a/nameconverter.diff
b/nameconverter.diff
index
aae1c89
..
81e3c30
100644
(file)
--- a/
nameconverter.diff
+++ b/
nameconverter.diff
@@
-31,15
+31,15
@@
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
6,6 +77,7 @@ char *module_dir = NULL
;
-
unsigned int module_dirlen = 0
;
+@@ -7
8,6 +79,7 @@ unsigned int module_dirlen = 0
;
+
char *full_module_path
;
static int rl_nulls = 0;
+static int namecvt_fd_req = -1, namecvt_fd_ans = -1;
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
static int rl_nulls = 0;
+static int namecvt_fd_req = -1, namecvt_fd_ans = -1;
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
-@@ -5
53,7 +555
,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
+@@ -5
65,7 +567
,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
49,6 +651
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
+@@ -6
54,6 +656
,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
-@@ -87
8,6 +918
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
+@@ -87
7,6 +917
,44 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
return 0;
}
return 0;
}
@@
-176,7
+176,7
@@
diff --git a/loadparm.c b/loadparm.c
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
-@@ -1
60,10 +160
,11 @@ if the module is not read-only).
+@@ -1
59,10 +159
,11 @@ if the module is not read-only).
When this parameter is enabled, rsync will not attempt to map users and groups
by name (by default), but instead copy IDs as though bf(--numeric-ids) had
When this parameter is enabled, rsync will not attempt to map users and groups
by name (by default), but instead copy IDs as though bf(--numeric-ids) had
@@
-268,7
+268,7
@@
new file mode 100755
diff --git a/t_stub.c b/t_stub.c
--- a/t_stub.c
+++ b/t_stub.c
diff --git a/t_stub.c b/t_stub.c
--- a/t_stub.c
+++ b/t_stub.c
-@@ -
29,6 +29,7 @@ int module_dirlen
= 0;
+@@ -
30,6 +30,7 @@ int preserve_xattrs
= 0;
mode_t orig_umask = 002;
char *partial_dir;
char *module_dir;
mode_t orig_umask = 002;
char *partial_dir;
char *module_dir;
@@
-276,7
+276,7
@@
diff --git a/t_stub.c b/t_stub.c
struct filter_list_struct daemon_filter_list;
void rprintf(UNUSED(enum logcode code), const char *format, ...)
struct filter_list_struct daemon_filter_list;
void rprintf(UNUSED(enum logcode code), const char *format, ...)
-@@ -
69,6 +70
,11 @@ struct filter_list_struct daemon_filter_list;
+@@ -
75,6 +76
,11 @@ struct filter_list_struct daemon_filter_list;
return -1;
}
return -1;
}
@@
-332,9
+332,9
@@
diff --git a/uidlist.c b/uidlist.c
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
-@@ -30,9 +30,10 @@ extern int modify_window;
- extern int relative_paths;
+@@ -31,9 +31,10 @@ extern int relative_paths;
extern int human_readable;
extern int human_readable;
+ extern int preserve_xattrs;
extern char *module_dir;
-extern unsigned int module_dirlen;
extern mode_t orig_umask;
extern char *module_dir;
-extern unsigned int module_dirlen;
extern mode_t orig_umask;
@@
-344,7
+344,7
@@
diff --git a/util.c b/util.c
extern struct filter_list_struct daemon_filter_list;
int sanitize_paths = 0;
extern struct filter_list_struct daemon_filter_list;
int sanitize_paths = 0;
-@@ -4
68,24 +469
,44 @@ void kill_all(int sig)
+@@ -4
97,24 +498
,44 @@ void kill_all(int sig)
/** Turn a user name into a uid */
int name_to_uid(const char *name, uid_t *uid_p)
{
/** Turn a user name into a uid */
int name_to_uid(const char *name, uid_t *uid_p)
{