Updated to latest CVS.

diff --git a/kikuchi_set_rsyncdconf_location.diff b/kikuchi_set_rsyncdconf_location.diff
index 914bae6ac70b2dadd00941c3a6c08ad0f5c6ccfa..fa6ef250e1f296bbb8c4bba7a84de9ec40a076d1 100644 (file)
--- a/kikuchi_set_rsyncdconf_location.diff
+++ b/kikuchi_set_rsyncdconf_location.diff
@@ -1,51 +1,26 @@
-From ayamura@ayamura.org  Wed Feb 20 08:48:40 2002
-Return-Path: <ayamura@ayamura.org>
-Delivered-To: rsync@samba.org
-Received: from sea.ayamura.org (sea.ayamura.org [61.199.236.10])
-       by lists.samba.org (Postfix) with ESMTP id 075604919
-       for <rsync@samba.org>; Wed, 20 Feb 2002 08:48:39 -0800 (PST)
-Received: (from ayamura@localhost)
-       by sea.ayamura.org (8.12.2/8.12.2) id g1KGhHvt011659
-       for rsync@samba.org; Thu, 21 Feb 2002 01:43:17 +0900 (JST)
-       env-from (ayamura)
 Date: Thu, 21 Feb 2002 01:43:17 +0900 (JST)
-Message-Id: <200202201643.g1KGhHvt011659@sea.ayamura.org>
 From: Ayamura KIKUCHI <ayamura@ayamura.org>
 To: rsync@samba.org
 Subject: [patch] configurable RSYNCD_CONF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=US-ASCII
-Sender: rsync-admin@lists.samba.org
-Errors-To: rsync-admin@lists.samba.org
-X-BeenThere: rsync@lists.samba.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-List-Help: <mailto:rsync-request@lists.samba.org?subject=help>
-List-Post: <mailto:rsync@lists.samba.org>
-List-Subscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
-       <mailto:rsync-request@lists.samba.org?subject=subscribe>
-List-Id: Rsync user list <rsync.lists.samba.org>
-List-Unsubscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
-       <mailto:rsync-request@lists.samba.org?subject=unsubscribe>
-List-Archive: <http://lists.samba.org/pipermail/rsync/>
 
 I prefer configurable RSYNCD_CONF by autoconf to RSYNCD_CONF in rsync.h.
 
---- rsync.h.orig       Tue Feb 19 06:46:49 2002
-+++ rsync.h    Thu Feb 21 00:59:11 2002
-@@ -26,7 +26,8 @@
- #define RSYNC_RSH_ENV "RSYNC_RSH"
+[Updated to latest CVS by Wayne Davison.]
+
+--- rsync.h    11 Feb 2004 08:01:21 -0000      1.186
++++ rsync.h    23 Feb 2004 19:35:24 -0000
+@@ -27,7 +27,7 @@
+ #define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
  
  #define RSYNC_NAME "rsync"
--#define RSYNCD_CONF "/etc/rsyncd.conf"
-+
-+/* RSYNCD_CONF is always set in config.h */
+-#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
++/* RSYNCD_SYSCONF is now set in config.h */
+ #define RSYNCD_USERCONF "rsyncd.conf"
  
  #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
- #define URL_PREFIX "rsync://"
---- configure.in.orig  Wed Feb 20 08:40:47 2002
-+++ configure.in       Thu Feb 21 01:26:47 2002
-@@ -85,6 +85,30 @@
+--- configure.in       4 Feb 2004 17:21:48 -0000       1.183
++++ configure.in       23 Feb 2004 19:35:23 -0000
+@@ -97,6 +97,27 @@ AC_ARG_WITH(rsync-path,
  
  AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
  
@@ -53,31 +28,26 @@ I prefer configurable RSYNCD_CONF by autoconf to RSYNCD_CONF in rsync.h.
 +      AC_HELP_STRING([--with-rsyncd-conf=PATH], [set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]),
 +      [ if test ! -z "$with_rsyncd_conf" ; then
 +              case $with_rsyncd_conf in
-+                      yes)
-+                              RSYNCD_CONF="/etc/rsyncd.conf"
-+                              ;;
-+                      no)
-+                              RSYNCD_CONF="/etc/rsyncd.conf"
++                      yes|no)
++                              RSYNCD_SYSCONF="/etc/rsyncd.conf"
 +                              ;;
 +                      /*)
-+                              RSYNCD_CONF="$with_rsyncd_conf"
++                              RSYNCD_SYSCONF="$with_rsyncd_conf"
 +                              ;;
 +                      *)
 +                                AC_MSG_ERROR(You must specify an absolute path to --with-rsyncd-conf=PATH)
 +                              ;;
 +              esac
 +      else
-+              RSYNCD_CONF="/etc/rsyncd.conf"
++              RSYNCD_SYSCONF="/etc/rsyncd.conf"
 +      fi ],
-+      [ RSYNCD_CONF="/etc/rsyncd.conf" ])
++      [ RSYNCD_SYSCONF="/etc/rsyncd.conf" ])
 +
-+AC_DEFINE_UNQUOTED(RSYNCD_CONF, "$RSYNCD_CONF", [location of configuration file for rsync server])
++AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server])
 +
  AC_ARG_WITH(rsh,
-       AC_HELP_STRING([--with-rsh=CMD], [set rsh command to CMD (default: \"remsh\" or \"rsh\")]))
+       AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)]))
  
 
 -- ayamura
 Ayamura KIKUCHI, M.D., Ph.D.
-
-