Changeset 925


Ignore:
Timestamp:
Jun 16, 2016, 4:43:52 PM (9 years ago)
Author:
Herwig Bauernfeind
Message:

GUITools: EVFSGUI: more client settings, SMBMON: made rpm/yum aware, cosmetics

Location:
trunk/guitools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/evfsgui.vrp

    r924 r925  
    1111VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
    1212VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
    13 VRXWindow: __VREToolsWindow,1,2951,12479,5477,1659
     13VRXWindow: __VREToolsWindow,1,2951,12479,5474,1665
    1414VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
    1515UserFile: 1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r924 r925  
    17781778return
    17791779
     1780/*:VRX         CB_client_NTLMv2_auth_Click
     1781*/
     1782CB_client_NTLMv2_auth_Click:
     1783    advanced.!smbconfchanged = 1
     1784
     1785    if VRGet("CB_client_NTLMv2_auth","Set") = 0 then do
     1786        ok = VRSet("CB_client_lanman_auth","Enabled", 1)
     1787        ok = VRSet("CB_client_plaintext_auth","Enabled", 1)
     1788    end
     1789    else do
     1790        ok = VRSet("CB_client_lanman_auth","Enabled", 0)
     1791        ok = VRSet("CB_client_lanman_auth","Set", 0)
     1792        ok = VRSet("CB_client_plaintext_auth","Enabled", 0)
     1793        ok = VRSet("CB_client_plaintext_auth","Set", 0)
     1794    end
     1795return
     1796
    17801797/*:VRX         CB_client_plaintext_auth_Click
    17811798*/
    … …  
    44544471PB_SMBCONF_APPLY_Click:
    44554472    if advanced.!smbconfchanged = 1 then do
     4473        client_NTLMv2_auth          = VRGet("CB_client_NTLMv2_auth","Set")
    44564474        client_lanman_auth          = VRGet("CB_client_lanman_auth","Set")
    44574475        client_plaintext_auth       = VRGet("CB_client_plaintext_auth","Set")
    44584476        client_use_spnego           = VRGet("CB_client_use_spnego","Set")
    44594477        client_use_spnego_principal = VRGet("CB_client_use_spnego_principal","Set")
     4478        client_signing              = VRGet("SPIN_client_signing","Value")
     4479        client_ipc_signing          = VRGet("SPIN_client_ipc_signing","Value")
     4480
     4481        if VRGet("SPIN_client_max_protocol","Enabled") = 1 then do
     4482            client_max_protocol         = VRGet("SPIN_client_max_protocol","Value")
     4483            client_min_protocol         = VRGet("SPIN_client_min_protocol","Value")
     4484        end
     4485
    44604486
    44614487        handle = IniOpen('global', samba.!smbconf)
     4488        call IniSet 'client NTLMv2 auth',          YesNo(client_NTLMv2_auth), handle
    44624489        call IniSet 'client lanman auth',          YesNo(client_lanman_auth), handle
    44634490        call IniSet 'client plaintext auth',       YesNo(client_plaintext_auth), handle
    44644491        call IniSet 'client use spnego',           YesNo(client_use_spnego), handle
    44654492        call IniSet 'client use spnego principal', YesNo(client_use_spnego_principal), handle
     4493        call IniSet 'client signing',              client_signing, handle
     4494        call IniSet 'client ipc signing',          client_ipc_signing, handle
     4495
     4496        if VRGet("SPIN_client_max_protocol","Enabled") = 1 then do
     4497            call IniSet 'client max protocol',         client_max_protocol, handle
     4498            call IniSet 'client min protocol',         client_min_protocol, handle
     4499        end
    44664500
    44674501        call IniSave handle
    … …  
    47374771    if options.!debug == 1 then say time()' '||"Refresh done"
    47384772RETURN 0
     4773
     4774/*:VRX         SPIN_client_ipc_signing_Change
     4775*/
     4776SPIN_client_ipc_signing_Change:
     4777    advanced.!smbconfchanged = 1
     4778return
     4779
     4780/*:VRX         SPIN_client_max_protocol_Change
     4781*/
     4782SPIN_client_max_protocol_Change:
     4783    advanced.!smbconfchanged = 1
     4784return
     4785
     4786/*:VRX         SPIN_client_min_protocol_Change
     4787*/
     4788SPIN_client_min_protocol_Change:
     4789    advanced.!smbconfchanged = 1
     4790return
     4791
     4792/*:VRX         SPIN_client_signing_Change
     4793*/
     4794SPIN_client_signing_Change:
     4795    advanced.!smbconfchanged = 1
     4796return
    47394797
    47404798/*:VRX         SPIN_NRO1_Change
    … …  
    53865444    call _SmbConfCreateShadowCopy
    53875445
    5388     client_lanman_auth          = ZeroOne(IniGet('client lanman auth', 'global', samba.!shadowsmbconf))
    5389     client_plaintext_auth       = ZeroOne(IniGet('client plaintext auth', 'global', samba.!shadowsmbconf))
     5446    client_NTLMv2_auth          = ZeroOne(IniGet('client NTLMv2 auth', 'global', samba.!shadowsmbconf))
     5447    if client_NTLMv2_auth = 1 then do
     5448        ok = VRSet("CB_client_NTLMv2_auth","Set",client_NTLMv2_auth)       
     5449        ok = VRSet("CB_client_lanman_auth","Enabled", 0)
     5450        ok = VRSet("CB_client_plaintext_auth","Enabled", 0)
     5451    end
     5452    else do
     5453        client_lanman_auth          = ZeroOne(IniGet('client lanman auth', 'global', samba.!shadowsmbconf))
     5454        client_plaintext_auth       = ZeroOne(IniGet('client plaintext auth', 'global', samba.!shadowsmbconf))
     5455        ok = VRSet("CB_client_lanman_auth","Set",client_lanman_auth)
     5456        ok = VRSet("CB_client_plaintext_auth","Set",client_plaintext_auth)
     5457    end
     5458
    53905459    client_use_spnego           = ZeroOne(IniGet('client use spnego', 'global', samba.!shadowsmbconf))
     5460    ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
     5461
    53915462    client_use_spnego_principal = ZeroOne(IniGet('client use spnego principal', 'global', samba.!shadowsmbconf))
    5392 
    5393     ok = VRSet("CB_client_lanman_auth","Set",client_lanman_auth)
    5394     ok = VRSet("CB_client_plaintext_auth","Set",client_plaintext_auth)
    5395     ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
    53965463    ok = VRSet("CB_client_use_spnego_principal","Set",client_use_spnego_principal)
     5464
     5465    client_max_protocol         = IniGet('client max protocol', 'global', samba.!shadowsmbconf)
     5466    if client_max_protocol = "" then do
     5467        ok = VRSet("SPIN_client_max_protocol","Enabled", 0)
     5468        ok = VRSet("DT_client_max_protocol","Enabled", 0)
     5469    end
     5470    else ok = VRSet("SPIN_client_max_protocol","Value",client_max_protocol)
     5471
     5472    client_min_protocol         = IniGet('client min protocol', 'global', samba.!shadowsmbconf)
     5473    if client_min_protocol = "" then do
     5474        ok = VRSet("SPIN_client_min_protocol","Enabled", 0)
     5475        ok = VRSet("DT_client_min_protocol","Enabled", 0)
     5476    end
     5477    else ok = VRSet("SPIN_client_min_protocol","Value",client_min_protocol)
     5478
     5479    client_signing         = IniGet('client signing', 'global', samba.!shadowsmbconf)
     5480    client_ipc_signing     = IniGet('client ipc signing', 'global', samba.!shadowsmbconf)
     5481say "client_signing ="client_signing
     5482    ok = VRSet("SPIN_client_signing","Value",client_signing)
     5483    ok = VRSet("SPIN_client_ipc_signing","Value",client_signing)
    53975484
    53985485    advanced.!smbconfchanged = 0

  • trunk/guitools/shared/smbtree.vrs

    r911 r925  
    8383
    8484    ok = file2stem(samba.!serverlist,"smbtreeline.")
     85    if smbtreeline.0 = 0 then do
     86        ok = VRSet("TM_Throbber","Enabled", 0)
     87        ok = VRSet("Pict_Throbber","Visible", 0)
     88    end
     89
    8590
    8691    do sl = 1 to smbtreeline.0
    … …  
    161166/*  ok = VRSet("Main", 'Pointer', '<default>' ) */
    162167    ok = VRSet("CN_smbtree","Enabled", 1)
    163     ok = VRSet("TM_Throbber","Enabled", 0)
    164     ok = VRSet("Pict_Throbber","Visible", 0)
     168/*  ok = VRSet("TM_Throbber","Enabled", 0)
     169    ok = VRSet("Pict_Throbber","Visible", 0) */
    165170    say time()' _RefreshTreeDisplay() done'
    166171return
    … …  
    241246        end
    242247        ok = VRSet("CN_smbtree", "Painting", 0 )
     248        ok = VRSet("TM_Throbber","Enabled", 0)
     249        ok = VRSet("Pict_Throbber","Visible", 0)
    243250        ok = VRSet("CN_smbtree", "Painting", 1 )
    244251        say time()' _AddSharesDisplay() completed'

  • trunk/guitools/smbmon/smbmon.vrp

    r924 r925  
    88VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
    99VRXWindow: __VRESectionListWindow,1,4083,11226,7372,7685
    10 VRXWindow: __VREToolsWindow,1,2156,1494,5471,1659
     10VRXWindow: __VREToolsWindow,1,2156,1494,5477,1663
    1111VRXWindow: __VREWindListWindow,1,964,11708,5372,3150
    1212UserFile: 1
    1313UserWindow: Main,1
     14UserWindow: SW_FILES,1

  • trunk/guitools/smbmon/smbmon.vrx

    r924 r925  
    229229    say '_ContainerInit() started.'
    230230
    231     /* User */
     231    /* Users */
    232232    UIconH     = VRMethod( "CN_Users", "AddField", "Icon",   NLVGetMessage(148) )
    233233    UsernameFH = VRMethod( "CN_Users", "AddField", "String", NLVGetMessage(131) )
    … …  
    252252    NameFH     = VRMethod( "CN_Files", "AddField", "String", NLVGetMessage(142) )
    253253
    254     /* service */
     254    /* Service */
    255255    SIconH     = VRMethod( "CN_Service", "AddField", "Icon",   NLVGetMessage(148) )
    256256    SPIDFH     = VRMethod( "CN_Service", "AddField", "String", NLVGetMessage(130) )
    … …  
    259259    ConnectedFH= VRMethod( "CN_Service", "AddField", "String", NLVGetMessage(144) )
    260260
    261     /* daemons */
     261    /* Daemons */
    262262    DaemonFH   = VRMethod( "CN_Daemons", "AddField", "String", NLVGetMessage(145) )
    263263    DStatusFH  = VRMethod( "CN_Daemons", "AddField", "String", NLVGetMessage(146) )
    264264    DPidsFH    = VRMethod( "CN_Daemons", "AddField", "String", NLVGetMessage(130) )
    265265
    266     /* chktdb */
    267     ChkTDBFilesFH = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(134) )
    268     ChkTDBIconFH  = VRMethod( "CN_CHKTDB", "AddField", "Icon",   NLVGetMessage(146) )
    269     ChkTDBSizeFH  = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(152) )
    270     ChkTDBStatusFH= VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(151) )
    271 
    272     /* Browse tree */
    273     WorkgroupFH= VRMethod( "CN_smbtree", "AddField", "String", NLVGetMessage(150)  )
    274     NBFH      = VRMethod( "CN_smbtree", "AddField", "String", "NetBIOS name" )
    275     IpFH      = VRMethod( "CN_smbtree", "AddField", "String",  NLVGetMessage(147)  )
    276     MBFH      = VRMethod( "CN_smbtree", "AddField", "String", "DMB/LMB" )   
    277    
    278     OSFH   = VRMethod( "CN_smbtree", "AddField", "String", "OS" )   
    279     /* VersionFH = VRMethod( "CN_SmbTree", "AddField", "String", "Version" ) */
    280     CommentFH = VRMethod( "CN_smbtree", "AddField", "String", NLVGetMessage(151) )
    281     MacFH = VRMethod( "CN_smbtree", "AddField", "String", "MAC" )
     266    smbdHandle = VRMethod("CN_Daemons", "Addrecord",, ,"smbd.exe","$41")
     267    nmbdHandle = VRMethod("CN_Daemons", "Addrecord", ,,"nmbd.exe","$41")
     268    winbHandle = VRMethod("CN_Daemons", "Addrecord",, ,"winbindd.exe","$41")
     269
     270    ok = VRMethod("CN_Daemons", "SetFieldData", smbdHandle, DaemonFH, "smbd.exe")
     271    ok = VRMethod("CN_Daemons", "SetFieldData", nmbdHandle, DaemonFH, "nmbd.exe")
     272    ok = VRMethod("CN_Daemons", "SetFieldData", winbHandle, DaemonFH, "winbindd.exe")
     273    ok = (stream(samba.!bin'\winbindd.exe','c','query exists') <> "")
     274    ok = VRMethod("CN_Daemons", "SetRecordAttr", winbHandle, "Visible", ok)
     275    ok = VRMethod("CN_Daemons", "SetRecordAttr","All", "Collapsed", 0 )
     276
     277
     278    /* SMBTree */
     279    WorkgroupFH = VRMethod( "CN_smbtree", "AddField", "String", NLVGetMessage(150)  )
     280    NBFH        = VRMethod( "CN_smbtree", "AddField", "String", "NetBIOS name" )
     281    IpFH        = VRMethod( "CN_smbtree", "AddField", "String",  NLVGetMessage(147)  )
     282    MBFH        = VRMethod( "CN_smbtree", "AddField", "String", "DMB/LMB" )   
     283    OSFH        = VRMethod( "CN_smbtree", "AddField", "String", "OS" )
     284 /* VersionFH   = VRMethod( "CN_SmbTree", "AddField", "String", "Version" ) */
     285    CommentFH   = VRMethod( "CN_smbtree", "AddField", "String", NLVGetMessage(151) )
     286    MacFH       = VRMethod( "CN_smbtree", "AddField", "String", "MAC" )
    282287
    283288    ok = VRMethod("CN_smbtree","SetfieldAttr",IPFH,       "ReadOnly", 1)
    … …  
    288293    ok = VRMethod("CN_smbtree","SetfieldAttr",MacFH,      "ReadOnly", 1)
    289294
    290 
    291     /* add records for the 3 daemons */
    292     smbdHandle = VRMethod("CN_Daemons", "Addrecord",, ,"smbd.exe","$41")
    293     ok = VRMethod("CN_Daemons", "SetFieldData", smbdHandle, DaemonFH, "smbd.exe")
    294     nmbdHandle = VRMethod("CN_Daemons", "Addrecord", ,,"nmbd.exe","$41")
    295     ok = VRMethod("CN_Daemons", "SetFieldData", nmbdHandle, DaemonFH, "nmbd.exe")
    296     winbHandle = VRMethod("CN_Daemons", "Addrecord",, ,"winbindd.exe","$41")
    297     ok = VRMethod("CN_Daemons", "SetFieldData", winbHandle, DaemonFH, "winbindd.exe")
    298     ok = (stream(samba.!bin'\winbindd.exe','c','query exists') <> "")
    299     ok = VRMethod("CN_Daemons", "SetRecordAttr", winbHandle, "Visible", ok)
    300 
    301     ok = VRMethod("CN_Daemons","SetRecordAttr","All", "Collapsed", 0 )
     295    /* ChkTdb */
     296    ChkTDBFilesFH = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(134) )
     297    ChkTDBIconFH  = VRMethod( "CN_CHKTDB", "AddField", "Icon",   NLVGetMessage(146) )
     298    ChkTDBSizeFH  = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(152) )
     299    ChkTDBStatusFH= VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(151) )
     300
     301    ok = VRMethod( "CN_CHKTDB", "SetfieldAttr", ChkTDBIconFH,   "Justification","Center", "ReadOnly", 1)
     302    ok = VRMethod( "CN_CHKTDB", "SetfieldAttr", ChkTDBSizeFH,   "Justification","Right",  "ReadOnly", 1)
     303    ok = VRMethod( "CN_CHKTDB", "SetfieldAttr", ChkTDBStatusFH, "Justification","Right",  "ReadOnly", 1)
    302304
    303305    say '_ContainerInit() done.'
Note: See TracChangeset for help on using the changeset viewer.