X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6bc8e4ec1255da2d96a445a21782bc80b021e357..0ffcefadade4783d68237f89c96eddcc660ec3ed:/slp.diff diff --git a/slp.diff b/slp.diff index ae9c0ad..e5e5914 100644 --- a/slp.diff +++ b/slp.diff @@ -40,7 +40,7 @@ and we can't honor that request. --- old/clientserver.c +++ new/clientserver.c -@@ -836,6 +836,13 @@ int daemon_main(void) +@@ -844,6 +844,13 @@ int daemon_main(void) * address too. In fact, why not just do inet_ntop on the * local address??? */ @@ -56,8 +56,8 @@ and we can't honor that request. int fd; --- old/configure.in +++ new/configure.in -@@ -522,6 +522,29 @@ if test $rsync_cv_chown_follows_symlink - AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.]) +@@ -559,6 +559,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 +AC_ARG_ENABLE(slp, [ --disable-slp turn off SLP support, defaults to on]) @@ -88,17 +88,17 @@ and we can't honor that request. #include --- old/loadparm.c +++ new/loadparm.c -@@ -105,6 +105,9 @@ typedef struct +@@ -108,6 +108,9 @@ typedef struct char *socket_options; int rsync_port; +#ifdef HAVE_LIBSLP + int slp_refresh; +#endif - int syslog_facility; } global; -@@ -286,6 +289,9 @@ static struct parm_struct parm_table[] = + static global Globals; +@@ -291,6 +294,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}, @@ -106,23 +106,23 @@ and we can't honor that request. + {"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0}, +#endif {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0}, - {"syslog facility", P_ENUM, P_GLOBAL,&Globals.syslog_facility,enum_facilities,0}, -@@ -379,6 +385,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p + {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0}, +@@ -381,6 +387,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) +#ifdef HAVE_LIBSLP +FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh) +#endif - FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) FN_LOCAL_STRING(lp_auth_users, auth_users) + FN_LOCAL_STRING(lp_comment, comment) --- old/main.c +++ new/main.c -@@ -962,6 +962,18 @@ static int start_client(int argc, char * +@@ -1032,6 +1032,18 @@ static int start_client(int argc, char * + if (!read_batch) { /* for read_batch, NO source is specified */ - argc--; shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); + + if (shell_machine && !shell_machine[0]) { @@ -141,7 +141,7 @@ and we can't honor that request. int dummy2; --- old/options.c +++ new/options.c -@@ -196,6 +196,7 @@ static void print_rsync_version(enum log +@@ -200,6 +200,7 @@ static void print_rsync_version(enum log char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; @@ -149,7 +149,7 @@ and we can't honor that request. STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR -@@ -218,6 +219,10 @@ static void print_rsync_version(enum log +@@ -222,6 +223,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif @@ -160,7 +160,7 @@ and we can't honor that request. rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -230,9 +235,9 @@ static void print_rsync_version(enum log +@@ -234,9 +239,9 @@ static void print_rsync_version(enum log /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ @@ -174,7 +174,7 @@ and we can't honor that request. #ifdef MAINTAINER_MODE --- old/rsync.h +++ new/rsync.h -@@ -154,6 +154,9 @@ +@@ -157,6 +157,9 @@ #define SIGNIFICANT_ITEM_FLAGS (~(\ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) @@ -182,11 +182,11 @@ and we can't honor that request. +/* 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. - * FLOG and FCLIENT are only used on the daemon side for custom logging, + /* Log-message categories. Only FERROR and FINFO get sent over the socket, + * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe. --- old/rsync.yo +++ new/rsync.yo -@@ -137,7 +137,12 @@ particular rsync daemon by leaving off t +@@ -139,7 +139,12 @@ particular rsync daemon by leaving off t quote(tt(rsync somehost.mydomain.com::)) @@ -208,7 +208,7 @@ and we can't honor that request. + --- old/rsyncd.conf.yo +++ new/rsyncd.conf.yo -@@ -119,6 +119,15 @@ details on some of the options you may b +@@ -103,6 +103,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. @@ -224,7 +224,7 @@ and we can't honor that request. enddit() -@@ -544,6 +553,7 @@ use chroot = no +@@ -550,6 +559,7 @@ use chroot = no max connections = 4 syslog facility = local5 pid file = /var/run/rsyncd.pid @@ -234,7 +234,7 @@ and we can't honor that request. path = /var/ftp/pub --- old/socket.c +++ new/socket.c -@@ -447,6 +447,16 @@ void start_accept_loop(int port, int (*f +@@ -465,6 +465,16 @@ void start_accept_loop(int port, int (*f { fd_set deffds; int *sp, maxfd, i; @@ -251,7 +251,7 @@ and we can't honor that request. #ifdef HAVE_SIGACTION sigact.sa_flags = SA_NOCLDSTOP; -@@ -475,14 +485,25 @@ void start_accept_loop(int port, int (*f +@@ -493,14 +503,25 @@ void start_accept_loop(int port, int (*f maxfd = sp[i]; } @@ -277,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 -@@ -494,8 +515,18 @@ void start_accept_loop(int port, int (*f +@@ -512,8 +533,18 @@ void start_accept_loop(int port, int (*f #else fds = deffds; #endif