pyldb: avoid segfault when adding an element with no name

[nivanova/samba-autobuild/.git] / source3 / lib / util_sid.c

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 55904d7106370008c1278bed43eeb616e4dfee75..57cd76c108d31128e750078e1daeff8576ce6d2a 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -34,47 +34,18 @@
 
 char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid)
 {
-       dom_sid_string_buf(sid, sidstr_out, sizeof(fstring));
+       struct dom_sid_buf buf;
+       fstrcpy(sidstr_out, dom_sid_str_buf(sid, &buf));
        return sidstr_out;
 }
 
-/*****************************************************************
- Essentially a renamed dom_sid_string from
- ../libcli/security/dom_sid.c with a panic if it didn't work.
-*****************************************************************/
-
-char *sid_string_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
-{
-       char *result = dom_sid_string(mem_ctx, sid);
-       SMB_ASSERT(result != NULL);
-       return result;
-}
-
-/*****************************************************************
- Useful function for debug lines.
-*****************************************************************/
-
-char *sid_string_dbg(const struct dom_sid *sid)
-{
-       return sid_string_talloc(talloc_tos(), sid);
-}
-
-/*****************************************************************
- Use with care!
-*****************************************************************/
-
-char *sid_string_tos(const struct dom_sid *sid)
-{
-       return sid_string_talloc(talloc_tos(), sid);
-}
-
 /*****************************************************************
  Write a sid out into on-the-wire format.
 *****************************************************************/  
 
-bool sid_linearize(char *outbuf, size_t len, const struct dom_sid *sid)
+bool sid_linearize(uint8_t *outbuf, size_t len, const struct dom_sid *sid)
 {
-       size_t i;
+       int8_t i;
 
        if (len < ndr_size_dom_sid(sid, 0))
                return False;
@@ -113,14 +84,12 @@ bool non_mappable_sid(struct dom_sid *sid)
  Caller must free.
 *****************************************************************/
 
-char *sid_binstring_hex(const struct dom_sid *sid)
+char *sid_binstring_hex_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
 {
-       char *s;
        int len = ndr_size_dom_sid(sid, 0);
-       char buf[len];
+       uint8_t buf[len];
        sid_linearize(buf, len, sid);
-       hex_encode((const unsigned char *)buf, len, &s);
-       return s;
+       return hex_encode_talloc(mem_ctx, buf, len);
 }
 
 NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
@@ -133,7 +102,7 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
        struct dom_sid sid;
        struct dom_sid *sid_array = NULL;
        uint32_t num_sids = 0;
-       int i;
+       uint32_t i;
 
        if (include_user_group_rid) {
                if (!sid_compose(&sid, info3->base.domain_sid, info3->base.rid)) {
@@ -187,11 +156,17 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
          */
 
        for (i = 0; i < info3->sidcount; i++) {
+
+               if (sid_check_is_in_asserted_identity(info3->sids[i].sid)) {
+                       continue;
+               }
+
                status = add_sid_to_array(mem_ctx, info3->sids[i].sid,
                                      &sid_array, &num_sids);
                if (!NT_STATUS_IS_OK(status)) {
+                       struct dom_sid_buf buf;
                        DEBUG(3, ("could not add SID to array: %s\n",
-                                 sid_string_dbg(info3->sids[i].sid)));
+                                 dom_sid_str_buf(info3->sids[i].sid, &buf)));
                        return status;
                }
        }