GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-14 02:22:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

listen-file -> listen-clear-file

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-09-28 09:06:14 +02:00
parent e2585b2f26
commit 3a455f4178
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+1 -1
View File
@@ -4,7 +4,7 @@
by sskaje). by sskaje).
- fixed an infinite loop when asking for group if the default group - fixed an infinite loop when asking for group if the default group
is selected. is selected.
- Added the listen-file configuration option. That allows obtaining - Added the listen-clear-file configuration option. That allows obtaining
plaintext HTTP sessions through a unix domain socket. That is useful plaintext HTTP sessions through a unix domain socket. That is useful
when combined with a forwarder HTTPS server like nginx, nxweb or haproxy. when combined with a forwarder HTTPS server like nginx, nxweb or haproxy.
- Added the certificate[optional] auth configuration option. That option - Added the certificate[optional] auth configuration option. That option
doc/sample.config
+1 -1
View File
@@ -51,7 +51,7 @@ udp-port = 443
# Accept connections using a socket file. The connections are # Accept connections using a socket file. The connections are
# forwarded without SSL/TLS. # forwarded without SSL/TLS.
listen-file = /var/run/ocserv-conn.socket listen-clear-file = /var/run/ocserv-conn.socket
# Keepalive in seconds # Keepalive in seconds
keepalive = 32400 keepalive = 32400
src/config.c
+3 -3
View File
@@ -82,7 +82,7 @@ static struct cfg_options available_options[] = {
{ .name = "disconnect-script", .type = OPTION_STRING, .mandatory = 0 }, { .name = "disconnect-script", .type = OPTION_STRING, .mandatory = 0 },
{ .name = "pid-file", .type = OPTION_STRING, .mandatory = 0 }, { .name = "pid-file", .type = OPTION_STRING, .mandatory = 0 },
{ .name = "socket-file", .type = OPTION_STRING, .mandatory = 1 }, { .name = "socket-file", .type = OPTION_STRING, .mandatory = 1 },
{ .name = "listen-file", .type = OPTION_STRING, .mandatory = 0 }, { .name = "listen-clear-file", .type = OPTION_STRING, .mandatory = 0 },
{ .name = "occtl-socket-file", .type = OPTION_STRING, .mandatory = 0 }, { .name = "occtl-socket-file", .type = OPTION_STRING, .mandatory = 0 },
{ .name = "banner", .type = OPTION_STRING, .mandatory = 0 }, { .name = "banner", .type = OPTION_STRING, .mandatory = 0 },
{ .name = "use-seccomp", .type = OPTION_BOOLEAN, .mandatory = 0 }, { .name = "use-seccomp", .type = OPTION_BOOLEAN, .mandatory = 0 },
@@ -439,9 +439,9 @@ unsigned force_cert_auth;
if (reload == 0 && pid_file[0] == 0) if (reload == 0 && pid_file[0] == 0)
READ_STATIC_STRING("pid-file", pid_file); READ_STATIC_STRING("pid-file", pid_file);
READ_STRING("listen-file", config->unix_conn_file); READ_STRING("listen-clear-file", config->unix_conn_file);
if (config->unix_conn_file != NULL && (config->auth_types & AUTH_TYPE_CERTIFICATE)) { if (config->unix_conn_file != NULL && (config->auth_types & AUTH_TYPE_CERTIFICATE)) {
fprintf(stderr, "The option 'listen-file' cannot be combined with 'auth=certificate'\n"); fprintf(stderr, "The option 'listen-clear-file' cannot be combined with 'auth=certificate'\n");
exit(1); exit(1);
} }
src/ocserv-args.def
+1 -1
View File
@@ -134,7 +134,7 @@ udp-port = 3333
# connections (i.e., without SSL/TLS unlike its TCP counterpart), # connections (i.e., without SSL/TLS unlike its TCP counterpart),
# and uses it as the primary channel. That option cannot be # and uses it as the primary channel. That option cannot be
# combined with certificate authentication. # combined with certificate authentication.
#listen-file = /var/run/ocserv-conn.socket #listen-clear-file = /var/run/ocserv-conn.socket
# Keepalive in seconds # Keepalive in seconds
keepalive = 32400 keepalive = 32400
tests/docker-ocserv/ocserv-unix.conf
+1 -1
View File
@@ -45,7 +45,7 @@ udp-port = 6551
# Accept connections using a socket file. The connections are # Accept connections using a socket file. The connections are
# forwarded without SSL/TLS. # forwarded without SSL/TLS.
listen-file = /var/run/ocserv-conn.socket listen-clear-file = /var/run/ocserv-conn.socket
# Keepalive in seconds # Keepalive in seconds
keepalive = 32400 keepalive = 32400