use samba4's librpc/ndr/uuid.c

metze
(This used to be commit c148e91fdedd20cfb737465dffc86ed6fa7d7c02)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 884e5a40a5a04bc15d55c0bd35115766bcd869e3..0ed7b4e8985b8d3d08c40251fd86c85250571329 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -247,7 +247,8 @@ PASSCHANGE_OBJ = libsmb/passchange.o
 
 
 LIBNDR_OBJ = librpc/ndr/ndr_basic.o librpc/ndr/ndr.o librpc/ndr/ndr_misc.o \
-            librpc/ndr/ndr_sec_helper.o librpc/ndr/ndr_string.o librpc/ndr/sid.o
+            librpc/ndr/ndr_sec_helper.o librpc/ndr/ndr_string.o librpc/ndr/sid.o \
+            librpc/ndr/uuid.o
 
 RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
 

diff --git a/source3/librpc/ndr/ndr_misc.c b/source3/librpc/ndr/ndr_misc.c
index e4bff83650558bc6964da912d725bdf45516c58b..c93e527848361b5610b5a0faceb4e8f932e4847d 100644 (file)
--- a/source3/librpc/ndr/ndr_misc.c
+++ b/source3/librpc/ndr/ndr_misc.c
@@ -59,76 +59,6 @@ size_t ndr_size_GUID(const struct GUID *r, int flags)
        return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_GUID);
 }
 
-/**
-  build a GUID from a string
-*/
-NTSTATUS GUID_from_string(const char *s, struct GUID *guid)
-{
-       NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
-       uint32_t time_low;
-       uint32_t time_mid, time_hi_and_version;
-       uint32_t clock_seq[2];
-       uint32_t node[6];
-       int i;
-
-       if (s == NULL) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (11 == sscanf(s, "%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 (11 == sscanf(s, "{%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 (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       guid->time_low = time_low;
-       guid->time_mid = time_mid;
-       guid->time_hi_and_version = time_hi_and_version;
-       guid->clock_seq[0] = clock_seq[0];
-       guid->clock_seq[1] = clock_seq[1];
-       for (i=0;i<6;i++) {
-               guid->node[i] = node[i];
-       }
-
-       return NT_STATUS_OK;
-}
-
-/**
- * generate a random GUID
- */
-struct GUID GUID_random(void)
-{
-       struct GUID guid;
-
-       generate_random_buffer((uint8_t *)&guid, sizeof(guid));
-       guid.clock_seq[0] = (guid.clock_seq[0] & 0x3F) | 0x80;
-       guid.time_hi_and_version = (guid.time_hi_and_version & 0x0FFF) | 0x4000;
-
-       return guid;
-}
-
-/**
- * generate an empty GUID 
- */
-struct GUID GUID_zero(void)
-{
-       struct GUID guid;
-
-       ZERO_STRUCT(guid);
-
-       return guid;
-}
-
 /**
  * see if a range of memory is all zero. A NULL pointer is considered
  * to be all zero 
@@ -143,67 +73,11 @@ bool all_zero(const uint8_t *ptr, size_t size)
        return True;
 }
 
-
-bool GUID_all_zero(const struct GUID *u)
-{
-       if (u->time_low != 0 ||
-           u->time_mid != 0 ||
-           u->time_hi_and_version != 0 ||
-           u->clock_seq[0] != 0 ||
-           u->clock_seq[1] != 0 ||
-           !all_zero(u->node, 6)) {
-               return False;
-       }
-       return True;
-}
-
-bool GUID_equal(const struct GUID *u1, const struct GUID *u2)
-{
-       if (u1->time_low != u2->time_low ||
-           u1->time_mid != u2->time_mid ||
-           u1->time_hi_and_version != u2->time_hi_and_version ||
-           u1->clock_seq[0] != u2->clock_seq[0] ||
-           u1->clock_seq[1] != u2->clock_seq[1] ||
-           memcmp(u1->node, u2->node, 6) != 0) {
-               return False;
-       }
-       return True;
-}
-
-/**
-  its useful to be able to display these in debugging messages
-*/
-char *GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid)
-{
-       return talloc_asprintf(mem_ctx, 
-                              "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                              guid->time_low, guid->time_mid,
-                              guid->time_hi_and_version,
-                              guid->clock_seq[0],
-                              guid->clock_seq[1],
-                              guid->node[0], guid->node[1],
-                              guid->node[2], guid->node[3],
-                              guid->node[4], guid->node[5]);
-}
-
-char *GUID_string2(TALLOC_CTX *mem_ctx, const struct GUID *guid)
-{
-       char *ret, *s = GUID_string(mem_ctx, guid);
-       ret = talloc_asprintf(mem_ctx, "{%s}", s);
-       talloc_free(s);
-       return ret;
-}
-
 void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid)
 {
        ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, guid));
 }
 
