Changeset 1053

Timestamp:

Feb 7, 2018, 10:39:40 AM (8 years ago)

Author:

Herwig Bauernfeind

Message:

SMBMon: ACLS browser, missing, recreated stuff

Location:

trunk/guitools

Files:

• shared/browse.vrs (modified) (1 diff)
• shared/smbtree.vrs (modified) (1 diff)
• smbmon/rc/icons/Bitmap2.bmp (added)
• smbmon/rc/icons/PDF.ICO (added)
• smbmon/rc/icons/Pointer1.ptr (added)
• smbmon/rc/icons/doit.cmd (added)
• smbmon/rc/icons/erase.bmp (added)
• smbmon/rc/icons/err.ico (added)
• smbmon/rc/icons/font.ico (added)
• smbmon/rc/icons/fw.ico (added)
• smbmon/rc/icons/image.ico (added)
• smbmon/rc/icons/inf.ico (added)
• smbmon/rc/icons/ini.ico (added)
• smbmon/rc/icons/movie.ico (added)
• smbmon/rc/icons/ooo_base_doc.ico (added)
• smbmon/rc/icons/ooo_calc_doc.ico (added)
• smbmon/rc/icons/ooo_draw_doc.ico (added)
• smbmon/rc/icons/ooo_impress_doc.ico (added)
• smbmon/rc/icons/ooo_math_doc.ico (added)
• smbmon/rc/icons/ooo_writer_doc.ico (added)
• smbmon/rc/icons/open.bmp (added)
• smbmon/rc/icons/settings.ico (added)
• smbmon/rc/icons/share.ico (added)
• smbmon/rc/icons/snd.ico (added)
• smbmon/rc/icons/tag.ico (added)
• smbmon/rc/icons/txt.ico (added)
• smbmon/rc/icons/wpi.ico (added)
• smbmon/rc/icons/zip.ico (added)
• smbmon/rc/icons/zombie.ICO (added)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (12 diffs)
• smbmon/smbmon.vry (modified) ( previous)

trunk/guitools/shared/browse.vrs

@@ -311 +311 @@
     if options.!debug == 1 then say time()'  _BrowseIconsInit() done.'
 return
+
+/*:VRX */
+_ACLSBrowse:
+    browsepath = _browsebuildpath(SMBObj.rh)
+    ok = VRSet("SW_ACLS","Caption", browsepath)
+
+    parse var browsepath '\\'machine'\'sharename '\' browsepath
+
+    if browsepath = '' then browsepath = '\'
+    if UserCred = "" then UserCred = "-N"
+
+    /* Make sure credentials are usable */
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+
+    /* We have to remove the double % for smbclient.exe - not entirely clear why */
+    OldUserCred = UserCred
+    if pos('%%',UserCred) > 0 & pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0  then do
+        OldUserCred = UserCred
+        parse var UserCred '--user='username'%%'password
+        UserCred = '--user='username'%'password
+        call lineout "debug", "  Strip double %%!!!"
+    end
+    if options.!debug == 1 then say "smbcacls \\"machine"\"sharename" "browsepath" "UserCred" "aclsnumeric
+    address cmd samba.!smbcaclsexe' \\'machine'\'sharename' 'browsepath' 'UserCred' 'aclsnumeric' 2>'samba.!err' 1>'samba.!msg
+    ok = file2stem(samba.!msg,"aclsout.")    
+    ok = file2stem(samba.!err,"aclserr.")
+    if aclserr.0 > 0 then do
+        call _StatusBarWrapper aclserr.1
+        call SW_ACLS_Close
+    end
+    if aclsout.0 > 2 then ok = VRSet("DT_REV_CONT","Caption",aclsout.1" "aclsout.2)
+    do I = 3 to aclsout.0
+        parse var aclsout.I ACLS.ACL':'ACLS.User':'ACLS.A_D'/'ACLS.Flags'/'ACLS.Permissions
+        parse var ACLS.User ACLS.Group'\'ACLS.User
+        arh = VRMethod("CN_ACLS","AddRecord")
+        ok = VRMethod("CN_ACLS","SetFieldData", arh, ACL.typeFH,  ACLS.ACL)
+        ok = VRMethod("CN_ACLS","SetFieldData", arh, ACL.groupFH, ACLS.Group)
+        ok = VRMethod("CN_ACLS","SetFieldData", arh, ACL.userFH,  ACLS.User)
+        ok = VRMethod("CN_ACLS","SetFieldData", arh, ACL.ADFH,    ACLS.A_D)
+        ok = VRMethod("CN_ACLS","SetFieldData", arh, ACL.flagsFH, ACLS.Flags)
+        ok = VRMethod("CN_ACLS","SetFieldData", arh, ACL.accessFH,ACLS.Permissions)
+    end
+
+    UserCred = OldUserCred
+return

