Changeset 253 for trunk/lib

Timestamp:

06/12/11 22:27:42 (14 years ago)

Author:

tim

Message:

added preliminary interface to security descriptors in pyregfi
misc bug fixes

Location:

trunk/lib

Files:

• regfi.c (modified) (6 diffs)
• winsec.c (modified) (4 diffs)

trunk/lib/regfi.c

@@ -403 +403 @@
 
 
-char* regfi_sid2str(WINSEC_DOM_SID* sid)
-{
-  uint32_t i, size = WINSEC_MAX_SUBAUTHS*11 + 24;
-  uint32_t left = size;
-  uint8_t comps = sid->num_auths;
-  char* ret_val = malloc(size);
-  
-  if(ret_val == NULL)
-    return NULL;
-
-  if(comps > WINSEC_MAX_SUBAUTHS)
-    comps = WINSEC_MAX_SUBAUTHS;
-
-  left -= sprintf(ret_val, "S-%u-%u", sid->sid_rev_num, sid->id_auth[5]);
-
-  for (i = 0; i < comps; i++) 
-    left -= snprintf(ret_val+(size-left), left, "-%u", sid->sub_auths[i]);
-
-  return ret_val;
-}
-
-
 char* regfi_get_acl(WINSEC_ACL* acl)
 {
@@ -440 +418 @@
   for (i = 0; i < acl->num_aces && !failed; i++)
   {
-    sid_str = regfi_sid2str(acl->aces[i]->trustee);
+    sid_str = winsec_sid2str(acl->aces[i]->trustee);
     type_str = regfi_ace_type2str(acl->aces[i]->type);
     perms_str = regfi_ace_perms2str(acl->aces[i]->access_mask);
@@ -505 +483 @@
 char* regfi_get_owner(WINSEC_DESC *sec_desc)
 {
-  return regfi_sid2str(sec_desc->owner_sid);
+  return winsec_sid2str(sec_desc->owner_sid);
 }
 
@@ -511 +489 @@
 char* regfi_get_group(WINSEC_DESC *sec_desc)
 {
-  return regfi_sid2str(sec_desc->grp_sid);
+  return winsec_sid2str(sec_desc->grp_sid);
 }
 
@@ -1500 +1478 @@
     }
   }
+  else
+    ret_val = talloc_reference(NULL, ret_val);
 
  unlock:
@@ -2067 +2047 @@
 
   return regfi_load_sk(file, key->sk_off + REGFI_REGF_SIZE, true);
+}
+
+
+/******************************************************************************
+ *****************************************************************************/
+const REGFI_SK* regfi_next_sk(REGFI_FILE* file, const REGFI_SK* sk)
+{
+  if(sk == NULL || sk->next_sk_off == REGFI_OFFSET_NONE)
+    return NULL;
+
+  return regfi_load_sk(file, sk->next_sk_off + REGFI_REGF_SIZE, true);
+}
+
+
+/******************************************************************************
+ *****************************************************************************/
+const REGFI_SK* regfi_prev_sk(REGFI_FILE* file, const REGFI_SK* sk)
+{
+  if(sk == NULL || sk->prev_sk_off == REGFI_OFFSET_NONE)
+    return NULL;
+
+  return regfi_load_sk(file, sk->prev_sk_off + REGFI_REGF_SIZE, true);
 }
 

trunk/lib/winsec.c

@@ -226 +226 @@
   ret_val->size = SVAL(buf, 0x2);
   ret_val->access_mask = IVAL(buf, 0x4);
-
+  ret_val->obj_guid = NULL;
+  ret_val->inh_guid = NULL;
+  
   offset = 0x8;
 
@@ -246 +248 @@
       offset += sizeof(WINSEC_UUID);
     }
-    else
-      ret_val->obj_guid = NULL;
 
     if(ret_val->obj_flags & WINSEC_ACE_OBJECT_INHERITED_PRESENT)
@@ -260 +260 @@
       offset += sizeof(WINSEC_UUID);
     }
-    else
-      ret_val->inh_guid = NULL;
   }
 
@@ -410 +408 @@
 
 /******************************************************************************
+ ******************************************************************************/
+char* winsec_sid2str(const WINSEC_DOM_SID* sid)
+{
+  uint32_t i, size = WINSEC_MAX_SUBAUTHS*11 + 24;
+  uint32_t left = size;
+  uint8_t comps = sid->num_auths;
+  char* ret_val = malloc(size);
+  
+  if(ret_val == NULL)
+    return NULL;
+
+  if(comps > WINSEC_MAX_SUBAUTHS)
+    comps = WINSEC_MAX_SUBAUTHS;
+
+  left -= sprintf(ret_val, "S-%u-%u", sid->sid_rev_num, sid->id_auth[5]);
+
+  for (i = 0; i < comps; i++) 
+    left -= snprintf(ret_val+(size-left), left, "-%u", sid->sub_auths[i]);
+
+  return ret_val;
+}
+
+
+/******************************************************************************
  * Compares two WINSEC_DESC structures.
  ******************************************************************************/