Changeset 1072


Ignore:
Timestamp:
Jun 5, 2020, 2:17:28 PM (5 years ago)
Author:
Alex Taylor
Message:

Enable the ENCRYPTIONSUPPORT setting so the Encryption checkbox actually does something.
Make Encryption, NTLMv1 and Kerberos5 detail columns always visible.
Don't turn on NTLMv1 by default.

Location:
branches/guitools-arcamap-2.5/evfsgui
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1070 r1072  
    538538    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", options.!debug)
    539539    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", options.!debug)
     540/* Always show these three (AT)
    540541    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH,    "Visible", options.!debug)
    541542    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH,       "Visible", options.!debug)
    542543    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.encryptionFH,   "Visible", options.!debug)
     544*/
    543545    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", options.!debug)
    544546
    … …  
    556558    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportFH ,   "Title", strip(NLVGetMessage(68),"T",":"))
    557559    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.rwfh ,          "Title", strip(NLVGetMessage(69),"T",":"))
    558     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Title","Kerberos 5 support")
    559     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Title","NTLMv1 support")
    560     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.encryptionFH ,  "Title","Encryption support")
     560    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Title", NLVGetMessage(145))
     561    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Title", NLVGetMessage(144))
     562    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.encryptionFH ,  "Title", NLVGetMessage(146))
    561563
    562564    /* SMBTree columns */
    … …  
    994996        advanced.!easupport  = 1
    995997        advanced.!Kerberos5 = 0
    996         advanced.!ntlmv1 = 1
     998        advanced.!ntlmv1 = 0
    997999        advanced.!encryption = 0
    9981000        advanced.!readonly   = 0
    … …  
    10601062        advanced.!ntlmv1     = VRGetIni('Settings', 'NtlmV1Support',   settings.!ini, 'NoClose')
    10611063        advanced.!kerberos5  = VRGetIni('Settings', 'Krb5Support',     settings.!ini, 'NoClose')
     1064        advanced.!encryption = VRGetIni('Settings', 'EncryptionSupport', settings.!ini, 'NoClose')
    10621065
    10631066        IF advanced.!browseauth == '' THEN advanced.!browseauth = 0
    … …  
    11981201    CALL VRSetIni 'Settings', 'NtlmV1Support', advanced.!ntlmv1       , settings.!ini, 'NoClose'
    11991202    CALL VRSetIni 'Settings', 'Krb5Support',   advanced.!kerberos5    , settings.!ini, 'NoClose'
     1203    CALL VRSetIni 'Settings', 'EncryptionSupport', advanced.!encryption   , settings.!ini, 'NoClose'
    12001204
    12011205    /* Current page */
    … …  
    15071511        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.ntlmv1fh,    p_ntlmv1support)
    15081512        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.kerberos5fh, p_krb5support)
     1513        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.encryptionfh,p_encryptionsupport)
    15091514        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.rwfh,        p_rw)
    15101515        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.hashfh,      md5.cnt)
    … …  
    17281733    advanced.!kerberos5 = ''
    17291734    advanced.!ntlmv1 = ''
     1735    advanced.!encryption = ''
    17301736
    17311737    advanced.!smbconfchanged = 0
    … …  
    37303736        options.!ntlmv1     = p_ntlmv1support
    37313737        options.!kerberos5  = p_krb5support
     3738        options.!encryption = p_encryptionsupport
    37323739        options.!easupport  = p_easupport
    37333740
    … …  
    40024009    IF options.!ntlmv1     \= '' THEN src = src';NTLMV1SUPPORT='options.!ntlmv1
    40034010    IF options.!kerberos5  \= '' THEN src = src';KRB5SUPPORT='options.!kerberos5
     4011    IF options.!encryption \= '' THEN src = src';ENCRYPTIONSUPPORT='options.!encryption
    40044012    IF options.!easupport  \= '' THEN src = src';EASUPPORT='options.!easupport
    40054013
    … …  
    41744182            if p_ntlmv1support = "" | p_ntlmv1support = " " then p_ntlmv1support = strip(advanced.!ntlmv1)
    41754183            if p_krb5support = "" | p_krb5support = " " then p_krb5support = strip(advanced.!kerberos5)
     4184            if p_encryptionsupport = "" | p_encryptionsupport = " " then p_encryptionsupport = strip(advanced.!encryption)
    41764185
    41774186            if p_password <> "" & p_spassword = "" then do
    … …  
    41834192            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)
    41844193            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
    4185             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings, cd.ntlmv1FH, p_ntlmv1support, cd.kerberos5fh, p_krb5support)
     4194            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
     4195            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ntlmv1FH, p_ntlmv1support, cd.kerberos5fh, p_krb5support, cd.encryptionfh,p_encryptionsupport)
    41864196            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.easupportfh, p_easupport, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel, cd.rwfh, p_rw)
    41874197            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
    … …  
    46934703        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 1)
    46944704        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 1)
     4705/*
    46954706        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Visible", 1)
    46964707        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Visible", 1)
     4708*/
    46974709    end
    46984710    else do /* Turn on additional columns in connection details view */
    … …  
    47074719        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 0)
    47084720        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
     4721/*
    47094722        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Visible", 0)
    47104723        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Visible", 0)
     4724*/
    47114725    end
    47124726
    … …  
    53145328    IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT",   "Value", advanced.!cachetimeout)
    53155329    IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS",  "Value", advanced.!cachelistings)
    5316     IF advanced.!kerberos5     \= "" THEN ok = VRSet("CB_KERBEROS5",        "Set",   advanced.!kerberos5)
    5317     IF advanced.!NTLMv1        \= "" THEN ok = VRSet("CB_NTLMv1",           "Set",   advanced.!NTLMv1)
     5330    IF advanced.!NTLMv1        \= "" THEN DO
     5331        ok = VRSet("CB_NTLMv1", "Set", advanced.!NTLMv1)
     5332        ok = VRSet("CB_KERBEROS5", "Enabled", \advanced.!NTLMv1)
     5333    END
     5334    ELSE IF advanced.!kerberos5 \= "" THEN
     5335        ok = VRSet("CB_KERBEROS5", "Set",   advanced.!kerberos5)
    53185336    IF advanced.!encryption    \= "" THEN ok = VRSet("CB_ENCRYPTION",       "Set",   advanced.!encryption)
    53195337    /* Obsolete */
    … …  
    55925610    IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT1", "Value", advanced.!cachetimeout)
    55935611    IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS1","Value", advanced.!cachelistings)
    5594     IF advanced.!ntlmv1        \= "" THEN ok = VRSet("CB_NTLMV1",          "Set",   advanced.!ntlmv1)
    5595     IF advanced.!kerberos5     \= "" THEN ok = VRSet("CB_KERBEROS5",       "Set",   advanced.!kerberos5)
     5612    IF advanced.!ntlmv1        \= "" THEN DO
     5613        ok = VRSet("CB_NTLMV11",    "Set", advanced.!ntlmv1)
     5614        ok = VRSet("CB_KERBEROS51", "Enabled", \advanced.!ntlmv1)
     5615    END
     5616    ELSE IF advanced.!kerberos5 \= "" THEN
     5617        ok = VRSet("CB_KERBEROS51", "Set", advanced.!kerberos5)
     5618    IF advanced.!encryption    \= "" THEN ok = VRSet("CB_ENCRYPTION1",     "Set",   advanced.!encryption)
    55965619return
    55975620
Note: See TracChangeset for help on using the changeset viewer.