trunk/guitools/shared/smbtree.vrs

@@ -740 +740 @@
                    when pos("LOGIN SUCCESSFUL",        trStWT) > 0 then ok = VRSet("DT_STATUSBAR","BACKCOLOR","GREEN")
                    when pos("NT_STATUS_OK",            trStWT) > 0 then ok = VRSet("DT_STATUSBAR","BACKCOLOR","GREEN")
+                   when pos("OK",                      trStWT) > 0 then ok = VRSet("DT_STATUSBAR","BACKCOLOR","GREEN")
                    when pos("NT_STATUS_ACCESS_DENIED", trStWT) > 0 then ok = VRSet("DT_STATUSBAR","BACKCOLOR","YELLOW")
                    when pos("ERROR",                   trStWT) > 0 then ok = VRSet("DT_STATUSBAR","BACKCOLOR","RED")

trunk/guitools/smbmon/smbmon.vrp

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,2168,3614,1024,6769
 VRXWindow: __VRESectionListWindow,1,3963,14213,10130,5059
-VRXWindow: __VREToolsWindow,1,1518,434,6486,1669
+VRXWindow: __VREToolsWindow,1,1518,434,5492,1661
 VRXWindow: __VREWindListWindow,1,952,11708,5372,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_SETTINGS,1
+UserWindow: SW_ACLS,1
+UserWindow: SW_LOGIN,1
+UserWindow: SW_ACLSEdit,1

trunk/guitools/smbmon/smbmon.vrx

@@ -345 +345 @@
     ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 0)
     ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 0)
+    ok = VRSet("ContextMenu_Tree_Sep2",        "Visible", 0)
     ok = VRSet("ContextMenu_Tree_Tree",        "Visible", 1)
     ok = VRSet("ContextMenu_Tree_Details",     "Visible", 1)
@@ -352 +353 @@
     select
         when SMBObj.udatatype = "WORKGROUP" then do
+            ok = VRSet("ContextMenu_Tree_Sep2",        "Visible", 1)
             ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 1)
         end
@@ -359 +361 @@
             ok = VRSet("ContextMenu_Tree_Logoff",      "Visible", 1)
             ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 1)
+            ok = VRSet("ContextMenu_Tree_Sep2",        "Visible", 1)
             ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 1)
         end
@@ -364 +367 @@
             ok = VRSet("ContextMenu_Tree_ACLS",        "Visible", 1)
             ok = VRSet("ContextMenu_Tree_Sep1",        "Visible", 1)
+            ok = VRSet("ContextMenu_Tree_Sep2",        "Visible", 1)
             ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 1)
         end
         when SMBObj.udatatype = "PRINTER" then do
+            ok = VRSet("ContextMenu_Tree_Sep2",        "Visible", 1)
             ok = VRSet("ContextMenu_Tree_MiniIcons",   "Visible", 1)
         end
@@ -768 +773 @@
     call SysLoadFuncs
 
-    call RxFuncAdd 'PRLoadFuncs',  'PR1UTIL', 'PRLoadFuncs'
+    call RxFuncAdd 'PRLoadFuncs',  'PR1UTIL',  'PRLoadFuncs'
     call PRLoadFuncs
 
-    call rxfuncadd 'IniLoadFuncs', 'REXXINI', 'IniLoadFuncs'
+    call rxfuncadd 'IniLoadFuncs', 'REXXINI',  'IniLoadFuncs'
     call IniLoadFuncs
+
+    call rxfuncadd 'RXUInit',      'RXU',      'RXUInit'
+    call rxuinit
 
     call RxFuncAdd 'RxDate', 'RexxDate', 'RxDate'
@@ -1225 +1233 @@
         say samba.!logdir
     end
-    loggingfreespace = word(SysDriveInfo(left(samba.!logdir,2)),2)%1024%1024
+    if samba.!logdir = 'SAMBA.!LOGDIR' | samba.!Logdir = "" then do
+        loggingfreespace = 0
+    end
+    else loggingfreespace = word(SysDriveInfo(left(samba.!logdir,2)),2)%1024%1024
+
     ok = VRSet("DT_FREESPACE", "Caption", " "loggingfreespace' MB')
 
@@ -1423 +1435 @@
     credentials.!password = VRGet("EF_PASSWORD1","Value")
 
