svn commit: lorikeet r117 - in trunk/mod_ntlm_winbind: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-10-29 08:29:27 +0000 (Fri, 29 Oct 2004)
New Revision: 117

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=117

Log:
Handle the 'BH' reply from ntlm_auth, which indicates that something
went badly wrong.

Andrew Bartlett

Modified:
   trunk/mod_ntlm_winbind/mod_ntlm_winbind.c


Changeset:
Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c
===================================================================
--- trunk/mod_ntlm_winbind/mod_ntlm_winbind.c	2004-10-29 01:23:58 UTC (rev 116)
+++ trunk/mod_ntlm_winbind/mod_ntlm_winbind.c	2004-10-29 08:29:27 UTC (rev 117)
@@ -551,6 +551,7 @@
             ap_destroy_pool(connected_user_authenticated->pool);
             return HTTP_INTERNAL_SERVER_ERROR;
         }
+        *childarg3 = '\0';
         childarg3++;
     
         /* if TT, send to client */
@@ -587,8 +588,16 @@
 
     /* Helper failed */
     
-    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, 
-                  "could not parse %s helper callback: %s", auth_type, args_from_helper);
+    /* if NA, not authenticated */
+    
+    if (strncmp(args_from_helper, "BH ", 3) == 0) {
+        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, 
+                      "ntlm_auth reports Broken Helper: %s", args_from_helper);            
+    } else {
+        
+        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, 
+                      "could not parse %s helper callback: %s", auth_type, args_from_helper);
+    }
 
     ap_destroy_pool(auth_helper->pool);
     ap_destroy_pool(connected_user_authenticated->pool);