Changeset 451


Ignore:
Timestamp:
May 25, 2010, 6:17:14 PM (15 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: SSCC 1.0.0, SMBUsers 0.9.8 several fixes, rest

Location:
branches/guitools-1.0
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/guitools-1.0/install/changes

    r409 r451  
     1Version 1.0.0 13-03-2010
     2                         +Added: Use a more wizard-like style instead of
     3                                 multiple message boxes.
     4                         +Added: Offer to remove and recreate also backend
     5                                 database files.
     6                         +Added: Enhanced search routine for Apache 2.x
     7                         *Changed: Main_Resize works better
     8                         *Changed: Help button removed
     9                         *Changed: Installation process is organized in a
     10                                   more logical order.
     11                         !Fixed: Do not allow to disable creation of "root"
     12                                 account unless it already exists
     13                         !Fixed: Initiate notebook page load earlier (no more
     14                                 crashes in certain situations)
     15                         !Fixed: Do not crash on almost empty smb.conf (created
     16                                 by a client installation
     17                         !Fixed: Bug in NLV.VRS 2.0
     18Version 0.9.5 06-03-2010
     19                         +Added: SambaInit.VRS: _SambaInit() acts more
     20                                 intelligently now
     21                         +Added: Recommend creation of an account for the
     22                                 name stored in %USER% during installation
     23                         *Changed: Use NLV.VRS 2.0 instead of 1.0
    124Version 0.9.4 19-02-2010
    225                         +Added: User is forced to create a "root" account now,

  • branches/guitools-1.0/install/sscc.vrp

    r408 r451  
    33MacroPath: VRM:U:\Develop\Samba\guitools-1.0\install
    44EXEPath:
    5 RunParameters:
     5RunParameters: /install
    66RunDirectory: E:\Dev\REXX\VXREXX\Projects\Samba\install
    77VRXWindow: __VREMainWindow,1,2180,4481,891,7263
    8 VRXWindow: __VRESectionListWindow,1,3011,12286,8974,3144
    9 VRXWindow: __VREToolsWindow,1,3211,10648,6995,1663
     8VRXWindow: __VRESectionListWindow,1,3011,10551,8974,4890
     9VRXWindow: __VREToolsWindow,1,2867,2361,6992,1665
    1010VRXWindow: __VREWindListWindow,1,385,12286,2650,3150
    1111UserFile: 1
    … …  
    1313UserWindow: GB_Global_1,1
    1414UserWindow: Installer,1
     15UserWindow: RemoveConfig,1

  • branches/guitools-1.0/install/sscc.vrx

    r408 r451  
    9393#append U:\Develop\Samba\guitools-1.0\shared\inittempdir.vrs
    9494#append U:\Develop\Samba\guitools-1.0\shared\sambainit.vrs
    95 #append U:\Develop\Samba\guitools-1.0\shared\nlv.vrs
     95#append U:\Develop\Samba\guitools-2.0\shared\nlv.vrs
    9696#append U:\Develop\Samba\guitools-1.0\shared\swat.vrs
    9797*/
    … …  
    400400
    401401    advanced.!bigicons = VRGetIni( "Options", "BigIcons", OurINI)
    402     if advanced.!bigicons = "" then advanced.!bigicons = 0
     402    if advanced.!bigicons = "" then advanced.!bigicons = 1
    403403
    404404    /* Initialize several variables */
    … …  
    418418    CreatePDC = 0   /* only for installermode */
    419419
    420 
    421 
    422420    FWidth = 32
    423421
    424     IF advanced.!bigicons == 1 THEN say '_INIRead() done'
     422    IF options.!debug == 1 THEN say '_INIRead() done'
    425423return
    426424
    … …  
    477475*/
    478476_LoadOtherFuncs:
    479     ok = VRRedirectStdio('OFF')
     477    if options.!Debug then ok = VRREdirectStdIO("ON")
     478                      else ok = VRREdirectStdIO("OFF")
    480479
    481480    call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
    … …  
    673672        call _SmbConfBackup
    674673        if InstallMode then do
    675             Msg.Text = NLVGetMessage(56, samba.!smbconf)
     674            window = VRLoadSecondary( "RemoveConfig", "W" )
     675        end
     676    end
     677
     678    if \VRFileExists(swatusers) & swatauth = 1 & InstallMode = 0 then do
     679        Msg.Text = NLVGetMessage(115, swatusers)
     680        Msg.Type = "W"
     681        call _ShowMsg
     682    end
     683    IF options.!debug == 1 THEN say '  Does "'samba.!smbconf'" still exist? 'SmbConfExists' (1=Yes, 0=No)'
     684    IF options.!debug == 1 THEN say '  Running in InstallMode = 'InstallMode' (1=Yes, 0=No)'
     685
     686    IF options.!debug == 1 THEN say '_SambaCheckComponents() done'
     687return
     688
     689
     690/*          Msg.Text = NLVGetMessage(56, samba.!smbconf)
    676691            Msg.Type = "Q"
    677692            ok = _MsgYesNo()
    … …  
    679694                ok = SysFileDelete(samba.!smbconf)
    680695                SmbConfExists = 0
     696                Msg.Text = "Also reinitialize backend?" /* NLVGetMessage(56, samba.!smbconf) */
     697                Msg.Type = "Q"
     698                ok = _MsgYesNo()
     699                if ok = 1 then do
     700                    ok = SysFileTree(ETC"\samba\*.?db",xdb.,'FOS')
     701                    do I = 1 to xdb.0
     702                        ok = SysFileDelete(xdb.I)
     703                        if ok <> 0 then do
     704                            Msg.Text = "Error "ok" deleting "xdb.I"!"
     705                            Msg.Type = "W"
     706                            call _ShowMsg
     707                        end
     708                    end
     709                end
    681710            end
    682711            else InstallMode = 0
    683         end
    684     end
    685 
    686     if \VRFileExists(swatusers) & swatauth = 1 & InstallMode = 0 then do
    687         Msg.Text = NLVGetMessage(115, swatusers)
    688         Msg.Type = "W"
    689         call _ShowMsg
    690     end
    691     IF options.!debug == 1 THEN say '  Does "'samba.!smbconf'" still exist? 'SmbConfExists' (1=Yes, 0=No)'
    692     IF options.!debug == 1 THEN say '  Running in InstallMode = 'InstallMode' (1=Yes, 0=No)'
    693 
    694     IF options.!debug == 1 THEN say '_SambaCheckComponents() done'
    695 return
     712 */
    696713/*:VRX         _SambaGroupMapInst
    697714*/
    … …  
    828845    id = VRMessageStem( VRWindow(), "smbmsg.", VRGet("Main", "Caption") , "I", "Buttons.", buttons.1, buttons.1 )
    829846return
     847/*:VRX         _SambaUserCreate
     848*/
     849_SambaUserCreate:
     850    eCSUser = value("USER",,"OS2ENVIRONMENT")
     851    if translate(eCSUser) <> "root" & translate(eCSUser) <> "guest" then do
     852        Msg.Text = NLVGetMessage(75, eCSUser)
     853        Msg.Type = "I"
     854        call _ShowMsg
     855    end
     856return
     857
    830858/*:VRX         _SambaVersion
    831859*/
    … …  
    17001728return
    17011729
     1730/*:VRX         CB_RemoveSmbConf_Click
     1731*/
     1732CB_RemoveSmbConf_Click:
     1733    ok = VRSet("CB_RemoveBackend", "Enabled", VRGet("CB_RemoveSmbConf","set"))
     1734    if VRGet("CB_RemoveBackend", "Enabled") = 0 then ok = VRSet("CB_RemoveBackend", "Set", 0)
     1735return
     1736
    17021737/*:VRX         CB_Store_DOS_attributes_Click
    17031738*/
    … …  
    17411776    if PropHandle.0 = 0 then do
    17421777        IF options.!debug == 1 THEN SAY 'CN_smbconf_Click() aborted, no handle'
     1778        Ok = VRset("Main", "Painting", 1)
    17431779        return
    17441780    end
    … …  
    17611797    if Prophandle.1 = smbconf.!root | Prophandle.1 = smbconf.!dirs | Prophandle.1 = smbconf.!printers then do
    17621798        IF options.!debug == 1 THEN SAY 'CN_smbconf_Click() aborted, got parent handle'
     1799        Ok = VRset("Main", "Painting", 1)
    17631800        return
    17641801    end
    … …  
    17851822            ObjXPos = 1325
    17861823            ObjDelta = 320
    1787             if Page = 1 then ActiveGroupObj = VRGet("GB_"ActiveGroup"_1", "Self")
     1824            if Page = 1 then do
     1825                if \VRIsValidObject("GB_"ActiveGroup"_1") then do
     1826                        ActiveGroupObj = VRCreate("GB_Global", "Window", "Name", "GL_GLOBAL_"Page, "Height", 1500, "Width", 1500, "Visible", 0, "Font", "9.WarpSans")
     1827                        IF options.!debug == 1 THEN say '  Neues Fenster VRCreate = 'ok
     1828                        ok = VRLoad( "GB_Global", VRWindowPath(), "GL_GLOBAL_"Page )
     1829                        IF options.!debug == 1 THEN say '  VRLoad = 'ok
     1830                        ok = VRMethod("GB_Global", "InsertPage", "GL_GLOBAL_"Page, "+"Page)
     1831                        IF options.!debug == 1 THEN  say '  InsertPage = 'ok
     1832
     1833/*                    ok = VRset("Main", "Painting", 1)
     1834                    Msg.Text = NLVGetMessage(114)
     1835                    Msg.Type = "I"
     1836                    call _ShowMsg
     1837                    return */
     1838                end
     1839                ActiveGroupObj = VRGet("GB_"ActiveGroup"_1", "Self")
     1840            end
    17881841        end
    17891842        else do
     1843            if \VRIsValidObject("GB_"ActiveGroup) then do
     1844                ok = VRset("Main", "Painting", 1)
     1845                Msg.Text = NLVGetMessage(114)
     1846                Msg.Type = "I"
     1847                call _ShowMsg
     1848                return
     1849            end
    17901850            ActiveGroupObj = "GB_"ActiveGroup
    17911851            ok = VRSet("DT_"ActiveGroup,"Caption",sections.I)
    … …  
    19001960        end
    19011961    end     
    1902     if upCurSection = "GLOBAL" & VRGet("EF_Netbios_name","Value") = "" then do
    1903         ok = VRset("EF_NETBIOS_NAME","Value",Value("HOSTNAME",,"OS2ENVIRONMENT"))
    1904         ok = VRFlush( , "EF_NETBIOS_NAME" )
    1905     end
    1906     if upCurSection = "GLOBAL" & VRGet("EF_WorkGroup","Value") = "" then do
    1907         ok = VRset("EF_WorkGroup","Value","WORKGROUP")
    1908         ok = VRFlush( , "EF_WorkGroup" )
     1962    if upCurSection = "GLOBAL" then do
     1963        if VRGet("EF_Netbios_name","Value") = "" then do
     1964            ok = VRset("EF_NETBIOS_NAME","Value",Value("HOSTNAME",,"OS2ENVIRONMENT"))
     1965            ok = VRFlush( , "EF_NETBIOS_NAME" )
     1966        end
     1967        if VRGet("EF_WorkGroup","Value") = "" then do
     1968            ok = VRset("EF_WorkGroup","Value","WORKGROUP")
     1969            ok = VRFlush( , "EF_WorkGroup" )
     1970        end
    19091971    end
    19101972
    … …  
    21022164        ok = VRSet("CB_NoRoot","Enabled", 0)
    21032165    end
     2166    if \VRFileExists(ETC'\samba\private\secrets.tdb') then do
     2167        ok = VRSet("CB_NoRoot","Enabled", 0)
     2168    end
    21042169    UseTDBsam = 1
    21052170    CreatePDC = 0
    … …  
    21902255
    21912256    call _FindHtpasswd
     2257    call Main_Resize
    21922258    call _SambaCheckComponents
    21932259    call _SambaVersion
    … …  
    22712337    ok = VRSet("GB_Global", "Width",  VRGet("GB_Shares",     "Width"))
    22722338
    2273     Button.Top   = VRGet("GB_SmbConfTree","height")+FWidth*2
    2274     Button.Left  = VRGet("GB_Shares","Left")
    2275     Button.Width = VRGet("PB_Create","Width")
    2276 
    2277     ok = VRSet("PB_Create", "Top",    Button.Top)
    2278     ok = VRSet("PB_Create", "Left",   Button.Left)
    2279 
    2280     ok = VRSet("PB_Reload", "Top",    Button.Top)
    2281     ok = VRSet("PB_Reload", "Left",   Button.Left-2*FWidth-Button.Width)
    2282     ok = VRSet("PB_Reload", "Width",  Button.Width)
    2283 
    2284     ok = VRSet("PB_Undo",   "Top",    Button.Top)
    2285     ok = VRSet("PB_Undo",   "Left",   Button.Left+2*FWidth+Button.Width)
    2286     ok = VRSet("PB_Undo",   "Width",  Button.Width)
    2287 
    2288     ok = VRSet("PB_Cancel", "Top",    Button.Top)
    2289     ok = VRSet("PB_Cancel", "Left",   Button.Left+4*FWidth+Button.Width*2)
    2290     ok = VRSet("PB_Cancel", "Width",  Button.Width)
    2291 
    2292     ok = VRSet("PB_Help",   "Top",    Button.Top)
    2293     ok = VRSet("PB_Help",   "Left",   Button.Left+6*FWidth+Button.Width*3)
    2294     ok = VRSet("PB_Help",   "Width",  Button.Width)
    2295 
    2296     drop Button.
     2339    MButton.bTop   = VRGet("GB_SmbConfTree","height")+FWidth*2
     2340    MButton.bLeft  = VRGet("GB_Shares","Left")
     2341    MButton.bWidth = VRGet("PB_Create","Width")
     2342
     2343    if MButton.bTop < 1300 & MButton.bLeft < 1300 then do
     2344        MButton.bTop = 4842
     2345        MButton.bLeft = 3758
     2346        MButton.bWidth = 1241
     2347        FWidth = 32
     2348    end
     2349
     2350    ok = VRSet("PB_Reload", "Top",    MButton.bTop)
     2351    ok = VRSet("PB_Reload", "Left",   MButton.bLeft)
     2352    ok = VRSet("PB_Reload", "Width",  MButton.bWidth)
     2353
     2354    ok = VRSet("PB_Create", "Top",    MButton.bTop)
     2355    ok = VRSet("PB_Create", "Left",   MButton.bLeft+1*FWidth+MButton.bWidth)
     2356    ok = VRSet("PB_Reload", "Width",  MButton.bWidth)
     2357
     2358    ok = VRSet("PB_Undo",   "Top",    MButton.bTop)
     2359    ok = VRSet("PB_Undo",   "Left",   MButton.bLeft+2*FWidth+MButton.bWidth*2)
     2360    ok = VRSet("PB_Undo",   "Width",  MButton.bWidth)
     2361
     2362    ok = VRSet("PB_Cancel", "Top",    MButton.bTop)
     2363    ok = VRSet("PB_Cancel", "Left",   MButton.bLeft+3*FWidth+MButton.bWidth*3)
     2364    ok = VRSet("PB_Cancel", "Width",  MButton.bWidth)
     2365
     2366 /* ok = VRSet("PB_Help",   "Top",    MButton.bTop)
     2367    ok = VRSet("PB_Help",   "Left",   MButton.bLeft+6*FWidth+MButton.bWidth*3)
     2368    ok = VRSet("PB_Help",   "Width",  MButton.bWidth) */
     2369
     2370    drop MButton.b
    22972371
    22982372    Top    = VRGet("Main","Top")
    … …  
    26612735        if \_SambaRootPWCheck() then return
    26622736    end
     2737
    26632738    call _SmbConfCreateDefault
    26642739    ok = SysFileTree(smbconf,exist.,'FO')
    … …  
    26702745    end
    26712746    call _SambaGuestCreate
     2747
     2748    call _SambaUserCreate
     2749    ok = VRSet("Main", 'Pointer', 'WAIT' )
    26722750    call _SambaGroupMapInst
    2673 
    2674     call Menu_File_ImportHosts_Click
     2751    ok = VRSet("Main", 'Pointer', '<default>' )
     2752    /* call Menu_File_ImportHosts_Click */
    26752753
    26762754    call Installer_Close
    … …  
    26832761        if \_SambaRootPWCheck() then return
    26842762    end
     2763
     2764
    26852765    call _SmbConfMigratePeer
    26862766    ok = SysFileTree(smbconf,exist.,'FO')
    … …  
    26922772    end
    26932773    call _SambaGuestCreate
     2774
     2775    call _SambaUserCreate
     2776    ok = VRSet("Main", 'Pointer', 'WAIT' )
    26942777    call _SambaGroupMapInst
    2695 
    2696     call Menu_File_ImportHosts_Click
     2778    ok = VRSet("Main", 'Pointer', '<default>' )
     2779
     2780/*  call Menu_File_ImportHosts_Click */
    26972781
    26982782    call Installer_Close
    … …  
    27242808    call beep 960, 1
    27252809    address CMD samba.!smbcmd' reload'
     2810return
     2811
     2812/*:VRX         PB_RemoveContinue_Click
     2813*/
     2814PB_RemoveContinue_Click:
     2815
     2816    if VRGet("CB_RemoveSmbConf","set") then do
     2817        ok = SysFileDelete(samba.!smbconf)
     2818        SmbConfExists = 0
     2819        Installmode = 1
     2820    end
     2821    else Installmode = 0
     2822
     2823    if VRGet("CB_RemoveBackend","set") then do
     2824        ok = SysFileTree(ETC"\samba\*.?db",xdb.,'FOS')
     2825        do I = 1 to xdb.0
     2826            ok = SysFileDelete(xdb.I)
     2827            if ok <> 0 then do
     2828                Msg.Text = "Error "ok" deleting "xdb.I"!"
     2829                Msg.Type = "W"
     2830                call _ShowMsg
     2831            end
     2832        end
     2833    end
     2834    if VRGet("CB_RemoveLMHosts","set") then do
     2835        call _LMHostsImport
     2836    end
     2837
     2838    call RemoveConfig_Close
    27262839return
    27272840
    … …  
    28242937return
    28252938
     2939/*:VRX         RemoveConfig_Close
     2940*/
     2941RemoveConfig_Close:
     2942    call RemoveConfig_Fini
     2943return
     2944
     2945/*:VRX         RemoveConfig_Create
     2946*/
     2947RemoveConfig_Create:
     2948    call RemoveConfig_Init
     2949    CALL NLVSetText 'RemoveConfig',                  'Caption', 90
     2950    CALL NLVSetText 'PB_RemoveContinue',             'Caption', 14
     2951
     2952    ok = VRset("CB_RemoveSmbConf","Caption", NLVGetMessage(56, 'smb.conf'))
     2953    ok = VRset("CB_RemoveBackend","Caption", NLVGetMessage(56, 'Backend'))
     2954    ok = VRset("CB_RemoveLMHosts","Caption", NLVGetMessage(56, 'lmhosts'))
     2955
     2956    /* Check if ?db backend files exist */
     2957    ok = SysFileTree(ETC"\samba\*.?db",xdb.,'FOS')
     2958    if xdb.0 = 0 then ok = VRset("CB_RemoveBackend","Enabled", 0)
     2959
     2960    /* Check if LMHOsts exists */
     2961    ok = VRset("CB_RemoveLMHosts","Enabled", VRFileExists(ETC'\samba\lmhosts'))
     2962return
     2963
     2964/*:VRX         RemoveConfig_Fini
     2965*/
     2966RemoveConfig_Fini:
     2967    window = VRInfo( "Window" )
     2968    call VRDestroy window
     2969    drop window
     2970return
     2971/*:VRX         RemoveConfig_Init
     2972*/
     2973RemoveConfig_Init:
     2974    window = VRInfo( "Object" )
     2975    if( \VRIsChildOf( window, "Notebook" ) ) then do
     2976        call VRMethod window, "CenterWindow"
     2977        call VRSet window, "Visible", 1
     2978        call VRMethod window, "Activate"
     2979    end
     2980    drop window
     2981return
     2982
    28262983/*:VRX         TM_Installer_Trigger
    28272984*/

  • branches/guitools-1.0/install/sscc_de.mkm

    r344 r451  
    1717SSC0012I: ~Speichern
    1818SSC0013I: Freigeben
    19 SSC0014?:
     19SSC0014I: Fortfahren
    2020SSC0015?:
    2121SSC0016?:
    … …  
    6161SSC0054I: Abbruch.
    6262SSC0055I: kein Daemonmanagement m”glich
    63 SSC0056I: Aktuelle Datei "%1" l”schen und eine neue erzeugen?
     63SSC0056I: Aktuelles "%1" l”schen und ein neues erzeugen
    6464SSC0057I: Kein Passwort fr "%1" angegeben!
    6565SSC0058I: Bitte Passwort fr "%1" wiederholen!
    … …  
    8080SSC0073I: Aktuelle Konfiguration
    8181SSC0074I: Kleine Symbole
    82 SSC0075?:
     82SSC0075I: Es wird empfohlen sp„ter auch fr Benutzer "%1" ein Konto anzulegen!
    8383SSC0076?:
    8484SSC0077?:

  • branches/guitools-1.0/install/sscc_en.mkm

    r344 r451  
    1717SSC0012I: ~Save
    1818SSC0013I: Share
    19 SSC0014?:
     19SSC0014I: Continue
    2020SSC0015?:
    2121SSC0016?:
    … …  
    6161SSC0054I: aborting.
    6262SSC0055I: unable to manage daemons
    63 SSC0056I: Erase current "%1" and create a new one?
     63SSC0056I: Erase current "%1" and create a new one.
    6464SSC0057I: No password for "%1" provided.
    6565SSC0058I: Please repeat password for "%1".
    … …  
    8080SSC0073I: Current configuration
    8181SSC0074I: Small icons
    82 SSC0075?:
     82SSC0075I: It is recommended to also create an account for user "%1" later!
    8383SSC0076?:
    8484SSC0077?:

  • branches/guitools-1.0/install/sscc_es.mkm

    r344 r451  
    1717SSC0012I: ~Guardar
    1818SSC0013I: Compartir
    19 SSC0014?:
     19SSC0014I: Continuar
    2020SSC0015?:
    2121SSC0016?:
    … …  
    6060SSC0053I: No se puede localizar el componente de Samba "%1"
    6161SSC0054I: Abortando...
    62 SSC0055I: imposible administrar demonios
    63 SSC0056I: borrar actual "%1" y crear uno nuevo?
     62SSC0055I: Imposible administrar demonios
     63SSC0056I: Borrar actual "%1" y crear uno nuevo.
    6464SSC0057I: No se indic¢ contrase€a para "%1".
    6565SSC0058I: Por favor, repita la contrase€a para "%1".
    … …  
    8080SSC0073I: Configuraci¢n actual
    8181SSC0074I: Iconos peque€os
    82 SSC0075?:
     82SSC0075I: Se recomienda crear una cuenta de usuario para "%1" m s adelante!
    8383SSC0076?:
    8484SSC0077?:

  • branches/guitools-1.0/install/sscc_fr.mkm

    r344 r451  
    1919SSC0012I: ~Sauvegarder
    2020SSC0013I: Partage
    21 SSC0014?:
     21SSC0014I: Continuer
    2222SSC0015?:
    2323SSC0016?:
    … …  
    6666SSC0054I: interruption.
    6767SSC0055I: gestion impossible des 'd‚mons'
    68 SSC0056I: Effacement de "%1" actuel et cr‚ation d'un nouveau ?
     68SSC0056I: Effacement de "%1" actuel et cr‚ation d'un nouveau .
    6969SSC0057I: Aucun mot de passe donn‚ pour "%1" !
    7070SSC0058I: Veuillez retaper le mot de passe pour "%1" !
    … …  
    8686SSC0073I: Configuration actuelle
    8787SSC0074I: Ic“nes ~miniatures
    88 SSC0075?:
     88SSC0075I: Il est recommand‚ de cr‚er un compte utilisateur pour "%1" plus tard !
    8989SSC0076?:
    9090SSC0077?:

  • branches/guitools-1.0/install/sscc_sv.mkm

    r344 r451  
    1717SSC0012I: ~Spara
    1818SSC0013I: Dela ut
    19 SSC0014?:
     19SSC0014I: Forts„tta
    2020SSC0015?:
    2121SSC0016?:
    … …  
    6161SSC0054I: avbryter.
    6262SSC0055I: kan inte hantera ”vervakare
    63 SSC0056I: Ta bort aktuell fil "%1" och ers„tt med en ny?
     63SSC0056I: Ta bort aktuell "%1" och ers„tt med en ny.
    6464SSC0057I: Inget l”senord har angivits f”r "%1"!
    6565SSC0058I: Upprepa l”senordet f”r "%1"!
    … …  
    8080SSC0073I: Aktuella konfigurationen
    8181SSC0074I: Sm† ikoner
    82 SSC0075?:
     82SSC0075I: Det rekommenderas att skapa ett konto f”r anv„ndaren "%1" senare!
    8383SSC0076?:
    8484SSC0077?:
    … …  
    9797SSC0089?:
    9898SSC0090I: Installationsl„ge
    99 SSC0091I: Ange l”senord f”r rot-kontot
     99SSC0091I: Ange l”senord f”r "root"-kontot
    100100SSC0092I: L”senord
    101101SSC0093I: Upprepa

  • branches/guitools-1.0/shared/sambainit.vrs

    r408 r451  
    4242    /* smbd.exe */
    4343    samba.!smbd = ""
     44    if samba.!smbd = "" then do /* USER\Samba\ServerPath */
     45        call charout , "  Is Samba ServerPath stored in OS2.INI? "
     46        samba.!bin = strip(VRGetIni( "Samba", "ServerPath2", "USER" ),'T','00'x)
     47        if samba.!bin <> "" then do
     48            say 'Yes, found "'samba.!bin'"'
     49            if VRFileExists(samba.!bin"\smbd.exe") then do
     50                samba.!smbd = samba.!bin"\smbd.exe"
     51                say '  Found "'samba.!smbd'".'
     52            end
     53        end
     54        else say 'No, possibly manual installation.'
     55    end
     56    if samba.!smbd = "" then do /* wellknown locations */
     57        WellKnown = SysBootdrive()"\ecs\system\samba;"SysBootdrive()"\samba"
     58        Programs = value("PROGRAMS",,'OS2ENVIRONMENT')
     59        if Programs <> "" then WellKnown = Wellknown';'Programs'\samba'
     60        Tools = value("TOOLS",,'OS2ENVIRONMENT')
     61        if Tools <> "" then WellKnown = Wellknown';'Tools'\samba'
     62        call charout , "  Are binaries in wellknown locations? "
     63        ok = VRFindFile("smbd.exe",WellKnown)
     64        if ok <> "" then say "Yes."; else say "No."
     65        if ok <> "" then samba.!smbd = ok
     66        drop Wellknown Tools Programs
     67    end
    4468    if samba.!smbd = "" then do /* in current directory? */
    4569        call charout , "  Are binaries in current directory? "
    4670        ok = SysFileTree('.\smbd.exe', exist.,'FO')
    47         say exist.0' (1 = Yes, 0 = No)'
     71        if exist.0 = 1 then say "Yes."; else say "No."
    4872        if exist.0 = 1 then samba.!smbd = exist.1
    4973    end
    … …  
    5175        call charout , "  Are binaries in parent directory? "
    5276        ok = SysFileTree('..\smbd.exe', exist.,'FO')
    53         say exist.0' (1 = Yes, 0 = No)'
     77        if exist.0 = 1 then say "Yes."; else say "No."
    5478        if exist.0 = 1 then samba.!smbd = exist.1
    5579    end
    … …  
    5781        call charout , "  Are binaries in ..\BIN directory? "
    5882        ok = SysFileTree('..\bin\smbd.exe', exist.,'FO')
    59         say exist.0' (1 = Yes, 0 = No)'
     83        if exist.0 = 1 then say "Yes."; else say "No."
    6084        if exist.0 = 1 then samba.!smbd = exist.1
    6185    end
    … …  
    7397    if samba.!smbd = "" then call _ErrorBinaryNotFound 'Could not find smbd.exe!'
    7498
     99
    75100    samba.!bin = VRParseFileName(samba.!smbd,'DP')
    76101    IF options.!debug == 1 THEN say '  Samba binaries = "'samba.!bin'"'
     102    IF options.!debug == 1 THEN say '  Samba smbd.exe = "'samba.!smbd'"'
    77103
    78104    /* smb.cmd */
    … …  
    299325
    300326/*:VRX */
    301 _SambaRunning: procedure expose running. pids. TempDir HaveWinbindd options.
     327_SambaRunning: procedure expose running. pids. TempDir HaveWinbindd options. samba.
    302328    IF options.!debug == 1 THEN say '_SambaRunning() started'
    303329

  • branches/guitools-1.0/shared/swat.vrs

    r277 r451  
    1515        end
    1616    end
     17    if samba.!htpasswdexe = "" then do /* wellknown locations */
     18        WellKnown = SysBootdrive()"\ecs\system\apache2\bin;"SysBootdrive()"\apache2\bin"
     19        Programs = value("PROGRAMS",,'OS2ENVIRONMENT')
     20        if Programs <> "" then WellKnown = Wellknown';'Programs'\apache2\bin'
     21        Tools = value("TOOLS",,'OS2ENVIRONMENT')
     22        if Tools <> "" then WellKnown = Wellknown';'Tools'\apache2\bin'
     23        call charout , "  Are binaries in wellknown locations? "
     24        ok = VRFindFile("htpasswdexe.exe",WellKnown)
     25        if ok <> "" then say "Yes."; else say "No."
     26        if ok <> "" then samba.!htpasswdexe = ok
     27        drop Wellknown Tools Programs
     28    end
     29
    1730    if samba.!htpasswdexe = "" then do /* in current directory? */
    1831        call charout , "  Is htpasswd.exe in current directory? "
    1932        ok = SysFileTree('.\htpasswd.exe', exist.,'FO')
    20         say exist.0' (1 = Yes, 0 = No)'
     33        if exist.0 = 1 then say "Yes."; else say "No."
    2134        if exist.0 = 1 then samba.!htpasswdexe = exist.1
    2235    end
    … …  
    2437        call charout , "  Is htpasswd.exe in parent directory? "
    2538        ok = SysFileTree('..\htpasswd.exe', exist.,'FO')
    26         say exist.0' (1 = Yes, 0 = No)'
     39        if exist.0 = 1 then say "Yes."; else say "No."
    2740        if exist.0 = 1 then samba.!htpasswdexe = exist.1
    2841    end
    … …  
    3043        call charout , "  Is htpasswd.exe in ..\BIN directory? "
    3144        ok = SysFileTree('..\bin\htpasswd.exe', exist.,'FO')
    32         say exist.0' (1 = Yes, 0 = No)'
     45        if exist.0 = 1 then say "Yes."; else say "No."
    3346        if exist.0 = 1 then samba.!htpasswdexe = exist.1
    3447    end
    … …  
    3649        call charout , "  Is htpasswd.exe in "SysBootDrive()"\apache2\bin path? "
    3750        ok = SysFileTree(SysBootDrive()'\apache2\bin\htpasswd.exe', exist.,'FO')
    38         say exist.0' (1 = Yes, 0 = No)'
     51        if exist.0 = 1 then say "Yes."; else say "No."
    3952        if exist.0 = 1 then samba.!htpasswdexe = exist.1
    4053    end
    … …  
    4255        call charout , "  Is htpasswd.exe in ..\..\apache2\bin path? "
    4356        ok = SysFileTree('..\..\apache2\bin\htpasswd.exe', exist.,'FO')
    44         say exist.0' (1 = Yes, 0 = No)'
     57        if exist.0 = 1 then say "Yes."; else say "No."
    4558        if exist.0 = 1 then samba.!htpasswdexe = exist.1
    4659    end

  • branches/guitools-1.0/smbmon/changes

    r302 r451  
    1 Version 0.9.26
    2                         WIP: Add findsmb functionality
     1Version 0.9.26 06-03-2010 (final 0.9.x release)
     2                        +Added: SambaInit.VRS: _SambaInit() acts more
     3                                intelligently now
     4                        *Changed: Use NLV.VRS 2.0 instead of 1.0
     5                        +WIP: Add findsmb functionality, deactivated
     6                              (will not be completed in the 0.9.x series)
    37Version 0.9.25 27-06-2009
    48                        +Added: Check free space on TMPDIR

  • branches/guitools-1.0/smbmon/smbmon.vrp

    r333 r451  
    77VRXWindow: __VREMainWindow,1,2180,3710,940,8000
    88VRXWindow: __VRESectionListWindow,1,2650,12093,9359,3300
    9 VRXWindow: __VREToolsWindow,1,2204,1590,7501,1663
     9VRXWindow: __VREToolsWindow,1,2204,1590,6986,1661
    1010VRXWindow: __VREWindListWindow,1,265,12093,2650,3150
    1111UserFile: 1

  • branches/guitools-1.0/smbmon/smbmon.vrx

    r302 r451  
    9393#append U:\Develop\Samba\guitools-1.0\shared\InitTempDir.VRS
    9494#append U:\Develop\Samba\guitools-1.0\shared\SambaInit.vrs
    95 #append U:\Develop\Samba\guitools-1.0\shared\nlv.vrs
     95#append U:\Develop\Samba\guitools-2.0\shared\nlv.vrs
    9696*/
    9797return

  • branches/guitools-1.0/smbusers/changes

    r409 r451  
     1Version 0.9.8 14-03-2010
     2                         !Fixed: Bug in NLV.VRS 2.0
     3Version 0.9.7 06-03-2010
     4                         +Added: SambaInit.VRS: _SambaInit() is more
     5                                 intelligent now
     6                         *Changed: Use NLV.VRS 2.0 instead of 1.0
    17Version 0.9.6 19-02-2010
    28                         !Fixed: Changing the password crashed smbusers.exe

  • branches/guitools-1.0/smbusers/smbusers.VRP

    r408 r451  
    33MacroPath: VRM:U:\Develop\Samba\guitools-1.0\smbusers
    44EXEPath:
    5 RunParameters:
     5RunParameters: --user=herwig%0k2m
    66RunDirectory: U:\Develop\Samba\guitools-1.0\smbusers
    77VRXWindow: __VREMainWindow,1,2180,3710,891,8000
    8 VRXWindow: __VRESectionListWindow,1,2951,11130,8949,3342
    9 VRXWindow: __VREToolsWindow,1,2457,1012,6986,1669
     8VRXWindow: __VRESectionListWindow,1,2951,9299,8949,5167
     9VRXWindow: __VREToolsWindow,1,2457,1012,6992,1669
    1010VRXWindow: __VREWindListWindow,1,446,11130,2650,3150
    1111UserFile: 1
    1212UserWindow: Main,1
     13UserWindow: About,1

  • branches/guitools-1.0/smbusers/smbusers.VRX

    r408 r451  
    9191__VXREXX____APPENDS__:
    9292/*
    93 #append U:\Develop\Samba\guitools-1.0\shared\nlv.vrs
     93#append U:\Develop\Samba\guitools-2.0\shared\nlv.vrs
    9494#append U:\Develop\Samba\guitools-1.0\shared\inittempDir.vrs
    9595#append U:\Develop\Samba\guitools-1.0\shared\sambainit.vrs
    … …  
    614614    call rxfuncadd 'IniLoadFuncs', 'REXXINI', 'IniLoadFuncs'
    615615    call IniLoadFuncs
     616
     617    call RxFuncAdd 'PRLoadFuncs',  'PR1UTIL', 'PRLoadFuncs'
     618    call PRLoadFuncs
    616619
    617620    /* Deal with DRCtrlxxx */
    … …  
    16131616/*:VRX         _UserRecWriteBackToStems
    16141617*/
    1615 _UserRecWriteBackToStems:
     1618_UserRecWriteBackToStems:
     1619    if \VRIsValidObject( RH )  then return
    16161620    Cur = VRMethod("CN_Users","GetFieldData", RH, NrFH)
    16171621    Username.Cur = VRMethod("CN_Users","GetFieldData", RH, UsernameFH)
    … …  
    21192123return
    21202124
     2125/*:VRX         CN_Users_Click
     2126*/
     2127CN_Users_Click:
     2128    if VRInfo("Top") < 1325 & VRGet("CN_Users", "View") = "Detail" then return
     2129return
     2130
    21212131/*:VRX         CN_Users_ContextMenu
    21222132*/
    21232133CN_Users_ContextMenu:
     2134    say VRInfo("top")
    21242135    if VRInfo("Top") < 1325 & VRGet("CN_users", "View") = "Detail" then call _ColumnsMenu "CN_users"
    21252136    else do
    … …  
    21362147*/
    21372148CN_Users_DoubleClick:
     2149    if VRInfo("Top") < 340 & VRGet("CN_Users", "View") = "Detail" then return
    21382150    say 'CN_Users_DoubleClick() started'
    21392151    RH = VRInfo("Record")
    … …  
    21462158*/
    21472159CN_Users_EndEdit:
     2160    if VRInfo("Top") < 340 & VRGet("CN_Users", "View") = "Detail" then do
     2161        say VRInfo("Object")
     2162        return
     2163    end
    21482164    call beep 880, 20
    21492165    RH = VRInfo("Record")
    … …  
    30893105
    30903106    call _SambaInit
     3107say "hier!"
    30913108    if ErrorState then call _OnErrorDisable
     3109say "hier jetzt!"
    30923110    if StartSamba then do
    30933111        address cmd samba.!smbcmd' start'
    30943112    end
     3113say "hier2!"
    30953114    if \_SambaRunning() then do
    30963115        Msg.Text  = NLVGetMessage(107)
Note: See TracChangeset for help on using the changeset viewer.