--------------------- PatchSet 11468 Date: 2007/06/03 00:47:35 Author: hno Branch: SQUID_2_6 Tag: (none) Log: Author: Markus Moeller MFC: Kerberos SPNEGO helper Kerberos-only SPNEGO helper using MIT or Heimdal kerberos and the refrence SPNEGO parser published by Microsoft Merged changes: 11441 2007/05/14 23:36:28 Markus Moeller +0 -0 Kerberos SPNEGO helper 11441(11453) 2007/05/23 22:43:28 Markus Moeller +220 -236 new squid_kerb_auth version with GPL compatible base64 11441(11454) 2007/05/23 23:11:53 hno +2 -3 Fix trivial syntax errors in squid_kerb_auth Members: configure.in:1.416.2.10->1.416.2.11 helpers/negotiate_auth/Makefile.am:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/COPYING:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/Makefile.am:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/Makefile.in:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/base64.c:1.3->1.3.2.1 helpers/negotiate_auth/squid_kerb_auth/base64.h:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/do.sh:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/helper_interface.patch:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/readme.txt:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth_syntax.patch:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/Makefile:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/derparse.c:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/derparse.h:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/spnego.c:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/spnego.h:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/spnegohelp.c:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/spnegohelp.h:1.1->1.1.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/spnegoparse.c:1.2->1.2.2.1 helpers/negotiate_auth/squid_kerb_auth/spnegohelp/spnegoparse.h:1.1->1.1.2.1 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid/squid/configure.in,v retrieving revision 1.416.2.10 retrieving revision 1.416.2.11 diff -u -r1.416.2.10 -r1.416.2.11 --- squid/configure.in 10 May 2007 23:56:28 -0000 1.416.2.10 +++ squid/configure.in 3 Jun 2007 00:47:35 -0000 1.416.2.11 @@ -1,7 +1,7 @@ dnl dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.416.2.10 2007/05/10 23:56:28 hno Exp $ +dnl $Id: configure.in,v 1.416.2.11 2007/06/03 00:47:35 hno Exp $ dnl dnl dnl @@ -10,7 +10,7 @@ AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE -AC_REVISION($Revision: 1.416.2.10 $)dnl +AC_REVISION($Revision: 1.416.2.11 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -3183,6 +3183,7 @@ helpers/ntlm_auth/SMB/smbval/Makefile \ helpers/negotiate_auth/Makefile \ helpers/negotiate_auth/mswin_sspi/Makefile \ + helpers/negotiate_auth/squid_kerb_auth/Makefile \ helpers/external_acl/Makefile \ helpers/external_acl/ip_user/Makefile \ helpers/external_acl/ldap_group/Makefile \ Index: squid/helpers/negotiate_auth/Makefile.am =================================================================== RCS file: /cvsroot/squid/squid/helpers/negotiate_auth/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- squid/helpers/negotiate_auth/Makefile.am 27 May 2006 08:58:29 -0000 1.2 +++ squid/helpers/negotiate_auth/Makefile.am 3 Jun 2007 00:47:36 -0000 1.2.2.1 @@ -1,7 +1,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.am,v 1.2 2006/05/27 08:58:29 serassio Exp $ +# $Id: Makefile.am,v 1.2.2.1 2007/06/03 00:47:36 hno Exp $ # -DIST_SUBDIRS = mswin_sspi +DIST_SUBDIRS = mswin_sspi squid_kerb_auth SUBDIRS = @NEGOTIATE_AUTH_HELPERS@ Index: squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.am =================================================================== RCS file: /cvsroot/squid/squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 14 May 2007 23:36:29 -0000 1.1 +++ squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 3 Jun 2007 00:47:38 -0000 1.1.2.1 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1 2007/05/14 23:36:29 hno Exp $ +# $Id: Makefile.am,v 1.1.2.1 2007/06/03 00:47:38 hno Exp $ # libexec_PROGRAMS = squid_kerb_auth Index: squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.in =================================================================== RCS file: /cvsroot/squid/squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.in,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.in 21 May 2007 00:13:07 -0000 1.2 +++ squid/helpers/negotiate_auth/squid_kerb_auth/Makefile.in 3 Jun 2007 00:47:38 -0000 1.2.2.1 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.2 2007/05/21 00:13:07 hno Exp $ +# $Id: Makefile.in,v 1.2.2.1 2007/06/03 00:47:38 hno Exp $ # srcdir = @srcdir@