From 47db2ada7806baf9123bd5eb5b3d0562223bc0e7 Mon Sep 17 00:00:00 2001
From: wbaumann <wbaumann>
Date: Wed, 14 Oct 2009 19:54:03 +0000
Subject: [PATCH] support NTLM authentication

---
 ChangeLog    | 4 +++-
 THANKS       | 1 +
 src/webdav.c | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b315549..4b0510b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@ ChangeLog for davfs2
 
 2009-10-14 Werner Baumann (werner.baumann@onlinehome.de)
     * configure.ac:
-      add support for neon 0.29.
+      Add support for neon 0.29.
+    * webdav.c, dav_init_webdav:
+      Support NTLM authentication.
 
 2009-10-10 Werner Baumann (werner.baumann@onlinehome.de)
     * webdav.c, dav_head:
diff --git a/THANKS b/THANKS
index 17ef89c..1c5b193 100644
--- a/THANKS
+++ b/THANKS
@@ -58,6 +58,7 @@ Jan Ortgies <design@mediaworldgmbh.de>
 Joe Orton <joe@manyfish.co.uk>
 Panu Outinen <poutinen@users.sourceforge.net>
 Tero Pelander <tpeland2@users.sourceforge.net>
+Ruediger Pluem <ruediger.pluem@vodafone.com>
 Gauvain Pocentek <gauvain@ulteo.com>
 David Popeck <dpopeck@users.sourceforge.net>
 Sean Reifschneider <jafo@users.sourceforge.net>
diff --git a/src/webdav.c b/src/webdav.c
index b49eeea..67907d5 100644
--- a/src/webdav.c
+++ b/src/webdav.c
@@ -370,7 +370,11 @@ dav_init_webdav(const dav_args *args)
         username = ne_strdup(args->username);
     if (args->password)
         password = ne_strdup(args->password);
+#if NE_VERSION_MINOR < 26
     ne_set_server_auth(session, auth, "server");
+#else /* NE_VERSION_MINOR >= 26 */
+    ne_add_server_auth(session, NE_AUTH_ALL, auth, "server");
+#endif /* NE_VERSION_MINOR >= 26 */
 
     if (args->useproxy && args->p_host) {
         ne_session_proxy(session, args->p_host, args->p_port);
@@ -378,7 +382,11 @@ dav_init_webdav(const dav_args *args)
             p_username = ne_strdup(args->p_user);
         if (args->p_passwd)
             p_password = ne_strdup(args->p_passwd);
+#if NE_VERSION_MINOR < 26
         ne_set_proxy_auth(session, auth, "proxy");
+#else /* NE_VERSION_MINOR >= 26 */
+        ne_add_proxy_auth(session, NE_AUTH_ALL, auth, "proxy");
+#endif /* NE_VERSION_MINOR >= 26 */
     }
 
     if (strcmp(args->scheme, "https") == 0) {