6f485e0e14
conflict - fix #458593 noisy initscript - fix #463129 init script tests wrong conf file - fix #450352 - build.patch patches only generated files
81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
diff -up squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8
|
|
--- squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg 2008-06-22 05:35:49.000000000 +0200
|
|
+++ squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8 2007-06-06 18:25:30.000000000 +0200
|
|
@@ -1,38 +1,38 @@
|
|
-.\" This file is distributed in the hope that it will be useful,
|
|
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
-.\" the GNU General Public License for more details.
|
|
-.\"
|
|
-.\" You should have received a copy of the GNU General Public License
|
|
-.\" along with this file; if not, write to the Free Software
|
|
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
-.\" MA 02111-1307 USA
|
|
-.\"
|
|
-.\" HISTORY:
|
|
-.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
|
|
-.TH ncsa_auth 8 "May 16, 2006" "Squid NCSA Auth helper"
|
|
-.SH NAME
|
|
-ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
|
|
-\fB
|
|
-.SH SYNOPSIS
|
|
-.nf
|
|
-.fam C
|
|
-\fBncsa_auth\fP \fIpasswdfile\fP
|
|
-.fam T
|
|
-.fi
|
|
-.SH DESCRIPTION
|
|
-\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA/Apache httpd-style password file when using basic HTTP authentication.
|
|
-.PP
|
|
-The only parameter is the password file. It must have permissions to be read by the user that Squid is running as (cache_effective_user in squid.conf).
|
|
-.PP
|
|
-This password file can be manipulated using htpasswd.
|
|
-.SH OPTIONS
|
|
-Only specify the password file name.
|
|
-.SH EXAMPLE
|
|
-\fBncsa_auth\fP /etc/squid/squid.pass
|
|
-.SH SECURITY
|
|
-\fBncsa_auth\fP must have access to the password file to be executed.
|
|
-.SH SEE ALSO
|
|
-\fBhtpasswd\fP(1), \fBsquid\fP(8)
|
|
-.SH AUTHOR
|
|
-Manpage written by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
|
|
+.\" This file is distributed in the hope that it will be useful,
|
|
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
+.\" the GNU General Public License for more details.
|
|
+.\"
|
|
+.\" You should have received a copy of the GNU General Public License
|
|
+.\" along with this file; if not, write to the Free Software
|
|
+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
+.\" MA 02111-1307 USA
|
|
+.\"
|
|
+.\" HISTORY:
|
|
+.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
|
|
+.TH ncsa_auth 8 "May 16, 2006" "User Manuals" "User Manuals"
|
|
+.SH NAME
|
|
+ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
|
|
+\fB
|
|
+.SH SYNOPSIS
|
|
+.nf
|
|
+.fam C
|
|
+\fBncsa_auth\fP \fIpasswdfile\fP
|
|
+.fam T
|
|
+.fi
|
|
+.SH DESCRIPTION
|
|
+\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA httpd-style password file when using basic HTTP authentication.
|
|
+.PP
|
|
+The only parameter is the password file. It must have permissions to be read by the user that Squid is running as. By default this user is proxy. This can be changed using the cache_effective_user directive in the squid.conf file.
|
|
+.PP
|
|
+This password file can be manipulated using htpasswd.
|
|
+.SH OPTIONS
|
|
+Only specify the password file name.
|
|
+.SH EXAMPLE
|
|
+\fBncsa_auth\fP /etc/squid/squid.pass
|
|
+.SH SECURITY
|
|
+\fBncsa_auth\fP must have access to the password file to be executed.
|
|
+.SH SEE ALSO
|
|
+\fBhtpasswd\fP(1), \fBsquid\fP(8)
|
|
+.SH AUTHOR
|
|
+Manpage written by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
|