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
Mention the extended argv-overflow checking.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
f686b19
..
26b26ab
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-141,7
+141,7
@@
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
/** Local address to bind. As a character string because it's
static int modify_window_set;
/** Local address to bind. As a character string because it's
- * interpreted by the IPv6 layer: should be a numeric IP4 or
ip
6
+ * interpreted by the IPv6 layer: should be a numeric IP4 or
IP
6
* address, or a hostname. **/
char *bind_address;
* address, or a hostname. **/
char *bind_address;
@@
-411,17
+411,12
@@
static char err_buf[200];
**/
void option_error(void)
{
**/
void option_error(void)
{
- int save_daemon = am_daemon;
-
if (!err_buf[0]) {
strcpy(err_buf, "Error parsing options: "
"option may be supported on client but not on server?\n");
}
if (!err_buf[0]) {
strcpy(err_buf, "Error parsing options: "
"option may be supported on client but not on server?\n");
}
- rwrite(FLOG, err_buf, strlen(err_buf));
- am_daemon = 0;
rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
- am_daemon = save_daemon;
}
}