-bool policy_handle_empty(struct policy_handle *h) 
-{
-       return (h->handle_type == 0 && GUID_all_zero(&h->uuid));
-}
-
 NTSTATUS ndr_push_policy_handle(struct ndr_push *ndr, int ndr_flags, const struct policy_handle *r)
 {
        if (ndr_flags & NDR_SCALARS) {

diff --git a/source3/librpc/ndr/uuid.c b/source3/librpc/ndr/uuid.c
new file mode 100644 (file)
index 0000000..e92df22
--- /dev/null
+++ b/source3/librpc/ndr/uuid.c
@@ -0,0 +1,227 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   UUID/GUID functions
+
+   Copyright (C) Theodore Ts'o               1996, 1997,
+   Copyright (C) Jim McDonough                     2002.
+   Copyright (C) Andrew Tridgell                   2003.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "librpc/ndr/libndr.h"
+
+/**
+  build a GUID from a string
+*/
+_PUBLIC_ NTSTATUS GUID_from_string(const char *s, struct GUID *guid)
+{
+       NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
+       uint32_t time_low;
+       uint32_t time_mid, time_hi_and_version;
+       uint32_t clock_seq[2];
+       uint32_t node[6];
+       int i;
+
+       if (s == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (11 == sscanf(s, "%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 (11 == sscanf(s, "{%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 (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       guid->time_low = time_low;
+       guid->time_mid = time_mid;
+       guid->time_hi_and_version = time_hi_and_version;
+       guid->clock_seq[0] = clock_seq[0];
+       guid->clock_seq[1] = clock_seq[1];
+       for (i=0;i<6;i++) {
+               guid->node[i] = node[i];
+       }
+
+       return NT_STATUS_OK;
+}
+
+/**
+  build a GUID from a string
+*/
+_PUBLIC_ NTSTATUS NS_GUID_from_string(const char *s, struct GUID *guid)
+{
+       NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
+       uint32_t time_low;
+       uint32_t time_mid, time_hi_and_version;
+       uint32_t clock_seq[2];
+       uint32_t node[6];
+       int i;
+
+       if (s == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (11 == sscanf(s, "%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 (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       guid->time_low = time_low;
+       guid->time_mid = time_mid;
+       guid->time_hi_and_version = time_hi_and_version;
+       guid->clock_seq[0] = clock_seq[0];
+       guid->clock_seq[1] = clock_seq[1];
+       for (i=0;i<6;i++) {
+               guid->node[i] = node[i];
+       }
+
+       return NT_STATUS_OK;
+}
+
+/**
+ * generate a random GUID
+ */
+struct GUID GUID_random(void)
+{
+       struct GUID guid;
+
+       generate_random_buffer((uint8_t *)&guid, sizeof(guid));
+       guid.clock_seq[0] = (guid.clock_seq[0] & 0x3F) | 0x80;
+       guid.time_hi_and_version = (guid.time_hi_and_version & 0x0FFF) | 0x4000;
+
+       return guid;
+}
+
+/**
+ * generate an empty GUID 
+ */
+_PUBLIC_ struct GUID GUID_zero(void)
+{
+       struct GUID guid;
+
+       ZERO_STRUCT(guid);
+
+       return guid;
+}
+
+_PUBLIC_ bool GUID_all_zero(const struct GUID *u)
+{
+       if (u->time_low != 0 ||
+           u->time_mid != 0 ||
+           u->time_hi_and_version != 0 ||
+           u->clock_seq[0] != 0 ||
+           u->clock_seq[1] != 0 ||
+           !all_zero(u->node, 6)) {
+               return false;
+       }
+       return true;
+}
+
+_PUBLIC_ bool GUID_equal(const struct GUID *u1, const struct GUID *u2)
+{
+       if (u1->time_low != u2->time_low ||
+           u1->time_mid != u2->time_mid ||
+           u1->time_hi_and_version != u2->time_hi_and_version ||
+           u1->clock_seq[0] != u2->clock_seq[0] ||
+           u1->clock_seq[1] != u2->clock_seq[1] ||
+           memcmp(u1->node, u2->node, 6) != 0) {
+               return false;
+       }
+       return true;
+}
+
+_PUBLIC_ int GUID_compare(const struct GUID *u1, const struct GUID *u2)
+{
+       if (u1->time_low != u2->time_low) {
+               return u1->time_low - u2->time_low;
+       }
+
+       if (u1->time_mid != u2->time_mid) {
+               return u1->time_mid - u2->time_mid;
+       }
+
+       if (u1->time_hi_and_version != u2->time_hi_and_version) {
+               return u1->time_hi_and_version - u2->time_hi_and_version;
+       }
+
+       if (u1->clock_seq[0] != u2->clock_seq[0]) {
+               return u1->clock_seq[0] - u2->clock_seq[0];
+       }
+
+       if (u1->clock_seq[1] != u2->clock_seq[1]) {
+               return u1->clock_seq[1] - u2->clock_seq[1];
+       }
+
+       return memcmp(u1->node, u2->node, 6);
+}
+
+/**
+  its useful to be able to display these in debugging messages
+*/
+_PUBLIC_ char *GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid)
+{
+       return talloc_asprintf(mem_ctx, 
+                              "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                              guid->time_low, guid->time_mid,
+                              guid->time_hi_and_version,
+                              guid->clock_seq[0],
+                              guid->clock_seq[1],
+                              guid->node[0], guid->node[1],
+                              guid->node[2], guid->node[3],
+                              guid->node[4], guid->node[5]);
+}
+
+_PUBLIC_ char *GUID_string2(TALLOC_CTX *mem_ctx, const struct GUID *guid)
+{
+       char *ret, *s = GUID_string(mem_ctx, guid);
+       ret = talloc_asprintf(mem_ctx, "{%s}", s);
+       talloc_free(s);
+       return ret;
+}
+
+_PUBLIC_ char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid)
+{
+       return talloc_asprintf(mem_ctx, 
+                              "%08x-%04x%04x-%02x%02x%02x%02x-%02x%02x%02x%02x",
+                              guid->time_low, guid->time_mid,
+                              guid->time_hi_and_version,
+                              guid->clock_seq[0],
+                              guid->clock_seq[1],
+                              guid->node[0], guid->node[1],
+                              guid->node[2], guid->node[3],
+                              guid->node[4], guid->node[5]);
+}
+
+_PUBLIC_ bool policy_handle_empty(struct policy_handle *h) 
+{
+       return (h->handle_type == 0 && GUID_all_zero(&h->uuid));
+}