Fix wsssht config file name from wssht.conf to wsssht.conf

- Update all config file references from 'wssht' to 'wsssht'
- Rename wssht.conf.example to wsssht.conf.example
- Update man page to reflect correct config file names
- Fix config reading calls to use 'wsssht' instead of 'wssht'
parent 00dbcc6a
...@@ -114,7 +114,7 @@ supports configuration files with the following precedence order: ...@@ -114,7 +114,7 @@ supports configuration files with the following precedence order:
Command line options (highest priority) Command line options (highest priority)
.IP 2. 3 .IP 2. 3
User configuration: User configuration:
.I ~/.config/wsssh/wssht.conf .I ~/.config/wsssh/wsssht.conf
.IP 3. 3 .IP 3. 3
System configuration: System configuration:
.I /etc/wsssht.conf .I /etc/wsssht.conf
...@@ -142,13 +142,13 @@ and ...@@ -142,13 +142,13 @@ and
.BR wsscp (1), .BR wsscp (1),
.B wsssht .B wsssht
uses its own configuration files uses its own configuration files
.I wssht.conf .I wsssht.conf
instead of sharing instead of sharing
.I wsssh.conf. .I wsssh.conf.
System administrators can provide default settings in System administrators can provide default settings in
.I /etc/wsssht.conf .I /etc/wsssht.conf
which will be overridden by user settings in which will be overridden by user settings in
.I ~/.config/wsssh/wssht.conf .I ~/.config/wsssh/wsssht.conf
and command line options. and command line options.
.SH SEE ALSO .SH SEE ALSO
.BR wsssh (1), .BR wsssh (1),
......
No preview for this file type
...@@ -193,15 +193,15 @@ int parse_target_args(int argc, char *argv[], char **host, int debug) { ...@@ -193,15 +193,15 @@ int parse_target_args(int argc, char *argv[], char **host, int debug) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// Read config from wssht.conf // Read config from wsssht.conf
char *config_domain = read_config_value_from_file("wssshd-host", "wssht"); char *config_domain = read_config_value_from_file("wssshd-host", "wsssht");
char *config_clientid = read_config_value_from_file("clientid", "wssht"); char *config_clientid = read_config_value_from_file("clientid", "wsssht");
char *config_wssshd_port = read_config_value_from_file("wssshd-port", "wssht"); char *config_wssshd_port = read_config_value_from_file("wssshd-port", "wsssht");
char *config_tunnel = read_config_value_from_file("tunnel", "wssht"); char *config_tunnel = read_config_value_from_file("tunnel", "wsssht");
char *config_tunnel_control = read_config_value_from_file("tunnel-control", "wssht"); char *config_tunnel_control = read_config_value_from_file("tunnel-control", "wsssht");
char *config_service = read_config_value_from_file("service", "wssht"); char *config_service = read_config_value_from_file("service", "wsssht");
char *config_tunnel_host = read_config_value_from_file("tunnel-host", "wssht"); char *config_tunnel_host = read_config_value_from_file("tunnel-host", "wsssht");
char *config_interval = read_config_value_from_file("interval", "wssht"); char *config_interval = read_config_value_from_file("interval", "wsssht");
wsssh_config_t config = { wsssh_config_t config = {
.local_port = NULL, .local_port = NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment