------------------------------------------------------------ revno: 13682 revision-id: squid3@treenet.co.nz-20141208083602-5oqoelcrcdyd6hw7 parent: squid3@treenet.co.nz-20141208083400-8nd67yixt9uqiw1v committer: Amos Jeffries branch nick: 3.5 timestamp: Mon 2014-12-08 00:36:02 -0800 message: ext_wbinfo_group_acl: Update man(8) documentation ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141208083602-5oqoelcrcdyd6hw7 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 53208de2440b1a7ae8dcbbc42be2d8e84039277e # timestamp: 2014-12-08 08:52:26 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20141208083400-\ # 8nd67yixt9uqiw1v # # Begin patch === modified file 'helpers/external_acl/wbinfo_group/Makefile.am' --- helpers/external_acl/wbinfo_group/Makefile.am 2014-09-13 13:31:49 +0000 +++ helpers/external_acl/wbinfo_group/Makefile.am 2014-12-08 08:36:02 +0000 @@ -7,16 +7,17 @@ include $(top_srcdir)/src/Common.am -libexec_SCRIPTS = ext_wbinfo_group_acl -EXTRA_DIST = ext_wbinfo_group_acl.pl.in required.m4 +libexec_SCRIPTS= ext_wbinfo_group_acl +man_MANS= ext_wbinfo_group_acl.8 +EXTRA_DIST= \ + ext_wbinfo_group_acl.8 \ + ext_wbinfo_group_acl.pl.in \ + required.m4 ext_wbinfo_group_acl: ext_wbinfo_group_acl.pl.in $(subst_perlshell) -EXTRA_DIST += ext_wbinfo_group_acl.8 -man_MANS = ext_wbinfo_group_acl.8 - -ext_wbinfo_group_acl.8: ext_wbinfo_group_acl.pl.in - pod2man $(srcdir)/ext_wbinfo_group_acl.pl.in ext_wbinfo_group_acl.8 +ext_wbinfo_group_acl.8: ext_wbinfo_group_acl + pod2man ext_wbinfo_group_acl ext_wbinfo_group_acl.8 CLEANFILES += ext_wbinfo_group_acl.8 ext_wbinfo_group_acl === modified file 'helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in' --- helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in 2014-09-13 13:31:49 +0000 +++ helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in 2014-12-08 08:36:02 +0000 @@ -1,55 +1,23 @@ #!@PERL@ -w -# -## Copyright (C) 1996-2014 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## -# -# external_acl helper to Squid to verify NT Domain group -# membership using wbinfo -# -# This program is put in the public domain by Jerry Murdock -# . It 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. -# -# Author: -# Jerry Murdock -# -# Version history: -# 2010-08-27 Hank Hampel -# Add Kerberos to NTLM conversion of credentials (-K) -# -# 2005-12-26 Guido Serassio -# Add '-d' command line debugging option -# -# 2005-12-24 Guido Serassio -# Fix for wbinfo from Samba 3.0.21 -# -# 2004-08-15 Henrik Nordstrom -# Helper protocol changed to URL escaped in Squid-3.0 -# -# 2005-06-28 Arno Streuli -# Add multi group check -# -# 2002-07-05 Jerry Murdock -# Initial release + +use strict; +use Pod::Usage; +use Getopt::Long; + =pod =head1 NAME -ext_wbinfo_group_acl - external ACL helper for Squid to verify NT Domain group membership using wbinfo. + ext_wbinfo_group_acl - external ACL helper for Squid to verify NT Domain group membership using wbinfo. =head1 SYNOPSIS -ext_wbinfo_group_acl [-dh] + ext_wbinfo_group_acl [-dhK] =head1 DESCRIPTION -ext_wbinfo_group_acl is an installed executable script. -It uses wbinfo from Samba to lookup group membership of logged in users. +B is an installed executable script. +It uses B from Samba to lookup group membership of logged in users. This helper must be used in with an authentication scheme (typically Basic or NTLM) based on Windows NT/2000 domain users. @@ -60,19 +28,31 @@ =head1 OPTIONS - -d Write debug info to stderr. - -h Print the help. - -K downgrade Kerberos credentials to NTLM. +=over 12 + +=item B<-d> + +Write debug info to stderr. + +=item B<-h> + +Print the help. + +=item B<-K> + +Downgrade Kerberos credentials to NTLM. + +=back =head1 CONFIGURATION - external_acl_type wbinfo_check %LOGIN /path/to/ext_wbinfo_group_acl - acl allowed_group external wbinfo_check Group1 Group2 - http_access allow allowed_group + external_acl_type wbinfo_check %LOGIN /path/to/ext_wbinfo_group_acl + acl allowed_group external wbinfo_check Group1 Group2 + http_access allow allowed_group If the local perl interpreter is in a unusual location it may need to be added: - external_acl_type wbinfo_check %LOGIN /path/to/perl /path/to/ext_wbinfo_group_acl + external_acl_type wbinfo_check %LOGIN /path/to/perl /path/to/ext_wbinfo_group_acl =head1 AUTHOR @@ -82,15 +62,20 @@ =head1 COPYRIGHT -This program is put in the public domain by Jerry Murdock -. It 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. + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. + * Please see the COPYING and CONTRIBUTORS files for details. + + This program is put in the public domain by Jerry Murdock + . It 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. =head1 QUESTIONS -Questions on the usage of this program can be sent to the -Squid Users mailing list +Questions on the usage of this program can be sent to the I> =head1 REPORTING BUGS @@ -99,10 +84,9 @@ Report bugs or bug fixes using http://bugs.squid-cache.org/ -Report serious security bugs to Squid Bugs +Report serious security bugs to I> -Report ideas for new improvements to the -Squid Developers mailing list +Report ideas for new improvements to the I> =head1 SEE ALSO @@ -113,6 +97,26 @@ =cut # +# Version history: +# 2010-08-27 Hank Hampel +# Add Kerberos to NTLM conversion of credentials (-K) +# +# 2005-12-26 Guido Serassio +# Add '-d' command line debugging option +# +# 2005-12-24 Guido Serassio +# Fix for wbinfo from Samba 3.0.21 +# +# 2004-08-15 Henrik Nordstrom +# Helper protocol changed to URL escaped in Squid-3.0 +# +# 2005-06-28 Arno Streuli +# Add multi group check +# +# 2002-07-05 Jerry Murdock +# Initial release + +# # Globals # use vars qw/ %opt /;