Allow "port" to be specified in the rsyncd.conf file.

diff --git a/clientserver.c b/clientserver.c
index 339c15d..0cb548f 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -598,6 +598,9 @@ int daemon_main(void)
        if (!lp_load(config_file, 1))
                exit_cleanup(RERR_SYNTAX);
 
+       if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
+               rsync_port = RSYNC_PORT;
+
        log_init();
 
        rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",

diff --git a/loadparm.c b/loadparm.c
index c65ecfc..8c06860 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -104,6 +104,7 @@ typedef struct
        char *socket_options;
        int syslog_facility;
        int max_verbosity;
+       int rsync_port;
 } global;
 
 static global Globals;
@@ -271,6 +272,7 @@ static struct parm_struct parm_table[] =
   {"log file",         P_STRING,  P_GLOBAL, &Globals.log_file,      NULL,  0},
   {"pid file",         P_STRING,  P_GLOBAL, &Globals.pid_file,      NULL,  0},
   {"max verbosity",    P_INTEGER, P_GLOBAL, &Globals.max_verbosity, NULL,  0},
+  {"port",             P_INTEGER, P_GLOBAL, &Globals.rsync_port,    NULL,  0},
 
   {"timeout",          P_INTEGER, P_LOCAL,  &sDefault.timeout,     NULL,  0},
   {"max connections",  P_INTEGER, P_LOCAL,  &sDefault.max_connections,NULL, 0},
@@ -353,6 +355,7 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
 FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
 FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
 FN_GLOBAL_INTEGER(lp_max_verbosity, &Globals.max_verbosity)
+FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
 
 FN_LOCAL_STRING(lp_name, name)
 FN_LOCAL_STRING(lp_comment, comment)

diff --git a/options.c b/options.c
index a883f13..4fb9aa8 100644 (file)
--- a/options.c
+++ b/options.c
@@ -129,7 +129,7 @@ char *password_file = NULL;
 char *rsync_path = RSYNC_PATH;
 char *backup_dir = NULL;
 char backup_dir_buf[MAXPATHLEN];
-int rsync_port = RSYNC_PORT;
+int rsync_port = 0;
 int copy_dest = 0;
 int link_dest = 0;
 

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index f5fbc6b..66c85b5 100644 (file)
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -160,6 +160,10 @@ being downloaded/uploaded by adding an exclude rule to the rsync.conf file
 is a relatively new feature in rsync, so make sure your server is running
 at least 2.6.3 to effect this.
 
+dit(bf(port)) You can override the default port the daemon will listen on
+by specifying this value (defaults to 873).  This is ignored if the daemon
+is being run by inetd, and is superseded by the --port command-line option.
+
 dit(bf(max connections)) The "max connections" option allows you to
 specify the maximum number of simultaneous connections you will allow.
 Any clients connecting when the maximum has been reached will receive a