Changeset 920 for trunk/server/librpc/ndr/ndr_misc.c

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/ndr_misc.c (modified) (1 diff)

trunk/server/librpc/ndr/ndr_misc.c

@@ -36 +36 @@
                 && (i1->if_version == i2->if_version);
 }
+
+_PUBLIC_ char *ndr_syntax_id_to_string(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *id)
+{
+        return talloc_asprintf(mem_ctx,
+                               "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x/0x%08x",
+                               id->uuid.time_low, id->uuid.time_mid,
+                               id->uuid.time_hi_and_version,
+                               id->uuid.clock_seq[0],
+                               id->uuid.clock_seq[1],
+                               id->uuid.node[0], id->uuid.node[1],
+                               id->uuid.node[2], id->uuid.node[3],
+                               id->uuid.node[4], id->uuid.node[5],
+                               (unsigned)id->if_version);
+}
+
+_PUBLIC_ bool ndr_syntax_id_from_string(const char *s, struct ndr_syntax_id *id)
+{
+        int ret;
+        size_t i;
+        uint32_t time_low;
+        uint32_t time_mid, time_hi_and_version;
+        uint32_t clock_seq[2];
+        uint32_t node[6];
+        uint32_t if_version;
+
+        ret = sscanf(s,
+                     "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x/0x%08x",
+                     &time_low, &time_mid, &time_hi_and_version,
+                     &clock_seq[0], &clock_seq[1],
+                     &node[0], &node[1], &node[2], &node[3], &node[4], &node[5],
+                     &if_version);
+        if (ret != 12) {
+                return false;
+        }
+
+        id->uuid.time_low = time_low;
+        id->uuid.time_mid = time_mid;
+        id->uuid.time_hi_and_version = time_hi_and_version;
+        id->uuid.clock_seq[0] = clock_seq[0];
+        id->uuid.clock_seq[1] = clock_seq[1];
+        for (i=0; i<6; i++) {
+                id->uuid.node[i] = node[i];
+        }
+        id->if_version = if_version;
+
+        return true;
+}