This is now on the trunk.

[rsync/rsync-patches.git] / slp.diff

diff --git a/slp.diff b/slp.diff
index 90a86a0..b09c987 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -41,7 +41,7 @@ and we can't honor that request.
  
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -854,6 +854,13 @@ int daemon_main(void)
+@@ -853,6 +853,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do inet_ntop on the
         * local address??? */
  
@@ -149,19 +149,18 @@ and we can't honor that request.
 +      char const *slp = "no ";
        STRUCT_STAT *dumstat;
  
- #ifdef HAVE_SOCKETPAIR
-@@ -234,6 +235,10 @@ static void print_rsync_version(enum log
+ #if SUBPROTOCOL_VERSION != 0
+@@ -232,6 +233,9 @@ static void print_rsync_version(enum log
+ #ifdef INET6
        ipv6 = "";
  #endif
- 
 +#if HAVE_LIBSLP
 +      slp = "";
 +#endif
-+
-       if (SUBPROTOCOL_VERSION)
-               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
-       else
-@@ -250,8 +255,8 @@ static void print_rsync_version(enum log
+ 
+       rprintf(f, "%s  version %s  protocol version %d%s\n",
+               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
+@@ -245,8 +249,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);