Changeset 1042

Timestamp:

Dec 30, 2017, 4:49:32 AM (8 years ago)

Author:

Alex Taylor

Message:

Merge in select changes from CS1039 (fix for password entry bug).

File:

• branches/guitools-arcamap-2.5/evfsgui/evfsgui.vrx (modified) (33 diffs)

branches/guitools-arcamap-2.5/evfsgui/evfsgui.vrx

@@ -493 +493 @@
     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"  )
@@ -1616 +1616 @@
 
     app_name_msg = NLVGetMessage( 0 )
-    IF app_name_msg == '' | WORD( app_name_msg, 1 ) == '[Missing' THEN 
+    IF app_name_msg == '' | WORD( app_name_msg, 1 ) == '[Missing' THEN
         app_name_msg = 'EVFSGUI EVFSGUI'
 
@@ -1797 +1797 @@
 /*:VRX         CB_client_lanman_auth_Click
 */
-CB_client_lanman_auth_Click: 
+CB_client_lanman_auth_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1803 +1803 @@
 /*:VRX         CB_client_NTLMv2_auth_Click
 */
-CB_client_NTLMv2_auth_Click: 
+CB_client_NTLMv2_auth_Click:
     advanced.!smbconfchanged = 1
 
@@ -1820 +1820 @@
 /*:VRX         CB_client_plaintext_auth_Click
 */
-CB_client_plaintext_auth_Click: 
+CB_client_plaintext_auth_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1826 +1826 @@
 /*:VRX         CB_client_use_spnego_Click
 */
-CB_client_use_spnego_Click: 
+CB_client_use_spnego_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1832 +1832 @@
 /*:VRX         CB_client_use_spnego_principal_Click
 */
-CB_client_use_spnego_principal_Click: 
+CB_client_use_spnego_principal_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1844 +1844 @@
 /*:VRX         CB_ENCRYPTION1_Click
 */
-CB_ENCRYPTION1_Click: 
+CB_ENCRYPTION1_Click:
     if VRGet("CB_ENCRYPTION1","set") then do
         ok = VRSet("CB_CB_NTLMv11", "Set", 0)
@@ -1857 +1857 @@
 /*:VRX         CB_ENCRYPTION_Click
 */
-CB_ENCRYPTION_Click: 
+CB_ENCRYPTION_Click:
     if VRGet("CB_ENCRYPTION","set") then do
         ok = VRSet("CB_CB_NTLMv1", "Set", 0)
@@ -1869 +1869 @@
 /*:VRX         CB_KERBEROS51_Click
 */
-CB_KERBEROS51_Click: 
+CB_KERBEROS51_Click:
     if VRGet("CB_KERBEROS51","set") then do
         ok = VRSet("CB_CB_NTLMv11", "Set", 0)
@@ -1880 +1880 @@
 /*:VRX         CB_KERBEROS5_Click
 */
-CB_KERBEROS5_Click: 
+CB_KERBEROS5_Click:
     if VRGet("CB_KERBEROS5","set") then do
         ok = VRSet("CB_CB_NTLMv1", "Set", 0)
@@ -1977 +1977 @@
 /*:VRX         CB_NTLMV11_Click
 */
-CB_NTLMV11_Click: 
+CB_NTLMV11_Click:
     if VRGet("CB_NTLMV11","set") then do
         ok = VRSet("CB_KERBEROS51", "Set", 0)
@@ -1992 +1992 @@
 /*:VRX         CB_NTLMv1_Click
 */
-CB_NTLMv1_Click: 
+CB_NTLMv1_Click:
     if VRGet("CB_NTLMV1","set") then do
         ok = VRSet("CB_KERBEROS5", "Set", 0)
@@ -3155 +3155 @@
 
     hlpmin = VRGet("PB_SMBTREE_REFRESH", "Left") + VRGet("PB_SMBTREE_REFRESH","Width") + marginx2
-    hlppos = rcnr_width - marginx2 - VRGet("PB_SMBTREE_HELP","Width") + 24   
+    hlppos = rcnr_width - marginx2 - VRGet("PB_SMBTREE_HELP","Width") + 24
     IF hlppos < hlpmin THEN hlppos = hlpmin
 
@@ -3865 +3865 @@
     if options.!debug == 1 then say time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
 
+    /* encrypt password if necessary - fix for AN Ticket #1594 */
+    if options.!password <> '' & options.!spassword = '' then do
+        options.!spassword = c2x(options.!password)
+        options.!password = ''
+    end
 
     /* Build the resource parameter string */
@@ -3872 +3877 @@
     IF options.!share      \= '' THEN src = src';SHARE='options.!share
     IF options.!user       \= '' THEN src = src';USER='options.!user
-    IF options.!password   \= '' THEN src = src';PASSWORD='options.!password
+/* fix for AN Ticket #1594 */
+/*  IF options.!password   \= '' THEN src = src';PASSWORD='options.!password */
     IF options.!spassword  \= '' THEN src = src';SPASSWORD='options.!spassword
     IF options.!master     \= '' THEN src = src';MASTER='options.!master
@@ -3895 +3901 @@
     if options.!cachelistings = "" then options.!cachelistings = "32"
     if options.!easupport= "" | options.!easupport= " " then options.!easupport = strip(options.!easupport)
