Many small fixes uncovered by the testbed layer #02

 - failover recovery for valgrind support
 - better error reporting and detection for epoll support
 - better dependency detection and handling for ESI support
 - ARP build error on FreeBSD
 - hack: silence build error on ZPH QoS support (TODO fix)

TODO:
 - fix ZPH support for BSD (Bug 2537)
 - comm symbol duplication failures under gcc 4.3.2

diff --git a/helpers/ntlm_auth/smb_lm/smbval/valid.c b/helpers/ntlm_auth/smb_lm/smbval/valid.c
index 4815049afa3889a176e260759aa374e02053df24..62a608c9a6b6076a29114e0589ac50c274663dbf 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/smbval/valid.c
+++ b/helpers/ntlm_auth/smb_lm/smbval/valid.c
@@ -1,24 +1,34 @@
 #include "config.h"
+
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#if HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+
 #include "smblib-priv.h"
 #include "valid.h"
 
 SMB_Handle_Type SMB_Connect_Server(void *, char *, char *);
 
 int
-Valid_User(char *USERNAME, char *PASSWORD, char *SERVER, char *BACKUP, char *DOMAIN)
+Valid_User(char *username, char *password, char *server, char *backup, char *domain)
 {
     int pass_is_precrypted_p = 0;
     char *SMB_Prots[] = {
         /*              "PC NETWORK PROGRAM 1.0", */
         /*              "MICROSOFT NETWORKS 1.03", */
         /*              "MICROSOFT NETWORKS 3.0", */
-        "LANMAN1.0",
-        "LM1.2X002",
-        "Samba",
+        (char*)"LANMAN1.0",
+        (char*)"LM1.2X002",
+        (char*)"Samba",
         /*              "NT LM 0.12", */
         /*              "NT LANMAN 1.0", */
         NULL
@@ -26,9 +36,9 @@ Valid_User(char *USERNAME, char *PASSWORD, char *SERVER, char *BACKUP, char *DOM
     SMB_Handle_Type con;
 
     SMB_Init();
-    con = SMB_Connect_Server(NULL, SERVER, DOMAIN);
+    con = SMB_Connect_Server(NULL, server, domain);
     if (con == NULL) {         /* Error ... */
-        con = SMB_Connect_Server(NULL, BACKUP, DOMAIN);
+        con = SMB_Connect_Server(NULL, backup, domain);
         if (con == NULL) {
             return (NTV_SERVER_ERROR);
         }
@@ -42,7 +52,7 @@ Valid_User(char *USERNAME, char *PASSWORD, char *SERVER, char *BACKUP, char *DOM
         SMB_Discon(con, 0);
         return (NTV_PROTOCOL_ERROR);
     }
-    if (SMB_Logon_Server(con, USERNAME, PASSWORD, DOMAIN, pass_is_precrypted_p) < 0) {
+    if (SMB_Logon_Server(con, username, password, domain, pass_is_precrypted_p) < 0) {
         SMB_Discon(con, 0);
         return (NTV_LOGON_ERROR);
     }
@@ -51,15 +61,15 @@ Valid_User(char *USERNAME, char *PASSWORD, char *SERVER, char *BACKUP, char *DOM
 }
 
 void *
-NTLM_Connect(char *SERVER, char *BACKUP, char *DOMAIN, char *nonce)
+NTLM_Connect(char *server, char *backup, char *domain, char *nonce)
 {
     char *SMB_Prots[] = {
         /*              "PC NETWORK PROGRAM 1.0", */
         /*              "MICROSOFT NETWORKS 1.03", */
         /*              "MICROSOFT NETWORKS 3.0", */
-        "LANMAN1.0",
-        "LM1.2X002",
-        "Samba",
+        (char*)"LANMAN1.0",
+        (char*)"LM1.2X002",
+        (char*)"Samba",
         /*              "NT LM 0.12", */
         /*              "NT LANMAN 1.0", */
         NULL
@@ -67,9 +77,9 @@ NTLM_Connect(char *SERVER, char *BACKUP, char *DOMAIN, char *nonce)
     SMB_Handle_Type con;
 
     SMB_Init();
-    con = SMB_Connect_Server(NULL, SERVER, DOMAIN);
+    con = SMB_Connect_Server(NULL, server, domain);
     if (con == NULL) {         /* Error ... */
-        con = SMB_Connect_Server(NULL, BACKUP, DOMAIN);
+        con = SMB_Connect_Server(NULL, backup, domain);
         if (con == NULL) {
             return (NULL);
         }
@@ -89,11 +99,11 @@ NTLM_Connect(char *SERVER, char *BACKUP, char *DOMAIN, char *nonce)
 }
 
 int
-NTLM_Auth(void *handle, char *USERNAME, char *PASSWORD, int flag)
+NTLM_Auth(void *handle, char *username, char *password, int flag)
 {
     SMB_Handle_Type con = handle;
 
-    if (SMB_Logon_Server(con, USERNAME, PASSWORD, NULL, flag) < 0) {
+    if (SMB_Logon_Server(con, username, password, NULL, flag) < 0) {
         return (NTV_LOGON_ERROR);
     }
     return (NTV_NO_ERROR);