X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=librpc%2Fndr%2Fuuid.c;h=2b472468061f6f7db76925089a21da48330322d3;hb=f745d076d38487dcc1041a4031c8c05c1e4fb5b5;hp=bb8c49254de0feba8fe73c4c729cd0619b6f2bcd;hpb=69af236e7772e85b7b8dc7045c6737d85f4b189a;p=samba.git

diff --git a/librpc/ndr/uuid.c b/librpc/ndr/uuid.c
index bb8c49254de..2b472468061 100644
--- a/librpc/ndr/uuid.c
+++ b/librpc/ndr/uuid.c
@@ -36,6 +36,7 @@ _PUBLIC_ NTSTATUS GUID_from_data_blob(const DATA_BLOB *s, struct GUID *guid)
 	uint32_t clock_seq[2];
 	uint32_t node[6];
 	uint8_t buf16[16];
+
 	DATA_BLOB blob16 = data_blob_const(buf16, sizeof(buf16));
 	int i;
 
@@ -43,20 +44,40 @@ _PUBLIC_ NTSTATUS GUID_from_data_blob(const DATA_BLOB *s, struct GUID *guid)
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	if (s->length == 36 && 
-	    11 == sscanf((const char *)s->data, 
-			 "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-			 &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])) {
-	        status = NT_STATUS_OK;
-	} else if (s->length == 38
-		   && 11 == sscanf((const char *)s->data, 
-				   "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-				   &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])) {
-		status = NT_STATUS_OK;
+	if (s->length == 36) {
+		TALLOC_CTX *mem_ctx;
+		const char *string;
+
+		mem_ctx = talloc_new(NULL);
+		NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
+		string = talloc_strndup(mem_ctx, (const char *)s->data, s->length);
+		NT_STATUS_HAVE_NO_MEMORY(string);
+		if (11 == sscanf(string,
+				 "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+				 &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])) {
+			status = NT_STATUS_OK;
+		}
+		talloc_free(mem_ctx);
+
+	} else if (s->length == 38) {
+		TALLOC_CTX *mem_ctx;
+		const char *string;
+
+		mem_ctx = talloc_new(NULL);
+		NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
+		string = talloc_strndup(mem_ctx, (const char *)s->data, s->length);
+		NT_STATUS_HAVE_NO_MEMORY(string);
+		if (11 == sscanf((const char *)s->data, 
+				 "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+				 &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])) {
+			status = NT_STATUS_OK;
+		}
+		talloc_free(mem_ctx);
+
 	} else if (s->length == 32) {
 		size_t rlen = strhex_to_str((char *)blob16.data, blob16.length,
 					    (const char *)s->data, s->length);
@@ -251,6 +272,31 @@ _PUBLIC_ char *GUID_string2(TALLOC_CTX *mem_ctx, const struct GUID *guid)
 	return ret;
 }
 
+_PUBLIC_ char *GUID_hexstring(TALLOC_CTX *mem_ctx, const struct GUID *guid)
+{
+	char *ret;
+	DATA_BLOB guid_blob;
+	enum ndr_err_code ndr_err;
+	TALLOC_CTX *tmp_mem;
+
+	tmp_mem = talloc_new(mem_ctx);
+	if (!tmp_mem) {
+		return NULL;
+	}
+	ndr_err = ndr_push_struct_blob(&guid_blob, tmp_mem,
+				       NULL,
+				       guid,
+				       (ndr_push_flags_fn_t)ndr_push_GUID);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		talloc_free(tmp_mem);
+		return NULL;
+	}
+
+	ret = data_blob_hex_string(mem_ctx, &guid_blob);
+	talloc_free(tmp_mem);
+	return ret;
+}
+
 _PUBLIC_ char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid)
 {
 	return talloc_asprintf(mem_ctx,