Changeset 1069 for branches


Ignore:
Timestamp:
Jun 2, 2020, 1:49:02 AM (5 years ago)
Author:
Alex Taylor
Message:

Prompt to restart daemon if smb.conf is changed due to startup protocol check.
Enable NTLMv1 and Kerberos5 support (i.e. the checkboxes now actually do something, and the options are saved to INI).
Try to fix problems with detection of changes to smb.conf related settings on the global settings pages.
Don't disable encryption checkbox if NTLMv1 support is turned on, they can actually coexist.
Some fixes to resource string parsing (esp. involving case sensitivity).
Delete no-longer-used client_use_spnego_principal checkbox.

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

Legend:

Unmodified
Added
Removed

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

    r1067 r1069  
    472472            CALL IniSave handle
    473473            CALL IniClose handle
     474
     475            CALL _ConfirmRestartDaemon
    474476        END
    475477    END
    476478
    477479return ok
     480
     481/*:VRX         _ConfirmRestartDaemon
     482*/
     483_ConfirmRestartDaemon:
     484
     485    stem.1 = NLVGetMessage( 156 )
     486    stem.2 = ''
     487    stem.3 = NLVGetMessage( 157 )
     488    stem.0 = 3
     489    btn.1 = NLVGetMessage( 6 )
     490    btn.2 = NLVGetMessage( 7 )
     491    btn.0 = 2
     492    ok = VRMessageStem( VRWindow(), 'stem.', NLVGetMessage( 158 ), 'Q', 'btn.', 1, 2 )
     493    IF ok == 1 THEN DO
     494        call VRSet 'Main', 'Pointer', 'Wait'
     495        CALL Menu_File_Daemon_Stop_Click
     496        CALL SysSleep 2
     497        CALL Menu_File_Daemon_Start_Click
     498        call VRSet 'Main', 'Pointer', '<default>'
     499    END
     500
     501return
    478502
    479503/*:VRX         _ContainersInit
    … …  
    951975    IF VRGetIni('SmbConfFlags', 'CheckMinProto', 'User') <> '' THEN DO
    952976        ok = _CheckClientMinProtocol()
    953         IF ok < 3 THEN 
     977        IF ok < 3 THEN
    954978            CALL VRDelIni 'SmbConfFlags', 'CheckMinProto', 'User'
    955979    END
    … …  
    969993
    970994        advanced.!easupport  = 1
    971         advanced.!Kerberos5FH = 0
    972         advanced.!ntlmv1FH = 1
    973         advanced.!encryptionFH = 0
     995        advanced.!Kerberos5 = 0
     996        advanced.!ntlmv1 = 1
     997        advanced.!encryption = 0
    974998        advanced.!readonly   = 0
    975999        advanced.!alwaysmp   = 0
    … …  
    10341058        advanced.!cachetimeout  = VRGetIni('Settings', 'CacheTimeOut', settings.!ini, 'NoClose')
    10351059        advanced.!cachelistings = VRGetIni('Settings', 'CacheListings',settings.!ini, 'NoClose')
     1060        advanced.!ntlmv1     = VRGetIni('Settings', 'NtlmV1Support',   settings.!ini, 'NoClose')
     1061        advanced.!kerberos5  = VRGetIni('Settings', 'Krb5Support',     settings.!ini, 'NoClose')
    10361062
    10371063        IF advanced.!browseauth == '' THEN advanced.!browseauth = 0
    … …  
    11701196    CALL VRSetIni 'Settings', 'CacheTimeOut',  advanced.!cachetimeout , settings.!ini, 'NoClose'
    11711197    CALL VRSetIni 'Settings', 'CacheListings', advanced.!cachelistings, settings.!ini, 'NoClose'
     1198    CALL VRSetIni 'Settings', 'NtlmV1Support', advanced.!ntlmv1       , settings.!ini, 'NoClose'
     1199    CALL VRSetIni 'Settings', 'Krb5Support',   advanced.!kerberos5    , settings.!ini, 'NoClose'
    11721200
    11731201    /* Current page */
    … …  
    14771505        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.mtypefh,     p_mtype)
    14781506        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.easupportfh, p_easupport)
     1507        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.ntlmv1fh,    p_ntlmv1support)
     1508        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.kerberos5fh, p_krb5support)
    14791509        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.rwfh,        p_rw)
    14801510        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.hashfh,      md5.cnt)
    … …  
    15221552            resdata = resdata||';CTO='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.ctoFH)
    15231553            resdata = resdata||';CLD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.cldFH)
     1554            resdata = resdata||';NTLMV1SUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.ntlmv1fh)
     1555            resdata = resdata||';KRB5SUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.kerberos5fh)
    15241556            resdata = resdata||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh)
    15251557            resdata = resdata||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh)
    … …  
    16941726    advanced.!cachelistings = '32'
    16951727
     1728    advanced.!kerberos5 = ''
     1729    advanced.!ntlmv1 = ''
     1730
    16961731    advanced.!smbconfchanged = 0
    16971732
    … …  
    18511886/*:VRX         CB_client_ipc_signing_default_Click
    18521887*/
    1853 CB_client_ipc_signing_default_Click: 
     1888CB_client_ipc_signing_default_Click:
    18541889    advanced.!smbconfchanged = 1
     1890    SAY '[CB_client_ipc_signing_default_Click] smb.conf settings changed.'
    18551891    set = VRGet("CB_client_ipc_signing_default", "Set")
    18561892    ok = VRSet( "SPIN_client_ipc_signing", "Enabled", \set )
    … …  
    18611897CB_client_lanman_auth_Click:
    18621898    advanced.!smbconfchanged = 1
     1899    SAY '[CB_client_lanman_auth_Click] smb.conf settings changed.'
    18631900return
    18641901
    18651902/*:VRX         CB_client_max_protocol_default_Click
    18661903*/
    1867 CB_client_max_protocol_default_Click: 
     1904CB_client_max_protocol_default_Click:
    18681905    advanced.!smbconfchanged = 1
     1906    SAY '[CB_client_max_protocol_default_Click] smb.conf settings changed.'
    18691907    set = VRGet("CB_client_max_protocol_default", "Set")
    18701908    ok = VRSet( "SPIN_client_max_protocol", "Enabled", \set )
    … …  
    18731911/*:VRX         CB_client_min_protocol_default_Click
    18741912*/
    1875 CB_client_min_protocol_default_Click: 
     1913CB_client_min_protocol_default_Click:
    18761914    advanced.!smbconfchanged = 1
     1915    SAY '[CB_client_min_protocol_default_Click] smb.conf settings changed.'
    18771916    set = VRGet("CB_client_min_protocol_default", "Set")
    18781917    ok = VRSet( "SPIN_client_min_protocol", "Enabled", \set )
    … …  
    18831922CB_client_NTLMv2_auth_Click:
    18841923    advanced.!smbconfchanged = 1
     1924    SAY '[CB_client_NTLMv2_auth_Click] smb.conf settings changed.'
    18851925
    18861926    if VRGet("CB_client_NTLMv2_auth","Set") = 0 then do
    … …  
    19001940CB_client_plaintext_auth_Click:
    19011941    advanced.!smbconfchanged = 1
     1942    SAY '[CB_client_plaintext_auth_Click] smb.conf settings changed.'
    19021943return
    19031944
    19041945/*:VRX         CB_client_signing_default_Click
    19051946*/
    1906 CB_client_signing_default_Click: 
     1947CB_client_signing_default_Click:
    19071948    advanced.!smbconfchanged = 1
     1949    SAY '[CB_client_signing_default_Click] smb.conf settings changed.'
    19081950    set = VRGet("CB_client_signing_default", "Set")
    19091951    ok = VRSet( "SPIN_client_signing", "Enabled", \set )
    … …  
    19141956CB_client_use_spnego_Click:
    19151957    advanced.!smbconfchanged = 1
    1916 return
    1917 
    1918 /*:VRX         CB_DEBUG_Click
    1919 */
    1920 CB_DEBUG_Click:
    1921 
    1922 return
    1923 
    1924 /*:VRX         CB_ENCRYPTION1_Click
    1925 */
    1926 CB_ENCRYPTION1_Click:
    1927     if VRGet("CB_ENCRYPTION1","set") then do
    1928         ok = VRSet("CB_NTLMv11", "Set", 0)
    1929         ok = VRSet("CB_NTLMv11", "Enabled", 0)
    1930     end
    1931     else do
    1932         ok = VRSet("CB_NTLMv11", "Enabled", 1)
    1933     end
    1934 
    1935 return
    1936 
    1937 /*:VRX         CB_ENCRYPTION_Click
    1938 */
    1939 CB_ENCRYPTION_Click:
    1940     if VRGet("CB_ENCRYPTION","set") then do
    1941         ok = VRSet("CB_NTLMv1", "Set", 0)
    1942         ok = VRSet("CB_NTLMv1", "Enabled", 0)
    1943     end
    1944     else do
    1945         ok = VRSet("CB_NTLMv1", "Enabled", 1)
    1946     end
     1958    SAY '[CB_client_use_spnego_Click] smb.conf settings changed.'
    19471959return
    19481960
    … …  
    20602072    if VRGet("CB_NTLMV11","set") then do
    20612073        ok = VRSet("CB_KERBEROS51", "Set", 0)
     2074        ok = VRSet("CB_KERBEROS51", "Enabled", 0)
     2075        /*
     2076        ok = VRSet("CB_ENCRYPTION1","Enabled", 0)
    20622077        ok = VRSet("CB_ENCRYPTION1","Set", 0)
    2063         ok = VRSet("CB_KERBEROS51", "Enabled", 0)
    2064         /* ok = VRSet("CB_ENCRYPTION1","Enabled", 0) */
     2078        */
    20652079    end
    20662080    else do
    … …  
    20752089    if VRGet("CB_NTLMV1","set") then do
    20762090        ok = VRSet("CB_KERBEROS5", "Set", 0)
     2091        ok = VRSet("CB_KERBEROS5", "Enabled", 0)
     2092        /*
    20772093        ok = VRSet("CB_ENCRYPTION","Set", 0)
    2078         ok = VRSet("CB_KERBEROS5", "Enabled", 0)
    2079         /* ok = VRSet("CB_ENCRYPTION","Enabled", 0) */
     2094        ok = VRSet("CB_ENCRYPTION","Enabled", 0)
     2095        */
    20802096    end
    20812097    else do
    … …  
    27912807*/
    27922808EF_WINS_SERVER_Change:
    2793     advanced.!smbconfchanged = 1
     2809    pre_val = VRGet('EF_WINS_SERVER', 'UserData')
     2810    new_val = VRGet('EF_WINS_SERVER', 'Value')
     2811    IF pre_val <> new_val THEN DO
     2812        advanced.!smbconfchanged = 1
     2813        SAY '[EF_WINS_SERVER_Change] smb.conf settings changed.'
     2814    END
    27942815return
    27952816
    … …  
    37073728        options.!cachetimeout = p_cachetimeout
    37083729        options.!cachelistings = p_cachelistings
     3730        options.!ntlmv1     = p_ntlmv1support
     3731        options.!kerberos5  = p_krb5support
    37093732        options.!easupport  = p_easupport
    37103733
    … …  
    39774000    IF options.!cachetimeout  \= '' THEN src = src';CTO='options.!cachetimeout
    39784001    IF options.!cachelistings \= '' THEN src = src';CLD='options.!cachelistings
     4002    IF options.!ntlmv1     \= '' THEN src = src';NTLMV1SUPPORT='options.!ntlmv1
     4003    IF options.!kerberos5  \= '' THEN src = src';KRB5SUPPORT='options.!kerberos5
    39794004    IF options.!easupport  \= '' THEN src = src';EASUPPORT='options.!easupport
    39804005
    … …  
    41474172            /* Also works around for a truncated resource string! */
    41484173            if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
     4174            if p_ntlmv1support = "" | p_ntlmv1support = " " then p_ntlmv1support = strip(advanced.!ntlmv1)
     4175            if p_krb5support = "" | p_krb5support = " " then p_krb5support = strip(advanced.!kerberos5)
    41494176
    41504177            if p_password <> "" & p_spassword = "" then do
    … …  
    41534180            end
    41544181
     4182
    41554183            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)
    41564184            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
    4157             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
     4185            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings, cd.ntlmv1FH, p_ntlmv1support, cd.kerberos5fh, p_krb5support)
    41584186            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)
    41594187            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
    … …  
    42124240    PARSE VAR resource . ';SPASSWORD=' p_spassword ';' .
    42134241    PARSE VAR resource . ';MASTER=' p_master ';' .
    4214     PARSE VAR resource . ';MASTERTYPE=' p_mtype ';' .
    4215     PARSE VAR resource . ';MEMLEN=' p_memlen ';' .
     4242    PARSE UPPER VAR resource . ';MASTERTYPE=' p_mtype ';' .
     4243    PARSE UPPER VAR resource . ';MEMLEN=' p_memlen ';' .
    42164244    PARSE VAR resource . ';LOGFILE=' p_logfile ';' .
    4217     PARSE VAR resource . ';LOGLEVEL=' p_loglevel ';' .
    4218     PARSE VAR resource . ';CTO=' p_cachetimeout ';' .
    4219     PARSE VAR resource . ';CLD=' p_cachelistings ';' .
    4220     PARSE VAR resource . ';EASUPPORT=' p_easupport ';' .
    4221     PARSE VAR resource . ';KRB5SUPPORT=' p_krb5support ';' .
    4222     PARSE VAR resource . ';NTLMV1SUPPORT=' p_ntlmv1support ';' .
    4223     PARSE VAR resource . ';ENCRYPTIONSUPPORT=' p_encryptionsupport ' '
     4245    PARSE UPPER VAR resource . ';LOGLEVEL=' p_loglevel ';' .
     4246    PARSE UPPER VAR resource . ';CTO=' p_cachetimeout ';' .
     4247    PARSE UPPER VAR resource . ';CLD=' p_cachelistings ';' .
     4248    PARSE UPPER VAR resource . ';EASUPPORT=' p_easupport ';' .
     4249    PARSE UPPER VAR resource . ';KRB5SUPPORT=' p_krb5support ';' .
     4250    PARSE UPPER VAR resource . ';NTLMV1SUPPORT=' p_ntlmv1support ';' .
     4251    PARSE UPPER VAR resource . ';ENCRYPTIONSUPPORT=' p_encryptionsupport ' '
    42244252
    42254253return
    … …  
    46384666*/
    46394667PB_SETTINGS_APPLY_Click:
     4668
    46404669    advanced.!loglevel    = VRGet("SPIN_LOG_LEVEL", "Value" )
    46414670    advanced.!logfile     = VRGet("EF_LOGFILE",    "Value" )
    … …  
    46634692        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 1)
    46644693        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 1)
     4694        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Visible", 1)
     4695        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Visible", 1)
    46654696    end
    46664697    else do /* Turn on additional columns in connection details view */
    … …  
    46754706        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 0)
    46764707        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
     4708        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ntlmv1FH ,      "Visible", 0)
     4709        ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.kerberos5FH ,   "Visible", 0)
    46774710    end
    46784711
    … …  
    46864719    end
    46874720    if advanced.!smbconfchanged = 1 then do
    4688         name_resolve_order = VRGet("SPIN_NRO1","value")' 'VRGet("SPIN_NRO2","value")' 'VRGet("SPIN_NRO3","value")' 'VRGet("SPIN_NRO4","value")
     4721        nro1 = VRGet("SPIN_NRO1","value")
     4722        nro2 = VRGet("SPIN_NRO2","value")
     4723        nro3 = VRGet("SPIN_NRO3","value")
     4724        nro4 = VRGet("SPIN_NRO4","value")
     4725        name_resolve_order = nro1' 'nro2' 'nro3' 'nro4
     4726
    46894727        handle = IniOpen('global', samba.!smbconf)
    46904728        call IniSet 'name resolve order', name_resolve_order, handle
     4729
     4730        wins_server = VRGet("EF_WINS_SERVER","Value")
    46914731        /* FIXME: Throw an error in this case */
    4692         if \_IsValidIPAddress(VRGet("EF_WINS_SERVER","Value")) then ok = VRSet("EF_WINS_SERVER","Value","")
    4693         call IniSet 'wins server', VRGet("EF_WINS_SERVER","Value"), handle
     4732        if \_IsValidIPAddress(wins_server) then ok = VRSet("EF_WINS_SERVER","Value","")
     4733
     4734        /* Save various last-applied values */
     4735        ok = VRSet("SPIN_NRO1", "UserData", nro1)
     4736        ok = VRSet("SPIN_NRO2", "UserData", nro2)
     4737        ok = VRSet("SPIN_NRO3", "UserData", nro3)
     4738        ok = VRSet("SPIN_NRO4", "UserData", nro4)
     4739        ok = VRSet("EF_WINS_SERVER", "UserData", wins_server)   /* Save last-applied value */
     4740
     4741        call IniSet 'wins server', wins_server, handle
    46944742        call IniSet 'log level', VRGet("SPIN_LOG_LEVEL","Value"), handle
    46954743        call IniSave handle
    46964744        call IniClose handle
     4745        CALL _ConfirmRestartDaemon
    46974746        advanced.!smbconfchanged = 0
    46984747        ok = VRSet("PB_SETTINGS_UNDO","Enabled", 0)
    … …  
    47224771        client_use_spnego           = VRGet("CB_client_use_spnego","Set")
    47234772
    4724         /* This option is deprecated now (ALT 20200522) 
    4725         client_use_spnego_principal = VRGet("CB_client_use_spnego_principal","Set")
     4773        /* This option is deprecated now (ALT 20200522)
     4774        client_use_spnego_principal = 0
    47264775        */
    47274776
    … …  
    47704819        call IniClose handle
    47714820        advanced.!smbconfchanged = 0
     4821
     4822        /* Save the new 'pre-applied' values for the spin buttons */
     4823        call VRSet "SPIN_client_signing", "UserData", client_signing
     4824        call VRSet "SPIN_client_ipc_signing", "UserData", client_ipc_signing
     4825        call VRSet "SPIN_client_max_protocol", "UserData", client_max_protocol
     4826        call VRSet "SPIN_client_min_protocol", "UserData", client_min_protocol
     4827
    47724828        ok = VRSet("PB_SMBCONF_UNDO","Enabled", 0)
    47734829
    4774         stem.1 = NLVGetMessage( 156 )
    4775         stem.2 = ''
    4776         stem.3 = NLVGetMessage( 157 )
    4777         stem.0 = 3
    4778         btn.1 = NLVGetMessage( 6 )
    4779         btn.2 = NLVGetMessage( 7 )
    4780         btn.0 = 2
    4781         ok = VRMessageStem( VRWindow(), 'stem.', NLVGetMessage( 158 ), 'Q', 'btn.', 1, 2 )
    4782         IF ok == 1 THEN DO
    4783             call VRSet 'Main', 'Pointer', 'Wait'
    4784             CALL Menu_File_Daemon_Stop_Click
    4785             CALL SysSleep 2
    4786             CALL Menu_File_Daemon_Start_Click
    4787             call VRSet 'Main', 'Pointer', '<default>'
    4788         END
     4830        CALL _ConfirmRestartDaemon
    47894831
    47904832    end
    … …  
    50605102*/
    50615103SPIN_client_ipc_signing_Change:
    5062     advanced.!smbconfchanged = 1
     5104    pre_val = VRGet( "SPIN_client_ipc_signing", "UserData" )
     5105    new_val = VRGet( "SPIN_client_ipc_signing", "Value" )
     5106    IF new_val <> pre_val THEN DO
     5107        advanced.!smbconfchanged = 1
     5108        SAY '[SPIN_client_ipc_signing_Change] smb.conf settings changed.'
     5109    END
    50635110return
    50645111
    … …  
    50665113*/
    50675114SPIN_client_max_protocol_Change:
    5068     advanced.!smbconfchanged = 1
     5115    pre_val = VRGet( "SPIN_client_max_protocol", "UserData" )
     5116    new_val = VRGet( "SPIN_client_max_protocol", "Value" )
     5117    IF new_val <> pre_val THEN DO
     5118        advanced.!smbconfchanged = 1
     5119        SAY '[SPIN_client_max_protocol_Change] smb.conf settings changed.'
     5120    END
    50695121return
    50705122
    … …  
    50725124*/
    50735125SPIN_client_min_protocol_Change:
    5074     advanced.!smbconfchanged = 1
     5126    pre_val = VRGet( "SPIN_client_min_protocol", "UserData" )
     5127    new_val = VRGet( "SPIN_client_min_protocol", "Value" )
     5128    IF new_val <> pre_val THEN DO
     5129        advanced.!smbconfchanged = 1
     5130        SAY '[SPIN_client_min_protocol_Change] smb.conf settings changed.'
     5131    END
    50755132return
    50765133
    … …  
    50785135*/
    50795136SPIN_client_signing_Change:
    5080     advanced.!smbconfchanged = 1
     5137    pre_val = VRGet( "SPIN_client_signing", "UserData" )
     5138    new_val = VRGet( "SPIN_client_signing", "Value" )
     5139    IF new_val <> pre_val THEN DO
     5140        advanced.!smbconfchanged = 1
     5141        SAY '[SPIN_client_signing_Change] smb.conf settings changed.'
     5142    END
    50815143return
    50825144
    … …  
    50845146*/
    50855147SPIN_LOG_LEVEL_Change:
    5086     advanced.!smbconfchanged = 1
     5148    new_val = VRGet( "SPIN_LOG_LEVEL", "Value" )
     5149    /* Prevent this getting triggered during dialog init: */
     5150    IF new_val <> advanced.!loglevel THEN DO
     5151        advanced.!smbconfchanged = 1
     5152        SAY '[SPIN_LOG_LEVEL_Change] smb.conf settings changed.'
     5153    END
    50875154return
    50885155
    … …  
    50905157*/
    50915158SPIN_NRO1_Change:
    5092     advanced.!smbconfchanged = 1
     5159    pre_val = VRGet( "SPIN_NRO1", "UserData" )
     5160    new_val = VRGet( "SPIN_NRO1", "Value" )
     5161    IF new_val <> pre_val THEN DO
     5162        advanced.!smbconfchanged = 1
     5163        SAY '[SPIN_NRO1_Change] smb.conf settings changed.'
     5164    END
    50935165return
    50945166
    … …  
    50965168*/
    50975169SPIN_NRO2_Change:
    5098     advanced.!smbconfchanged = 1
     5170    pre_val = VRGet( "SPIN_NRO2", "UserData" )
     5171    new_val = VRGet( "SPIN_NRO2", "Value" )
     5172    IF new_val <> pre_val THEN DO
     5173        advanced.!smbconfchanged = 1
     5174        SAY '[SPIN_NRO2_Change] smb.conf settings changed.'
     5175    END
    50995176return
    51005177
    … …  
    51025179*/
    51035180SPIN_NRO3_Change:
    5104     advanced.!smbconfchanged = 1
     5181    pre_val = VRGet( "SPIN_NRO3", "UserData" )
     5182    new_val = VRGet( "SPIN_NRO3", "Value" )
     5183    IF new_val <> pre_val THEN DO
     5184        advanced.!smbconfchanged = 1
     5185        SAY '[SPIN_NRO3_Change] smb.conf settings changed.'
     5186    END
    51055187return
    51065188
    … …  
    51085190*/
    51095191SPIN_NRO4_Change:
    5110     advanced.!smbconfchanged = 1
     5192    pre_val = VRGet( "SPIN_NRO1", "UserData" )
     5193    new_val = VRGet( "SPIN_NRO1", "Value" )
     5194    IF new_val <> pre_val THEN DO
     5195        advanced.!smbconfchanged = 1
     5196        SAY '[SPIN_NRO4_Change] smb.conf settings changed.'
     5197    END
    51115198return
    51125199
    … …  
    55045591    IF advanced.!cachetimeout  \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT1", "Value", advanced.!cachetimeout)
    55055592    IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS1","Value", advanced.!cachelistings)
     5593    IF advanced.!ntlmv1        \= "" THEN ok = VRSet("CB_NTLMV1",          "Set",   advanced.!ntlmv1)
     5594    IF advanced.!kerberos5     \= "" THEN ok = VRSet("CB_KERBEROS5",       "Set",   advanced.!kerberos5)
    55065595return
    55075596
    … …  
    56375726*/
    56385727SW_SETTINGS_Init:
     5728
    56395729    /* Title bar */
    56405730    call NLVSetText "SW_SETTINGS",       "Caption", 47
    … …  
    56865776
    56875777/* Obsolete */
    5688 /*  if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)     
     5778/*  if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)
    56895779    if advanced.!loglevel    \= "0" then ok = VRSet("SPIN_LOG_LEVEL", "Value", advanced.!loglevel) */
    56905780
    … …  
    56965786    if log_level = "" then log_level = 2
    56975787say "log level ="log_level
     5788    advanced.!loglevel = log_level
    56985789    ok = VRSet("SPIN_LOG_LEVEL","Value",log_level)
    56995790
    … …  
    57075798    end
    57085799    else do
    5709         ok = VRSet("EF_WINS_SERVER","Value", IniGet('wins server', 'global', samba.!shadowsmbconf))
     5800        wins_server = IniGet('wins server', 'global', samba.!shadowsmbconf)
     5801        ok = VRSet("EF_WINS_SERVER","UserData", wins_server )   /* Save as pre-Apply value */
     5802        ok = VRSet("EF_WINS_SERVER","Value", wins_server )
    57105803    end
    57115804
    … …  
    57135806
    57145807    do I = 1 to words(name_resolve_order)
     5808        ok = VRSet("SPIN_NRO"||I, "UserData", word(name_resolve_order,I))   /* Save as pre-Apply value */
    57155809        ok = VRSet("SPIN_NRO"||I, "value", word(name_resolve_order,I))
    57165810    end
    … …  
    57415835*/
    57425836SW_SMBCONF_Init:
    5743 
    57445837    /* Buttons */
    57455838    call NLVSetText "PB_SMBCONF_APPLY",  "Caption", 122
    … …  
    57765869    ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
    57775870
    5778     /* This option is deprecated now (ALT 20200522) */
     5871    /* This option is deprecated now (ALT 20200522)
     5872    client_use_spnego_principal = ZeroOne(IniGet('client use spnego principal', 'global', samba.!shadowsmbconf))
     5873     */
    57795874    client_use_spnego_principal = 0
    5780 /*
    5781     client_use_spnego_principal = ZeroOne(IniGet('client use spnego principal', 'global', samba.!shadowsmbconf))
    5782     ok = VRSet("CB_client_use_spnego_principal","Set",client_use_spnego_principal)
    5783 */
    57845875
    57855876    client_max_protocol         = IniGet('client max protocol', 'global', samba.!shadowsmbconf)
    … …  
    57905881    else do
    57915882        parse var client_max_protocol main_proto'_'sub_proto
     5883        ok = VRSet("SPIN_client_max_protocol","UserData",main_proto)      /* Pre-Apply value */
    57925884        ok = VRSet("SPIN_client_max_protocol","Value",main_proto)
    57935885    end
    … …  
    58005892    else do
    58015893        parse var client_min_protocol main_proto'_'sub_proto
     5894        ok = VRSet("SPIN_client_min_protocol","UserData",main_proto)      /* Pre-Apply value */
    58025895        ok = VRSet("SPIN_client_min_protocol","Value",main_proto)
    58035896    end
    … …  
    58065899    client_ipc_signing     = IniGet('client ipc signing', 'global', samba.!shadowsmbconf)
    58075900
     5901    ok = VRSet("SPIN_client_signing","UserData",client_signing)           /* Pre-Apply value */
    58085902    ok = VRSet("SPIN_client_signing","Value",client_signing)
    5809     ok = VRSet("SPIN_client_ipc_signing","Value",client_signing)
    5810 
    5811     if IniGet('client signing', 'global', samba.!smbconf) == '' then
     5903
     5904    ok = VRSet("SPIN_client_ipc_signing","UserData",client_ipc_signing)   /* Pre-Apply value */
     5905    ok = VRSet("SPIN_client_ipc_signing","Value",client_ipc_signing)
     5906
     5907    if IniGet('client signing', 'global', samba.!smbconf) == '' then
    58125908        isdef = 1
    58135909    else
    … …  
    58165912    CALL VRSet "SPIN_client_signing", "Enabled", \isdef
    58175913
    5818     if IniGet('client ipc signing', 'global', samba.!smbconf) == '' then 
     5914    if IniGet('client ipc signing', 'global', samba.!smbconf) == '' then
    58195915        isdef = 1
    58205916    else
Note: See TracChangeset for help on using the changeset viewer.