Changeset 1054 for trunk

Timestamp:

Feb 7, 2018, 4:26:09 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

SMBMON 2.6: Add ACLS editor, cleanup tree

Location:

trunk/guitools/smbmon

Files:

• rc/icons/Bitmap2.bmp (deleted)
• rc/icons/Pointer1.ptr (deleted)
• rc/icons/doit.cmd (deleted)
• smbmon.rc (added)
• smbmon.vrp (modified) (1 diff)
• smbmon.vrx (modified) (3 diffs)
• smbmon.vry (modified) ( previous)

trunk/guitools/smbmon/smbmon.vrp

@@ -7 +7 @@
 RunDirectory: U:\Develop\Samba\trunk\guitools\smbmon
 VRXWindow: __VREMainWindow,1,2168,3614,1024,6769
-VRXWindow: __VRESectionListWindow,1,3963,14213,10130,5059
-VRXWindow: __VREToolsWindow,1,1518,434,5492,1661
+VRXWindow: __VRESectionListWindow,1,3770,14309,10130,5059
+VRXWindow: __VREToolsWindow,1,1518,434,5498,1665
 VRXWindow: __VREWindListWindow,1,952,11708,5372,3150
 UserFile: 1

trunk/guitools/smbmon/smbmon.vrx

@@ -2171 +2171 @@
 */
 ICB_ACLSEDIT_OK_Click: 
+    ACLSObj = VRGet("SW_ACLS","Caption")
+    parse var ACLSObj .'\\'aclssrv'\'aclsshare'\'aclspath
+    if aclspath = "" then aclspath = "\"
+
+    say "smbcacls \\"ACLSsrv"\"aclsshare" "aclspath" "UserCred" --"VRget("DDCB_ACLS_ACTION","Value")"=ACL:"VRGet("DDCB_ACLS_USER","Value")":"VRGet("DDCB_ACLS_A_D","Value")":"VRGet("DDCB_ACLS_FLAGS","Value")":"VRGet("DDCB_ACLS_PERMISSIONS","Value")
+    address cmd samba.!smbcaclsexe" \\"ACLSsrv"\"aclsshare" "aclspath" "UserCred" --"VRget("DDCB_ACLS_ACTION","Value")"=ACL:"VRGet("DDCB_ACLS_USER","Value")":"VRGet("DDCB_ACLS_A_D","Value")"/"VRGet("DDCB_ACLS_FLAGS","Value")"/"VRGet("DDCB_ACLS_PERMISSIONS","Value")' 2>'samba.!err' 1>'samba.!msg
+    ok = file2stem(samba.!msg,"aclsmsg.")
+    ok = file2stem(samba.!err,"aclserr.")
+    if aclsmsg.0 = 0 & aclserr.0 = 0 then call _StatusBarWrapper "OK"
+    if aclserr.0 > 0 then call _StatusBarWrapper "ERROR "aclserr.1
+    ok = VRMethod( "CN_ACLS", "RemoveRecord", "ALL")
+    call _ACLSBrowse
+    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
 
     call SW_ACLSEdit_Close
@@ -2948 +2967 @@
 SW_ACLSEdit_Create: 
     call SW_ACLSEdit_Init
+    CALL NLVSetText 'ICB_ACLSEDIT_OK',    "Caption", 2
+    CALL NLVSetText 'ICB_ACLSEDIT_CANCEL',"Caption", 3
+
     ok = VRMethod("CN_ACLS","GetRecordList","Selected", "aclsrh.")
     if aclsrh.0 = 0 then return
@@ -2958 +2980 @@
         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_USER",       "Value", strip(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
+    ok = VRSet("DDCB_ACLS_ACTION","value","modify")
 return