-    if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 1 | pos(left(credentials.!password,1),'01234567890') > 0
+    if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 1 /* | pos(left(credentials.!password,1),'01234567890') > 0 */
         then UserCred = '--user='Credentials.!username'%%'Credentials.!password
         else UserCred = '--user='Credentials.!username'%'Credentials.!password
@@ -1551 +1563 @@
         otherwise ok = VRSet("IPB_paper","PicturePath","#5;#5")
     end */
+return
+
+/*:VRX         CN_ACLS_ContextMenu
+*/
+CN_ACLS_ContextMenu: 
+    window = VRLoadSecondary( "SW_ACLSEDIT", "W" )
 return
 
@@ -2144 +2162 @@
 return
 
+/*:VRX         ICB_ACLSEDIT_CANCEL_Click
+*/
+ICB_ACLSEDIT_CANCEL_Click: 
+    call SW_ACLSEdit_Close
+return
+
+/*:VRX         ICB_ACLSEDIT_OK_Click
+*/
+ICB_ACLSEDIT_OK_Click: 
+
+    call SW_ACLSEdit_Close
+return
+
 /*:VRX         ICB_APPLY_Click
 */
@@ -2851 +2882 @@
 return
 
+/*:VRX         SW_ACLS_Activate
+*/
+SW_ACLS_Activate: 
+
+return
+
 /*:VRX         SW_ACLS_Close
 */
@@ -2874 +2911 @@
     aclsnumeric = ''
     call _ACLSBrowse
-    ACLSObj = VRGet("SW_ACLS","Caption")
-    parse var ACLSObj .'\\'ACLSObj
-    ACLSObj = NLVGetMessage(154)' \\'ACLSOBj
-    ok = VRSet("SW_ACLS","Caption",ACLSObj)
+    if VRIsValidObject("SW_ACLS") then do
+        ACLSObj = VRGet("SW_ACLS","Caption")
+        parse var ACLSObj .'\\'ACLSObj
+        ACLSObj = NLVGetMessage(154)' \\'ACLSOBj
+        ok = VRSet("SW_ACLS","Caption",ACLSObj)
+    end
     drop ACLSObj
 return
@@ -2890 +2929 @@
 */
 SW_ACLS_Init: 
+    window = VRInfo( "Object" )
+    if( \VRIsChildOf( window, "Notebook" ) ) then do
+        call VRMethod window, "CenterWindow"
+        call VRSet window, "Visible", 1
+        call VRMethod window, "Activate"
+    end
+    drop window
+return
+
+/*:VRX         SW_ACLSEdit_Close
+*/
+SW_ACLSEdit_Close: 
+    call SW_ACLSEdit_Fini
+return
+
+/*:VRX         SW_ACLSEdit_Create
+*/
+SW_ACLSEdit_Create: 
+    call SW_ACLSEdit_Init
+    ok = VRMethod("CN_ACLS","GetRecordList","Selected", "aclsrh.")
+    if aclsrh.0 = 0 then return
+    drop ACLS.
+    do i = 1 to aclsrh.0
+        ACLS.ACL         = VRMethod("CN_ACLS","GetFieldData", aclsrh.i, ACL.typeFH )
+        ACLS.Group       = VRMethod("CN_ACLS","GetFieldData", aclsrh.i, ACL.groupFH)
+        ACLS.User        = VRMethod("CN_ACLS","GetFieldData", aclsrh.i, ACL.userFH)
+        ACLS.A_D         = VRMethod("CN_ACLS","GetFieldData", aclsrh.i, ACL.ADFH)
+        ACLS.Flags       = VRMethod("CN_ACLS","GetFieldData", aclsrh.i, ACL.flagsFH)
+        ACLS.Permissions = VRMethod("CN_ACLS","GetFieldData", aclsrh.i, ACL.accessFH)
+        ok = VRSet("DDCB_ACLS_USER",       "Value", ACLS.Group'\'ACLS.User)
+        ok = VRSet("DDCB_ACLS_A_D",        "Value", ACLS.A_D)
+        ok = VRSet("DDCB_ACLS_FLAGS",      "Value", ACLS.Flags)
+        ok = VRSet("DDCB_ACLS_PERMISSIONS","Value", ACLS.Permissions)
+    end
+return
+
+/*:VRX         SW_ACLSEdit_Fini
+*/
+SW_ACLSEdit_Fini: 
+    window = VRInfo( "Window" )
+    call VRDestroy window
+    drop window
+return
+/*:VRX         SW_ACLSEdit_Init
+*/
+SW_ACLSEdit_Init: 
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do