Hello community,
here is the log from the commit of package apache2-mod_auth_ntlm_winbind for
openSUSE:Factory checked in at 2014-03-18 14:13:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_auth_ntlm_winbind (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_auth_ntlm_winbind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_auth_ntlm_winbind"
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache2-mod_auth_ntlm_winbind/apache2-mod_auth_ntlm_winbind.changes
2012-02-21 12:14:40.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.apache2-mod_auth_ntlm_winbind.new/apache2-mod_auth_ntlm_winbind.changes
2014-03-18 14:13:11.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Mar 4 18:47:35 UTC 2014 - l...@samba.org
+
+- Update to svn revision 785.
+ + Only send "Proxy-Authenticate" replies when we are in a forward proxy.
+ + Clean up compile warnings on 64-bit architectures; (bnc#866921).
+ + Ensure that the authenticated user context is set to NULL when freed.
+ + Add a workaround for proxy authorization in IE.
+ + Fix a typo in strcmp usage in process_msg().
+- Remove no longer included AUTHORS file.
+
+-------------------------------------------------------------------
Old:
----
mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682.tar.bz2
New:
----
mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_auth_ntlm_winbind.spec ++++++
--- /var/tmp/diff_new_pack.nOzfJu/_old 2014-03-18 14:13:12.000000000 +0100
+++ /var/tmp/diff_new_pack.nOzfJu/_new 2014-03-18 14:13:12.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_auth_ntlm_winbind
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,16 +27,17 @@
%define apache_serverroot %(%{apxs} -q PREFIX)
%define apache_localstatedir %(%{apxs} -q LOCALSTATEDIR)
%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN &&
$MMN)
-Version: 0.0.0.lorikeet_svn_682
+Version: 0.0.0.lorikeet_svn_785
Release: 0
-Requires: apache2 %{apache_mmn} samba-winbind
+Requires: %{apache_mmn}
+Requires: apache2
+Requires: samba-winbind
Summary: Enables Apache to authenticate users against Microsoft like DCs
License: Apache-2.0
Group: Productivity/Networking/Web/Servers
Url: http://samba.org/
Source: %{modname}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#Docdir: %{_defaultdocdir}/%{apache}
%description
mod_auth_ntlm_winbind is an Apache module to authenticate users and
@@ -61,7 +62,6 @@
%files
%defattr(-,root,root)
-%doc AUTHORS
%doc README
# copyright notice contained here:
%dir %{apache_libexecdir}
++++++ mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682.tar.bz2 ->
mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785.tar.bz2 ++++++
++++ 5698 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/500mod_auth_ntlm_winbind.info
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/500mod_auth_ntlm_winbind.info
---
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/500mod_auth_ntlm_winbind.info
2006-11-14 17:43:26.000000000 +0100
+++
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/500mod_auth_ntlm_winbind.info
2007-11-08 16:47:58.000000000 +0100
@@ -1,4 +1,4 @@
-LoadModule: ntlm_winbind_module /usr/lib/apache/1.3/mod_auth_ntlm_winbind.so
+LoadModule: auth_ntlm_winbind_module
/usr/lib/apache/1.3/mod_auth_ntlm_winbind.so
Directives:
NTLMAuth
NegotiateAuth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/AUTHORS
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/AUTHORS
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/AUTHORS 2006-11-14
17:43:26.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/AUTHORS 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-Andreas Gal <a...@uwsp.edu>
-Sverre H. Huseby <sverr...@online.no>
-Tim Potter <t...@samba.org>
-Andrew Bartlett <abart...@samba.org>
-
-Apache2 code by Waider <wai...@waider.ie>
-
-Based partially on:
- mod_ntlm.c for Win32 by Tim Costello <tim.coste...@bigfoot.com>
- pam_smb by Dave Airlie <dave.air...@ul.ie>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/VERSION
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/VERSION
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/VERSION 2006-11-15
11:57:50.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/VERSION 2007-11-08
16:47:58.000000000 +0100
@@ -1,2 +1 @@
MOD_AUTH_NTLM_WINBIND_VERSION="0.0.0"
-MOD_AUTH_NTLM_WINBIND_SVNVERSION="682"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/configure.in
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/configure.in
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/configure.in
2006-11-14 17:43:26.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/configure.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT(mod_auth_ntlm_winbind.c)
-
-# Basic stuff
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_STDC_HEADERS
-
-# We use axps to compile source files, which may be in /usr/sbin
-AC_ARG_WITH(apxs,
-[ --with-apxs=PATH Specify path to apxs],
-[ APXS="$withval" ],
-[ AC_PATH_PROGS([APXS], [apxs2 apxs],, [$PATH:/usr/sbin]) ])
-
-AC_ARG_WITH(apache,
-[ --with-apache=PATH Specify path to apache executable],
-[ HTTPD="$withval" ],
-[ AC_PATH_PROG([HTTPD], [httpd], [/usr/sbin/httpd], [$PATH:/usr/sbin]) ])
-
-APACHE_VER=`${HTTPD} -v | grep version`
-if echo "$APACHE_VER" | grep -q "/2\."
-then
- APXS_FLAGS=-DAPACHE2
- SODIR=.libs/
- echo "Building for Apache 2."
-else
- echo "Building for Apache 1."
-fi
-
-# Check for some headers
-
-AC_CHECK_HEADERS(stdlib.h unistd.h sys/socket.h sys/time.h grp.h)
-AC_CHECK_HEADERS(nss_common.h nss.h)
-
-# Determine size of basic types
-
-AC_CHECK_SIZEOF(int,cross)
-AC_CHECK_SIZEOF(long,cross)
-AC_CHECK_SIZEOF(short,cross)
-
-# Create Makefile
-AC_SUBST(APXS_FLAGS)
-AC_SUBST(SODIR)
-AC_OUTPUT(Makefile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/contrib/mod_auth_ntlm_winbind-20060510-connect_http10.patch
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/contrib/mod_auth_ntlm_winbind-20060510-connect_http10.patch
---
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/contrib/mod_auth_ntlm_winbind-20060510-connect_http10.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/contrib/mod_auth_ntlm_winbind-20060510-connect_http10.patch
2007-11-08 16:47:58.000000000 +0100
@@ -0,0 +1,33 @@
+diff -bu mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
mod_auth_ntlm_winbind-OK/mod_auth_ntlm_winbind.c
+--- mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c 2006-05-11
17:52:54.000000000 +0400
++++ mod_auth_ntlm_winbind-OK/mod_auth_ntlm_winbind.c 2006-07-07
19:44:12.000000000 +0400
+@@ -997,6 +997,29 @@
+ : "Authorization");
+ const char *auth_line2;
+
++#ifdef APACHE2
++ /* ap_set_keepalive() does not check for
++ "Proxy-Connection: keep-alive", and therefore breaks NTLM auth
++ for the CONNECT proxying ("https" etc.) when a browser uses HTTP/1.0
++ for CONNECT (like IE6+ does).
++
++ An ugly work-around to fix it here:
++ When "CONNECT .... HTTP/1.0" without any "Connection: ..."
++ but with "Proxy-Connection: keep-alive", set "Connection: keep-alive"
++ manually (which will be successfully eaten by ap_set_keepalive() later)
++ */
++
++ if (r->method_number == M_CONNECT &&
++ r->proto_num == HTTP_VERSION(1,0) &&
++ !apr_table_get(r->headers_in, "Connection") &&
++ ap_find_token(r->pool,
++ apr_table_get(r->headers_in, "Proxy-Connection"),
++ "keep-alive") != 0
++ ) {
++ apr_table_mergen(r->headers_in, "Connection", "keep-alive");
++ }
++#endif
++
+ /* Trust the authentication on an existing connection */
+ if (ctxt->connected_user_authenticated &&
ctxt->connected_user_authenticated->user) {
+ /* internal redirects cause this to get called more than once
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/auth_ntlm_winbind.load
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/auth_ntlm_winbind.load
---
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/auth_ntlm_winbind.load
2006-11-14 23:17:21.000000000 +0100
+++
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/auth_ntlm_winbind.load
2007-11-08 16:47:58.000000000 +0100
@@ -1 +1 @@
-LoadModule ntlm_auth_winbind_module
/usr/lib/apache2/modules/mod_auth_ntlm_winbind.so
+LoadModule auth_ntlm_winbind_module
/usr/lib/apache2/modules/mod_auth_ntlm_winbind.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/changelog
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/changelog
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/changelog
2006-11-14 17:43:26.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/changelog
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-apache-mod-ntlm-winbind (0.1) UNRELEASED; urgency=low
-
- * Initial release. (Closes: #XXXXXX)
-
- -- Jelmer Vernooij <jel...@samba.org> Sat, 8 Apr 2006 19:46:11 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/compat
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/compat
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/compat
2006-11-14 17:43:26.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/compat
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/control
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/control
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/control
2006-11-14 17:43:26.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/control
1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Source: apache-mod-ntlm-winbind
-Section: web
-Priority: optional
-Maintainer: Jelmer Vernooij <jel...@samba.org>
-Build-Depends: debhelper (>= 5.0.0), apache-dev, apache2-threaded-dev, apache2
-Standards-Version: 3.6.2
-
-Package: libapache-mod-auth-ntlm-winbind
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache-common, winbind
-Description: apache module for NTLM authentication against Winbind
- An apache module for authenticating users against Winbind using NTLM.
-
-Package: libapache2-mod-auth-ntlm-winbind
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-common, winbind
-Description: apache2 module for NTLM authentication against Winbind
- An apache2 module for authenticating users against Winbind using NTLM.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/rules
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/rules
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/debian/rules
2006-11-14 17:43:26.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/debian/rules
1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-#!/usr/bin/make -f
-# Based on the debian/rules from the mod-auth-kerb package
-
-CFLAGS = -Wall -g
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-build: build-stamp
-
-build-stamp:
- dh_testdir
- touch build-stamp
-
-build-apache13:
- dh_testdir
- -$(MAKE) clean
- ./configure --with-apxs=/usr/bin/apxs
- make
-
-build-apache20:
- dh_testdir
- -$(MAKE) clean
- ./configure --with-apxs=/usr/bin/apxs2 --with-apache=/usr/sbin/apache2
- make
-
-apache13: build-apache13
- mkdir -p debian/libapache-mod-auth-ntlm-winbind/usr/lib/apache/1.3 \
-
debian/libapache-mod-auth-ntlm-winbind/usr/share/doc/libapache-mod-auth-ntlm-winbind
-
- install -s -m 755 mod_auth_ntlm_winbind.so
debian/libapache-mod-auth-ntlm-winbind/usr/lib/apache/1.3/
- install -m 644 $(CURDIR)/500mod_auth_ntlm_winbind.info
debian/libapache-mod-auth-ntlm-winbind/usr/lib/apache/1.3/
- install -m 644 README \
-
debian/libapache-mod-auth-ntlm-winbind/usr/share/doc/libapache-mod-auth-ntlm-winbind/
-
-apache20: build-apache20
- mkdir -p
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/usr/lib/apache2/modules/ \
-
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/usr/share/doc/libapache2-mod-auth-ntlm-winbind
\
-
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/etc/apache2/mods-available
- install -s -m 644 $(CURDIR)/.libs/mod_auth_ntlm_winbind.so
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/usr/lib/apache2/modules/mod_auth_ntlm_winbind.so
- install $(CURDIR)/.libs/mod_auth_ntlm_winbind.so
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/usr/lib/apache2/modules/mod_auth_ntlm_winbind.so
- install -m644 $(CURDIR)/debian/auth_ntlm_winbind.load
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/etc/apache2/mods-available
- install -m 644 $(CURDIR)/README \
-
$(CURDIR)/debian/libapache2-mod-auth-ntlm-winbind/usr/share/doc/libapache2-mod-auth-ntlm-winbind/
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -f config.log config.status
-
- -$(MAKE) clean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- rm -f debian/files
- dh_clean -k
-
-install: install-stamp
-intall-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-binary-indep:
-
-binary-arch: build apache13 apache20
- dh_testdir -a
- dh_testroot -a
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-arch binary-indep
-.PHONY: binary-indep binary-arch build-apache13 build-apache20 binary install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/mod_auth_ntlm_winbind.c
new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/mod_auth_ntlm_winbind.c
--- old/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_682/mod_auth_ntlm_winbind.c
2006-11-15 00:27:15.000000000 +0100
+++ new/mod_auth_ntlm_winbind-0.0.0.lorikeet_svn_785/mod_auth_ntlm_winbind.c
2007-11-08 16:47:58.000000000 +0100
@@ -320,7 +320,7 @@
line = apr_pstrcat(r->pool, NEGOTIATE_AUTH_NAME, " ",
negotiate_auth_line, NULL);
apr_table_add(r->err_headers_out,
- r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
+ (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authenticate" :
"WWW-Authenticate",
line);
}
@@ -328,7 +328,7 @@
if (crec->ntlm_on) {
apr_table_add(r->err_headers_out,
- r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
+ (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authenticate" :
"WWW-Authenticate",
NTLM_AUTH_NAME);
}
@@ -340,13 +340,14 @@
"Basic realm=\"", crec->ntlm_basic_realm, "\"",
NULL);
apr_table_add(r->err_headers_out,
- r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
+ (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authenticate" :
"WWW-Authenticate",
line);
}
if ( ctxt->connected_user_authenticated &&
ctxt->connected_user_authenticated->pool ) {
apr_pool_destroy( ctxt->connected_user_authenticated->pool );
+ ctxt->connected_user_authenticated = NULL;
}
return HTTP_UNAUTHORIZED;
@@ -357,7 +358,7 @@
get_auth_header(request_rec * r, ntlm_config_rec * crec, const char
*auth_scheme)
{
const char *auth_line = apr_table_get(r->headers_in,
- r->proxyreq ? "Proxy-Authorization"
+ (PROXYREQ_PROXY == r->proxyreq) ?
"Proxy-Authorization"
: "Authorization");
if (!auth_line) {
@@ -412,7 +413,7 @@
/* Read negotiate from ntlm_auth */
apr_table_setn(r->err_headers_out,
- r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
+ (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authenticate" :
"WWW-Authenticate",
apr_psprintf(r->pool, "%s %s", auth_scheme, reply));
/* This is to make sure that when receiving later messages
@@ -495,7 +496,7 @@
char *newline;
char args_to_helper[HUGE_STRING_LEN];
char args_from_helper[HUGE_STRING_LEN];
- unsigned int bytes_written;
+ size_t bytes_written;
int bytes_read;
if (( global_ntlm_context.ntlm_plaintext_helper = get_auth_helper( r,
global_ntlm_context.ntlm_plaintext_helper, crec->ntlm_plaintext_helper,
CLEANUP(cleanup_ntlm_plaintext_helper))) == NULL ) {
@@ -539,7 +540,7 @@
#endif
if ( bytes_written < strlen( args_to_helper )) {
- RDEBUG( "failed to write user/pass to helper - wrote %d bytes",
bytes_written );
+ RDEBUG( "failed to write user/pass to helper - wrote %d bytes", (int)
bytes_written );
apr_pool_destroy( global_ntlm_context.ntlm_plaintext_helper->pool );
apr_pool_destroy( ctxt->connected_user_authenticated->pool );
return HTTP_INTERNAL_SERVER_ERROR;
@@ -624,7 +625,7 @@
char args_to_helper[HUGE_STRING_LEN];
char args_from_helper[HUGE_STRING_LEN];
ntlm_connection_context_t *ctxt = get_connection_context( r->connection );
- unsigned int bytes_written;
+ size_t bytes_written;
int bytes_read;
struct _ntlm_auth_helper *auth_helper;
@@ -690,7 +691,7 @@
bytes_written = ap_bwrite(auth_helper->out_to_helper, args_to_helper,
strlen(args_to_helper));
#endif
if (bytes_written < strlen(args_to_helper)) {
- RDEBUG("failed to write NTLMSSP string to helper - wrote %d bytes",
bytes_written);
+ RDEBUG("failed to write NTLMSSP string to helper - wrote %d bytes",
(int) bytes_written);
apr_pool_destroy(auth_helper->pool);
apr_pool_destroy(ctxt->connected_user_authenticated->pool);
@@ -838,10 +839,10 @@
r->connection->ap_auth_type =
ctxt->connected_user_authenticated->auth_type;
#endif
- if (!strcmp("*", childarg)) {
+ if (strcmp("*", childarg) != 0) {
/* Send last leg (possible mutual authentication token) */
apr_table_setn(r->headers_out,
- r->proxyreq ? "Proxy-Authenticate" :
"WWW-Authenticate",
+ (PROXYREQ_PROXY == r->proxyreq) ?
"Proxy-Authenticate" : "WWW-Authenticate",
apr_psprintf(r->pool, "%s %s", auth_type,
childarg));
}
@@ -946,7 +947,7 @@
&auth_ntlm_winbind_module);
ntlm_connection_context_t *ctxt = get_connection_context( r->connection );
const char *auth_line = apr_table_get(r->headers_in,
- r->proxyreq ? "Proxy-Authorization"
+ (PROXYREQ_PROXY == r->proxyreq) ?
"Proxy-Authorization"
: "Authorization");
const char *auth_line2;
@@ -1022,6 +1023,7 @@
if (ctxt->connected_user_authenticated &&
ctxt->connected_user_authenticated->pool ) {
apr_pool_destroy(ctxt->connected_user_authenticated->pool);
+ ctxt->connected_user_authenticated = NULL;
}
RDEBUG( "declined" );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
