Changeset 1015

Timestamp:

Apr 7, 2017, 5:56:31 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

EVFSGUI 2.5: Implement ndpsmb 3.0 support

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (10 diffs)
• evfsgui.vry (modified) ( previous)
• rc/lang/evfsi_de.mkm (modified) (1 diff)
• rc/lang/evfsi_en.mkm (modified) (1 diff)
• rc/lang/evfsi_es.mkm (modified) (1 diff)
• rc/lang/evfsi_fr.mkm (modified) (1 diff)
• rc/lang/evfsi_it.mkm (modified) (1 diff)
• rc/lang/evfsi_nl.mkm (modified) (1 diff)
• rc/lang/evfsi_sv.mkm (modified) (1 diff)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -12 +12 @@
 VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,6986,1665
+VRXWindow: __VREToolsWindow,1,2951,12479,6995,1659
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: SW_ADVANCED,1
 UserWindow: SW_PROGRESS,1
-UserWindow: SW_DIALOG,1
+UserWindow: SW_MOUNTPOINT,1
+UserWindow: SW_INFO,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -458 +458 @@
     CD.ctoFH       = VRMethod( "CN_CONDET", "AddField", "String", "cachetimeout" )
     CD.cldFH       = VRMethod( "CN_CONDET", "AddField", "String", "cachelistings" )
+    CD.kerberos5FH = VRMethod( "CN_CONDET", "AddField", "String", "krb5support")
+    CD.ntlmv1FH    = VRMethod( "CN_CONDET", "AddField", "String", "ntlmv1support")
+    CD.encryptionFH= VRMethod( "CN_CONDET", "AddField", "String", "encryptionsupport")
     CD.hashFH      = VRMethod( "CN_CONDET", "AddField", "String", "hash" )
 
@@ -469 +472 @@
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", options.!debug)
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", options.!debug)
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH,    "Visible", options.!debug)
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH,       "Visible", options.!debug)
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.encryptionFH,   "Visible", options.!debug)
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", options.!debug)
 
@@ -484 +490 @@
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportFH ,   "Title", strip(NLVGetMessage(68),"T",":"))
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.rwfh ,          "Title", strip(NLVGetMessage(69),"T",":"))
-
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Title","Kerberos 5 support")
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Title","NTLMv1 support")
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.encryptionFH ,  "Title","Encryption support")
+    
     /* SMBTree columns */
     WorkgroupFH= VRMethod( "CN_smbtree", "AddField", "String", "Workgroup"  )
@@ -909 +918 @@
 
         advanced.!easupport  = 1
+        advanced.!Kerberos5FH = 0
+        advanced.!ntlmv1FH = 1
+        advanced.!encryptionFH = 0
         advanced.!readonly   = 0
         advanced.!alwaysmp   = 0
@@ -4029 +4041 @@
     PARSE VAR resource . ';CTO=' p_cachetimeout ';' .
     PARSE VAR resource . ';CLD=' p_cachelistings ';' .
-    PARSE VAR resource . ';EASUPPORT=' p_easupport ' '
+    PARSE VAR resource . ';EASUPPORT=' p_easupport ';' .
+    PARSE VAR resource . ';KRB5SUPPORT=' p_krb5support ';' .
+    PARSE VAR resource . ';NTLMV1SUPPORT=' p_ntlmv1support ';' .
+    PARSE VAR resource . ';ENCRYPTIONSUPPORT=' p_encryptionsupport ' '
+    
 return
 /*:VRX         PB_ABOUT_CLOSE_Click
@@ -4062 +4078 @@
     advanced.!cachetimeout  = VRGet( "SPIN_CACHETIMEOUT",  "Value" )
     advanced.!cachelistings = VRGet( "SPIN_CACHELISTINGS", "Value" )
+    advanced.!kerberos5     = VRGet( "CB_KERBEROS5",       "Set"   )
+    advanced.!ntlmv1        = VRGet( "CB_NTLMV1",          "Set"   )
+    advanced.!encryption    = VRGet( "CB_ENCRYPTION",      "Set"   )
 
     /* Obsolete */
@@ -4148 +4167 @@
         resource = resource||';LOGLEVEL='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.loglevelfh) */
         resource = resource||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh)
+        resource = resource||';KRB5SUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.kerberos5FH)
+        resource = resource||';NTLMV1SUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.ntlmv1FH)
+        resource = resource||';ENCRYPTIONSUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.encryptionFH)
         resource = resource||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh)
         call lineout filename, resource
@@ -4282 +4304 @@
     options.!cachetimeout  = advanced.!cachetimeout
     options.!cachelistings = advanced.!cachelistings
+    options.!kerberos5     = advanced.!kerberos5     
+    options.!ntlmv1        = advanced.!ntlmv1        
+    options.!encryption    = advanced.!encryption    
 
     vfs.!drive      = ''
@@ -4392 +4417 @@
     advanced.!cachetimeout  = VRGet( "SPIN_CACHETIMEOUT1",  "Value" )
     advanced.!cachelistings = VRGet( "SPIN_CACHELISTINGS1", "Value" )
+    advanced.!kerberos5  = VRGet("CB_KERBEROS51","Set")
+    advanced.!ntlmv1     = VRGet("CB_NTLMV11","Set")
+    advanced.!encryption = VRGet("CB_ENCRYPTION1","Set")
 
     call SW_MOUNTPOINT_Close
@@ -4976 +5004 @@
     IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT",   "Value", advanced.!cachetimeout)
     IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS",  "Value", advanced.!cachelistings)
-
+    IF advanced.!kerberos5     \= "" THEN ok = VRSet("CB_KERBEROS5",        "Set",   advanced.!kerberos5)
+    IF advanced.!NTLMv1        \= "" THEN ok = VRSet("CB_NTLMv1",           "Set",   advanced.!NTLMv1)
+    IF advanced.!encryption    \= "" THEN ok = VRSet("CB_ENCRYPTION",       "Set",   advanced.!encryption)
     /* Obsolete */
     IF advanced.!memlen        \= "" THEN ok = VRSet("SPB_MEMLEN", "Value", advanced.!memlen)

trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm

@@ -152 +152 @@
 EVG0141I: Uhrzeit vor der Synchronisation
 EVG0142I: Uhrzeit nach der Synchronisation
+EVG0143I: Client NTLMv2 auth

trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm

@@ -152 +152 @@
 EVG0141I: Time before sync
 EVG0142I: Time after sync
+EVG0143I: Client NTLMv2 auth

trunk/guitools/evfsgui/rc/lang/evfsi_es.mkm

@@ -152 +152 @@
 EVG0141I: Tiempo antes de sincronizaci¢n
 EVG0142I: Tiempo despu‚s de la sincronizaci¢n
+EVG0143I: Client NTLMv2 auth

trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm

@@ -158 +158 @@
 EVG0141I: L'heure avant synchroniser
 EVG0142I: L'heure aprŠs synchroniser
+EVG0143I: Client NTLMv2 auth

trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm

@@ -157 +157 @@
 EVG0141I: L'ora prima di sincrinozzare
 EVG0142I: L'ora dopo sincrinozzare
+EVG0143I: Client NTLMv2 auth

trunk/guitools/evfsgui/rc/lang/evfsi_nl.mkm

@@ -152 +152 @@
 EVG0141I: Tijd voor sync
 EVG0142I: Tijd after sync
+EVG0143I: Client NTLMv2 auth

trunk/guitools/evfsgui/rc/lang/evfsi_sv.mkm

@@ -152 +152 @@
 EVG0141I: Tid innan synkronisering
 EVG0142I: Tid efter synkronisering
+EVG0143I: Client NTLMv2 auth