X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/790ba11acdb77fcd3d81ba5749081f79ded86d04..76c553f74d8a10a1e2f8ac39a091d390f27a4865:/slp.diff diff --git a/slp.diff b/slp.diff index 6a7a37c..daa0f91 100644 --- a/slp.diff +++ b/slp.diff @@ -41,7 +41,7 @@ and we can't honor that request. --- old/clientserver.c +++ new/clientserver.c -@@ -876,6 +876,13 @@ int daemon_main(void) +@@ -952,6 +952,13 @@ int daemon_main(void) * address too. In fact, why not just do inet_ntop on the * local address??? */ @@ -52,12 +52,12 @@ and we can't honor that request. + } +#endif + - if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) { - char pidbuf[16]; - int fd; + start_accept_loop(rsync_port, start_daemon); + return -1; + } --- old/configure.in +++ new/configure.in -@@ -641,6 +641,29 @@ if test $rsync_cv_can_hardlink_special = +@@ -625,6 +625,29 @@ if test $rsync_cv_can_hardlink_special = AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.]) fi @@ -89,7 +89,7 @@ and we can't honor that request. #include --- old/loadparm.c +++ new/loadparm.c -@@ -110,6 +110,9 @@ typedef struct +@@ -111,6 +111,9 @@ typedef struct char *socket_options; int rsync_port; @@ -99,7 +99,7 @@ and we can't honor that request. } global; static global Globals; -@@ -295,6 +298,9 @@ static struct parm_struct parm_table[] = +@@ -296,6 +299,9 @@ static struct parm_struct parm_table[] = {"motd file", P_STRING, P_GLOBAL,&Globals.motd_file, NULL,0}, {"pid file", P_STRING, P_GLOBAL,&Globals.pid_file, NULL,0}, {"port", P_INTEGER,P_GLOBAL,&Globals.rsync_port, NULL,0}, @@ -109,7 +109,7 @@ and we can't honor that request. {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0}, {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0}, -@@ -386,6 +392,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p +@@ -387,6 +393,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port) @@ -121,7 +121,7 @@ and we can't honor that request. FN_LOCAL_STRING(lp_comment, comment) --- old/main.c +++ new/main.c -@@ -1099,6 +1099,18 @@ static int start_client(int argc, char * +@@ -1139,6 +1139,18 @@ static int start_client(int argc, char * if (!read_batch) { /* for read_batch, NO source is specified */ char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); @@ -138,11 +138,11 @@ and we can't honor that request. + } + if (path) { /* source is remote */ - char *dummy1; - int dummy2; + char *dummy_host; + int dummy_port = 0; --- old/options.c +++ new/options.c -@@ -220,6 +220,7 @@ static void print_rsync_version(enum log +@@ -221,6 +221,7 @@ static void print_rsync_version(enum log char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -150,7 +150,7 @@ and we can't honor that request. STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -249,6 +250,9 @@ static void print_rsync_version(enum log +@@ -250,6 +251,9 @@ static void print_rsync_version(enum log #ifdef ICONV_OPTION iconv = ""; #endif @@ -160,7 +160,7 @@ and we can't honor that request. rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -262,8 +266,8 @@ static void print_rsync_version(enum log +@@ -263,8 +267,8 @@ static void print_rsync_version(enum log (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); @@ -173,19 +173,20 @@ and we can't honor that request. rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); --- old/rsync.h +++ new/rsync.h -@@ -182,6 +182,9 @@ +@@ -183,6 +183,10 @@ #define SIGNIFICANT_ITEM_FLAGS (~(\ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) +/* this is the minimum we'll use, irrespective of config setting */ +/* definately don't set to less than about 30 seconds */ +#define SLP_MIN_TIMEOUT 120 - - /* Log-message categories. Only FERROR and FINFO get sent over the socket, - * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe. ++ + #define CFN_KEEP_LEADING_DOT_DIR (1<<0) + #define CFN_KEEP_TRAILING_SLASH (1<<1) + #define CFN_DROP_TRAILING_DOT_DIR (1<<2) --- old/rsync.yo +++ new/rsync.yo -@@ -145,7 +145,12 @@ particular rsync daemon by leaving off t +@@ -144,7 +144,12 @@ particular rsync daemon by leaving off t quote(tt(rsync somehost.mydomain.com::)) @@ -207,7 +208,7 @@ and we can't honor that request. + --- old/rsyncd.conf.yo +++ new/rsyncd.conf.yo -@@ -103,6 +103,15 @@ details on some of the options you may b +@@ -104,6 +104,15 @@ details on some of the options you may b special socket options are set. These settings are superseded by the bf(--sockopts) command-line option. @@ -223,7 +224,7 @@ and we can't honor that request. enddit() -@@ -564,6 +573,7 @@ use chroot = no +@@ -566,6 +575,7 @@ use chroot = no max connections = 4 syslog facility = local5 pid file = /var/run/rsyncd.pid @@ -233,7 +234,7 @@ and we can't honor that request. path = /var/ftp/pub --- old/socket.c +++ new/socket.c -@@ -501,6 +501,16 @@ void start_accept_loop(int port, int (*f +@@ -502,6 +502,16 @@ void start_accept_loop(int port, int (*f { fd_set deffds; int *sp, maxfd, i; @@ -250,7 +251,7 @@ and we can't honor that request. #ifdef HAVE_SIGACTION sigact.sa_flags = SA_NOCLDSTOP; -@@ -529,14 +539,25 @@ void start_accept_loop(int port, int (*f +@@ -530,14 +540,25 @@ void start_accept_loop(int port, int (*f maxfd = sp[i]; } @@ -276,7 +277,7 @@ and we can't honor that request. /* close log file before the potentially very long select so * file can be trimmed by another process instead of growing -@@ -548,8 +569,18 @@ void start_accept_loop(int port, int (*f +@@ -549,8 +570,18 @@ void start_accept_loop(int port, int (*f #else fds = deffds; #endif