c1113da01b
fix for bnc#894840 OBS-URL: https://build.opensuse.org/request/show/247589 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=60
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
diff -rNU 60 ../squid-3.4.6-o/helpers/external_acl/kerberos_ldap_group/cert_tool ./helpers/external_acl/kerberos_ldap_group/cert_tool
|
|
--- ../squid-3.4.6-o/helpers/external_acl/kerberos_ldap_group/cert_tool 2014-06-25 16:41:39.000000000 +0200
|
|
+++ ./helpers/external_acl/kerberos_ldap_group/cert_tool 2014-08-14 16:40:59.000000000 +0200
|
|
@@ -1,61 +1,61 @@
|
|
-#!/bin/ksh
|
|
+#!/bin/bash
|
|
#
|
|
# -----------------------------------------------------------------------------
|
|
#
|
|
# Author: Markus Moeller (markus_moeller at compuserve.com)
|
|
#
|
|
# Copyright (C) 2007 Markus Moeller. All rights reserved.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program 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 program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
|
#
|
|
# -----------------------------------------------------------------------------
|
|
#
|
|
#
|
|
# creates the following files:
|
|
# <server>.cert
|
|
# secmod.db
|
|
# key3.db
|
|
# cert8.db
|
|
#
|
|
#
|
|
if [ -z "$1" ]; then
|
|
echo "Usage: `basename $0` ldap-server port"
|
|
exit 0
|
|
fi
|
|
if [ -z "$2" ]; then
|
|
port=636
|
|
else
|
|
port=$2
|
|
fi
|
|
|
|
server=$1
|
|
|
|
#
|
|
# Remove old files
|
|
#
|
|
rm ${server}_[0-9]*.cert 2>/dev/null
|
|
#
|
|
# Get certs and store in .cert file
|
|
#
|
|
( openssl s_client -showcerts -connect $server:$port 2>/dev/null <<!
|
|
QUIT
|
|
!
|
|
) | awk 'BEGIN{start=0;ostart=0}{if ( $0 ~ /BEGIN CERTIFICATE/ ) { start=start+1 };
|
|
if ( start > ostart ) {print $0 >>"'$server'_"start".cert"};
|
|
if ( $0 ~ /END CERTIFICATE/) { ostart=start } }'
|
|
|
|
#
|
|
# from mozilla-nss-tools
|
|
# /usr/sfw/bin on Solaris
|