Fix failed hunks.

[rsync-patches.git] / kerberos.diff

diff --git a/kerberos.diff b/kerberos.diff
index b08c203a4d199bb1d065c029e48e1116f02db69f..67f545c4cff38df4ee514f019c257ae988583007 100644 (file)
--- a/kerberos.diff
+++ b/kerberos.diff
@@ -9,14 +9,14 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 194cee671d5e178f20c4494f41911fa8db942935
+based-on: a6bdf313f239cabfef445bc3658b79aec8a40c37
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -44,7 +44,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
-       util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
+       util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
-       fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
+       usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
 -OBJS3=progress.o pipe.o @ASM@
 +OBJS3=progress.o pipe.o gss-auth.o @ASM@
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
@@ -25,7 +25,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -138,7 +138,7 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
+@@ -140,7 +140,7 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
        setup_iconv();
  #endif
  
@@ -34,7 +34,7 @@ diff --git a/clientserver.c b/clientserver.c
  
        return ret ? ret : client_run(fd, fd, -1, argc, argv);
  }
-@@ -215,7 +215,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
+@@ -217,7 +217,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
        return 0;
  }
  
@@ -43,7 +43,7 @@ diff --git a/clientserver.c b/clientserver.c
  {
        int i, modlen;
        char line[BIGPATHBUFLEN];
-@@ -330,6 +330,17 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
+@@ -328,6 +328,17 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
                        continue;
                }
  
@@ -61,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c
                if (strcmp(line,"@RSYNCD: OK") == 0)
                        break;
  
-@@ -686,7 +697,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -719,7 +730,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        }
  
        read_only = lp_read_only(i); /* may also be overridden by auth_server() */
@@ -78,7 +78,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -917,6 +917,31 @@ if test x"$enable_iconv" != x"no"; then
+@@ -1010,6 +1010,31 @@ if test x"$enable_iconv" != x"no"; then
        AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.])
  fi
  
@@ -113,7 +113,7 @@ diff --git a/configure.ac b/configure.ac
 diff --git a/daemon-parm.txt b/daemon-parm.txt
 --- a/daemon-parm.txt
 +++ b/daemon-parm.txt
-@@ -60,6 +60,7 @@ BOOL reverse_lookup          True
+@@ -61,6 +61,7 @@ BOOL reverse_lookup          True
  BOOL  strict_modes            True
  BOOL  transfer_logging        False
  BOOL  use_chroot              True
@@ -463,9 +463,9 @@ new file mode 100644
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -1522,7 +1522,7 @@ static int start_client(int argc, char *argv[])
+@@ -1577,7 +1577,7 @@ static int start_client(int argc, char *argv[])
         * remote shell command, we need to do the RSYNCD protocol first */
-       if (daemon_over_rsh) {
+       if (daemon_connection) {
                int tmpret;
 -              tmpret = start_inband_exchange(f_in, f_out, shell_user, remote_argc, remote_argv);
 +              tmpret = start_inband_exchange(f_in, f_out, shell_user, shell_machine, remote_argc, remote_argv);
@@ -475,7 +475,7 @@ diff --git a/main.c b/main.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -500,6 +500,15 @@ enum delret {
+@@ -533,6 +533,15 @@ enum delret {
  #define iconv_t int
  #endif