-    if options.!password <> "" & options.!spassword = "" then do
-        options.!spassword = c2x(options.!password)
-        options.!password = ""
-    end
 
     hashstr = mpoint' 'translate(options.!workgroup)' 'translate(options.!server)' 'translate(options.!share)' 'options.!user' 'options.!spassword' 'options.!easupport' 'rwFlag
@@ -4024 +4026 @@
             cd.lastrh = VRMethod("CN_CONDET","AddRecord")
             PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
-    
+
             p_mpoint = strip(p_mpoint,'T','\')||'\'
             p_rw     = word(resource, words(resource))
-    
+
             /* Workaround for truncated resource string */
             if length(p_rw) > 1 then do
@@ -4038 +4040 @@
             /* this should be done unconditionally if the resource string is never truncated */
             else resource  = left(resource,length(resource)-length(p_rw))
-    
+
             call ParseResParmString
-    
+
             if p_master   = "" then p_master   = "WORKGROUP"
             if p_mtype    = "" then p_mtype    = "1"
             if p_loglevel = "" then p_loglevel = "0"
             if p_memlen   = "" then p_memlen   = "2"
-    
+
             /* Also works around for a truncated resource string! */
             if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
-    
+
             if p_password <> "" & p_spassword = "" then do
                 p_spassword = c2x(p_password)
                 p_password = ""
             end
-    
+
             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgrpFH  , p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
@@ -4060 +4062 @@
             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
             ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */
-    
+
             hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
-    
+
             md5 = rexx_md5(hashstr)
-    
+
             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
-    
+
             SELECT
                 WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
@@ -4093 +4095 @@
             userData = "UNKNOWN"
         end
-    end 
+    end
     if left(word(resource,1),5) <> "SMBFS" then do
     end
@@ -4123 +4125 @@
     PARSE VAR resource . ';NTLMV1SUPPORT=' p_ntlmv1support ';' .
     PARSE VAR resource . ';ENCRYPTIONSUPPORT=' p_encryptionsupport ' '
-    
+
 return
 /*:VRX         PB_ABOUT_CLOSE_Click
@@ -4382 +4384 @@
     options.!cachetimeout  = advanced.!cachetimeout
     options.!cachelistings = advanced.!cachelistings
-    options.!kerberos5     = advanced.!kerberos5     
-    options.!ntlmv1        = advanced.!ntlmv1        
-    options.!encryption    = advanced.!encryption    
+    options.!kerberos5     = advanced.!kerberos5
+    options.!ntlmv1        = advanced.!ntlmv1
+    options.!encryption    = advanced.!encryption
 
     vfs.!drive      = ''
@@ -4919 +4921 @@
 /*:VRX         SPIN_client_ipc_signing_Change
 */
-SPIN_client_ipc_signing_Change: 
+SPIN_client_ipc_signing_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4925 +4927 @@
 /*:VRX         SPIN_client_max_protocol_Change
 */
-SPIN_client_max_protocol_Change: 
+SPIN_client_max_protocol_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4931 +4933 @@
 /*:VRX         SPIN_client_min_protocol_Change
 */
-SPIN_client_min_protocol_Change: 
+SPIN_client_min_protocol_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4937 +4939 @@
 /*:VRX         SPIN_client_signing_Change
 */
-SPIN_client_signing_Change: 
+SPIN_client_signing_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4943 +4945 @@
 /*:VRX         SPIN_LOG_LEVEL_Change
 */
-SPIN_LOG_LEVEL_Change: 
+SPIN_LOG_LEVEL_Change:
     advanced.!smbconfchanged = 1
 return
@@ -5578 +5580 @@
 /*:VRX         SW_SMBCONF_Close
 */
-SW_SMBCONF_Close: 
+SW_SMBCONF_Close:
     call SW_SMBCONF_Fini
 return
@@ -5584 +5586 @@
 /*:VRX         SW_SMBCONF_Create
 */
-SW_SMBCONF_Create: 
+SW_SMBCONF_Create:
     call SW_SMBCONF_Init
 return
@@ -5590 +5592 @@
 /*:VRX         SW_SMBCONF_Fini
 */
-SW_SMBCONF_Fini: 
+SW_SMBCONF_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -5597 +5599 @@
 /*:VRX         SW_SMBCONF_Init
 */
-SW_SMBCONF_Init: 
-    
+SW_SMBCONF_Init:
+
     /* Buttons */
     call NLVSetText "PB_SMBCONF_APPLY",  "Caption", 122
@@ -5608 +5610 @@
 /*:VRX         SW_SMBCONF_Init_Content
 */
-SW_SMBCONF_Init_Content: 
+SW_SMBCONF_Init_Content:
     call _SmbConfCreateShadowCopy
 
     client_NTLMv2_auth          = ZeroOne(IniGet('client NTLMv2 auth', 'global', samba.!shadowsmbconf))
     if client_NTLMv2_auth = 1 then do
-        ok = VRSet("CB_client_NTLMv2_auth","Set",client_NTLMv2_auth)        
+        ok = VRSet("CB_client_NTLMv2_auth","Set",client_NTLMv2_auth)
         ok = VRSet("CB_client_lanman_auth","Enabled", 0)
         ok = VRSet("CB_client_plaintext_auth","Enabled", 0)