- Fixed a bug I introduced into the daemon's "fake super" handling.

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

diff --git a/md5.diff b/md5.diff
index f9c5cd3..2e6bcb0 100644 (file)
--- a/md5.diff
+++ b/md5.diff
@@ -1,5 +1,5 @@
---- orig/Makefile.in   2005-07-07 23:11:07
-+++ Makefile.in        2005-06-14 02:33:20
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -26,7 +26,7 @@ VERSION=@VERSION@
  .SUFFIXES: .c .o
  
@@ -9,8 +9,8 @@
        lib/permstring.o lib/pool_alloc.o @LIBOBJS@
  ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
---- orig/checksum.c    2005-01-01 21:08:05
-+++ checksum.c 2005-06-14 02:43:38
+--- old/checksum.c
++++ new/checksum.c
 @@ -18,6 +18,7 @@
  */
  
@@ -187,8 +187,8 @@
 +      else
 +              mdfour_result(&md, (uchar *)sum);
  }
---- orig/lib/md5.c     2005-06-14 02:35:52
-+++ lib/md5.c  2005-06-14 02:35:52
+--- old/lib/md5.c
++++ new/lib/md5.c
 @@ -0,0 +1,344 @@
 +/*
 + *  RFC 1321 compliant MD5 implementation
@@ -534,8 +534,8 @@
 +}
 +
 +#endif
---- orig/lib/md5.h     2005-06-14 02:35:26
-+++ lib/md5.h  2005-06-14 02:35:26
+--- old/lib/md5.h
++++ new/lib/md5.h
 @@ -0,0 +1,14 @@
 +#ifndef _MD5_H
 +#define _MD5_H
@@ -551,9 +551,9 @@
 +void md5_finish(md5_context *ctx, uchar digest[16]);
 +
 +#endif /* md5.h */
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-06-14 02:21:26
-@@ -107,6 +107,7 @@ int inplace = 0;
+--- old/options.c
++++ new/options.c
+@@ -117,6 +117,7 @@ int inplace = 0;
  int delay_updates = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */
  
@@ -561,7 +561,7 @@
  
  /** Network address family. **/
  #ifdef INET6
-@@ -348,6 +349,7 @@ void usage(enum logcode F)
+@@ -369,6 +370,7 @@ void usage(enum logcode F)
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
    rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
@@ -569,15 +569,15 @@
  #ifdef INET6
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
-@@ -460,6 +462,7 @@ static struct poptOption long_options[] 
-   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
-   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
-   {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
+@@ -475,6 +477,7 @@ static struct poptOption long_options[] 
+   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
+   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
+   {"no-W",             0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
 +  {"md5",              0,  POPT_ARG_NONE,   &use_md5, 0, 0, 0 },
- #ifdef INET6
-   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
-@@ -1365,6 +1368,9 @@ void server_options(char **args,int *arg
+   {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
+   {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
+   {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
+@@ -1610,6 +1613,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }