Lines 1-4
Link Here
|
1 |
--- src/ocserv-args.def.orig 2015-08-31 19:19:45 UTC |
1 |
--- src/ocserv-args.def.orig 2015-10-13 09:47:33 UTC |
2 |
+++ src/ocserv-args.def |
2 |
+++ src/ocserv-args.def |
3 |
@@ -68,7 +68,7 @@ doc-section = { |
3 |
@@ -68,7 +68,7 @@ doc-section = { |
4 |
ds-format = 'texi'; |
4 |
ds-format = 'texi'; |
Lines 13-24
Link Here
|
13 |
# This enabled PAM authentication of the user. The gid-min option is used |
13 |
# This enabled PAM authentication of the user. The gid-min option is used |
14 |
# by auto-select-group option, in order to select the minimum valid group ID. |
14 |
# by auto-select-group option, in order to select the minimum valid group ID. |
15 |
# |
15 |
# |
16 |
-# plain[passwd=/etc/ocserv/ocpasswd] |
16 |
-# plain[passwd=/etc/ocserv/ocpasswd,otp=/etc/ocserv/users.otp] |
17 |
+# plain[passwd=/usr/local/etc/ocserv/ocpasswd] |
17 |
+# plain[passwd=/usr/local/etc/ocserv/ocpasswd,otp=/usr/local/etc/ocserv/users.otp] |
18 |
# The plain option requires specifying a password file which contains |
18 |
# The plain option requires specifying a password file which contains |
19 |
# entries of the following format. |
19 |
# entries of the following format. |
20 |
# "username:groupname1,groupname2:encoded-password" |
20 |
# "username:groupname1,groupname2:encoded-password" |
21 |
@@ -119,7 +119,7 @@ An example configuration file follows. |
21 |
@@ -121,7 +121,7 @@ An example configuration file follows. |
22 |
#auth = "certificate" |
22 |
#auth = "certificate" |
23 |
#auth = "pam" |
23 |
#auth = "pam" |
24 |
#auth = "pam[gid-min=1000]" |
24 |
#auth = "pam[gid-min=1000]" |
Lines 27-33
Link Here
|
27 |
#auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]" |
27 |
#auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]" |
28 |
|
28 |
|
29 |
# Specify alternative authentication methods that are sufficient |
29 |
# Specify alternative authentication methods that are sufficient |
30 |
@@ -429,7 +429,7 @@ rekey-method = ssl |
30 |
@@ -437,7 +437,7 @@ rekey-method = ssl |
31 |
use-occtl = true |
31 |
use-occtl = true |
32 |
|
32 |
|
33 |
# PID file. It can be overriden in the command line. |
33 |
# PID file. It can be overriden in the command line. |
Lines 36-42
Link Here
|
36 |
|
36 |
|
37 |
# Set the protocol-defined priority (SO_PRIORITY) for packets to |
37 |
# Set the protocol-defined priority (SO_PRIORITY) for packets to |
38 |
# be sent. That is a number from 0 to 6 with 0 being the lowest |
38 |
# be sent. That is a number from 0 to 6 with 0 being the lowest |
39 |
@@ -553,13 +553,13 @@ no-route = 192.168.5.0/255.255.255.0 |
39 |
@@ -564,13 +564,13 @@ no-route = 192.168.5.0/255.255.255.0 |
40 |
# Also explicit addresses, are only allowed when they are odd. In that |
40 |
# Also explicit addresses, are only allowed when they are odd. In that |
41 |
# case the next even address will be used as the remote address (in PtP). |
41 |
# case the next even address will be used as the remote address (in PtP). |
42 |
|
42 |
|