Changeset 255 for trunk/python/pyregfi/winsec.py

Timestamp:

06/13/11 15:15:08 (13 years ago)

Author:

tim

Message:

fixed error condition deadlock in regfi
prevented early garbage collection of hive file handles
fixed module imports under python3

File:

• trunk/python/pyregfi/winsec.py (modified) (4 diffs)

trunk/python/pyregfi/winsec.py

@@ -11 +11 @@
 import ctypes.util
 from ctypes import *
-import structures
+from .structures import regfi
 
 is_win32 = hasattr(ctypes, 'windll')
@@ -77 +77 @@
                         ('dacl', POINTER(WINSEC_ACL)),
                         ]
-
-structures.regfi.winsec_sid2str.argtypes = [POINTER(WINSEC_DOM_SID)]
-structures.regfi.winsec_sid2str.restype = POINTER(c_char)
+regfi.winsec_sid2str.argtypes = [POINTER(WINSEC_DOM_SID)]
+regfi.winsec_sid2str.restype = POINTER(c_char)
 
 
@@ -128 +127 @@
         self.inherited_object = _guid2uuid(ace.inh_guid)
 
-        c_str = structures.regfi.winsec_sid2str(ace.trustee)
+        c_str = regfi.winsec_sid2str(ace.trustee)
         self.trustee = ctypes.cast(c_str, c_char_p).value.decode('utf-8', 'replace')
         libc.free(c_str)
@@ -153 +152 @@
 
     def __init__(self, sec_desc):
-        c_str = structures.regfi.winsec_sid2str(sec_desc.owner_sid)
+        c_str = regfi.winsec_sid2str(sec_desc.owner_sid)
         self.owner = ctypes.cast(c_str, c_char_p).value.decode('utf-8', 'replace')
         libc.free(c_str)
         
-        c_str = structures.regfi.winsec_sid2str(sec_desc.grp_sid)
+        c_str = regfi.winsec_sid2str(sec_desc.grp_sid)
         self.group = ctypes.cast(c_str, c_char_p).value.decode('utf-8', 'replace')
         libc.free(c_str)