Changeset 931 for branches/client-3.0/src

Timestamp:

Jul 26, 2016, 11:29:20 AM (9 years ago)

Author:

Paul Smedley

Message:

Add support to enable NTLMv1 authentication

Location:

branches/client-3.0/src

Files:

• ndpsmb.c (modified) (3 diffs)
• rc/rc.dlg (modified) (1 diff)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc_ (modified) (2 diffs)
• smbwrp.c (modified) (1 diff)
• smbwrp.h (modified) (1 diff)

branches/client-3.0/src/ndpsmb.c

@@ -111 +111 @@
         {ND_PROP_ULONG, 0, "EASUPPORT", "1"},
         {ND_PROP_ULONG, 0, "KRB5SUPPORT", "0"},
+        {ND_PROP_ULONG, 0, "NTLMv1SUPPORT", "0"},
         {ND_PROP_STRING, 0, NULL, NULL}
 };
@@ -366 +367 @@
         pRes->easupport = 1;
         pRes->krb5support = 0;
+        pRes->ntlmv1support = 0;
         pRes->pdc = NULL;
 
@@ -483 +485 @@
                 }
         }
+        t = 0;
+        rc = ph->fsphQueryUlongProperty (properties, "NTLMv1SUPPORT", &t);
+        if (!rc)
+        {
+                if (t > 1)
+                {
+                        rc = ERROR_INVALID_PARAMETER;
+                }
+                else
+                {
+                        pRes->ntlmv1support = t;
+                }
+        }
+
         t = 0;
         rc = ph->fsphQueryUlongProperty (properties, "CTO", &t);

branches/client-3.0/src/rc/rc.dlg

@@ -36 +36 @@
                         DT_WORDBREAK
         AUTOCHECKBOX    "", CHK_KRB5SUPPORT, 180, 142, 10, 10, WS_GROUP
+        LTEXT           "Support NTLMv1", LBL_NTLMv1SUPPORT, 195, 150, 52, 10, 
+                        DT_WORDBREAK
+        AUTOCHECKBOX    "", CHK_NTLMv1SUPPORT, 180, 152, 10, 10, WS_GROUP
         PUSHBUTTON      "Cancel", DID_CANCEL, 7, 6, 56, 14
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"

branches/client-3.0/src/rc/rc.h

@@ -25 +25 @@
 #define LBL_KRB5SUPPORT               1028
 #define CHK_KRB5SUPPORT               1029
+#define LBL_NTLMv1SUPPORT               1030
+#define CHK_NTLMv1SUPPORT               1031
 #define LBL_CACHETIMEOUT        1014
 #define SPIN_CACHETIMEOUT       1015

branches/client-3.0/src/rc/rc.rc_

@@ -49 +49 @@
    "    easupport - 0 to not support EA, 1 to support\r\n"
    "    krb5support - 0 to not support kerberos authentication, 1 to support\r\n"
+   "    NTLMv1 auth support - 0 to not support NTLMv1 authentication (default), 1 to support\r\n"
    "\r\n"
 }
@@ -131 +132 @@
 
 RCDATA (DLG_ID + 12)
+{
+    CHK_NTLMv1SUPPORT, PARMTYPE_INT, 0L, 1L, "ntlmv1support", "%d", 0L
+}
+
+RCDATA (DLG_ID + 13)
+{
     1
 }

branches/client-3.0/src/smbwrp.c

@@ -254 +254 @@
         }
 
+        if (pRes->ntlmv1support) {
+                lp_set_cmdline("client ntlmv2 auth","no");
+        }
+
         status = cli_connect_nb(
                 server, NULL, port, name_type, NULL,

branches/client-3.0/src/smbwrp.h

@@ -140 +140 @@
         int easupport;
         int krb5support;
+        int ntlmv1support;
         int cachetimeout;
         int cachedepth;