diff --git a/NEWS b/NEWS index f3c1fa25..67c257d3 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ - Reload the CRL on during periodic maintaince if its modification time changes. - Allow loading DER-encoded CRLs. +- Re-added the PAM accounting method. That accounting method can be combined + with any authentication method, and can be used to check for a valid + system account. * Version 0.10.8 (released 2015-09-04) diff --git a/doc/sample.config b/doc/sample.config index c7dd5ace..15e908b7 100644 --- a/doc/sample.config +++ b/doc/sample.config @@ -52,7 +52,9 @@ auth = "plain[passwd=./sample.passwd]" # radius accounting to available users (see also stats-report-time). # # pam: can be combined with any authentication method, it provides -# a validation of the connecting user's name using PAM. +# a validation of the connecting user's name using PAM. It is +# superfluous to use this method when authentication is already +# PAM. # # Only one accounting method can be specified. #acct = "radius[config=/etc/radiusclient/radiusclient.conf]" diff --git a/src/ocserv-args.def b/src/ocserv-args.def index 9769df5c..7077d395 100644 --- a/src/ocserv-args.def +++ b/src/ocserv-args.def @@ -134,7 +134,9 @@ An example configuration file follows. # radius accounting to available users (see also stats-report-time). # # pam: can be combined with any authentication method, it provides -# a validation of the connecting user's name using PAM. +# a validation of the connecting user's name using PAM. It is +# superfluous to use this method when authentication is already +# PAM. # # Only one accounting method can be specified. #acct = "radius[config=/etc/radiusclient/radiusclient.conf]"