Commit | Line | Data |
---|---|---|
6ceddcb2 WD |
1 | Adds the ability to set the default "port" in the rsyncd.conf file. |
2 | ||
3 | --- orig/clientserver.c 2004-08-02 02:29:16 | |
4 | +++ clientserver.c 2004-09-28 18:44:33 | |
5 | @@ -598,6 +598,9 @@ int daemon_main(void) | |
6 | if (!lp_load(config_file, 1)) | |
7 | exit_cleanup(RERR_SYNTAX); | |
8 | ||
9 | + if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0) | |
10 | + rsync_port = RSYNC_PORT; | |
11 | + | |
12 | log_init(); | |
13 | ||
14 | rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n", | |
15 | --- orig/loadparm.c 2004-07-31 16:41:04 | |
16 | +++ loadparm.c 2004-09-28 12:56:51 | |
17 | @@ -104,6 +104,7 @@ typedef struct | |
18 | char *socket_options; | |
19 | int syslog_facility; | |
20 | int max_verbosity; | |
21 | + int rsync_port; | |
22 | } global; | |
23 | ||
24 | static global Globals; | |
25 | @@ -271,6 +272,7 @@ static struct parm_struct parm_table[] = | |
26 | {"log file", P_STRING, P_GLOBAL, &Globals.log_file, NULL, 0}, | |
27 | {"pid file", P_STRING, P_GLOBAL, &Globals.pid_file, NULL, 0}, | |
28 | {"max verbosity", P_INTEGER, P_GLOBAL, &Globals.max_verbosity, NULL, 0}, | |
29 | + {"port", P_INTEGER, P_GLOBAL, &Globals.rsync_port, NULL, 0}, | |
30 | ||
31 | {"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0}, | |
32 | {"max connections", P_INTEGER, P_LOCAL, &sDefault.max_connections,NULL, 0}, | |
33 | @@ -353,6 +355,7 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p | |
34 | FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) | |
35 | FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) | |
36 | FN_GLOBAL_INTEGER(lp_max_verbosity, &Globals.max_verbosity) | |
37 | +FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port) | |
38 | ||
39 | FN_LOCAL_STRING(lp_name, name) | |
40 | FN_LOCAL_STRING(lp_comment, comment) | |
41 | --- orig/options.c 2004-09-23 17:42:07 | |
42 | +++ options.c 2004-09-28 18:43:43 | |
43 | @@ -127,7 +127,7 @@ char *password_file = NULL; | |
44 | char *rsync_path = RSYNC_PATH; | |
45 | char *backup_dir = NULL; | |
46 | char backup_dir_buf[MAXPATHLEN]; | |
47 | -int rsync_port = RSYNC_PORT; | |
48 | +int rsync_port = 0; | |
49 | int link_dest = 0; | |
50 | ||
51 | int verbose = 0; | |
52 | --- orig/rsyncd.conf.yo 2004-09-22 02:02:04 | |
53 | +++ rsyncd.conf.yo 2004-09-28 18:53:35 | |
54 | @@ -160,6 +160,10 @@ being downloaded/uploaded by adding an e | |
55 | is a relatively new feature in rsync, so make sure your server is running | |
56 | at least 2.6.3 to effect this. | |
57 | ||
58 | +dit(bf(port)) You can override the default port the daemon will listen on | |
59 | +by specifying this value (defaults to 873). This is ignored if the daemon | |
60 | +is being run by inetd, and is superseded by the --port command-line option. | |
61 | + | |
62 | dit(bf(max connections)) The "max connections" option allows you to | |
63 | specify the maximum number of simultaneous connections you will allow. | |
64 | Any clients connecting when the maximum has been reached will receive a |