Changeset 590 for trunk/server/librpc/ndr/uuid.c

Timestamp:

Jul 1, 2011, 8:40:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.6

File:

• trunk/server/librpc/ndr/uuid.c (modified) (2 diffs)

trunk/server/librpc/ndr/uuid.c

@@ -26 +26 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 
+
+/**
+  build a GUID from a NDR data blob
+*/
+_PUBLIC_ NTSTATUS GUID_from_ndr_blob(const DATA_BLOB *b, struct GUID *guid)
+{
+        enum ndr_err_code ndr_err;
+        TALLOC_CTX *mem_ctx;
+
+        mem_ctx = talloc_new(NULL);
+        NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
+
+        ndr_err = ndr_pull_struct_blob_all(b, mem_ctx, NULL, guid,
+                                           (ndr_pull_flags_fn_t)ndr_pull_GUID);
+        talloc_free(mem_ctx);
+        return ndr_map_error2ntstatus(ndr_err);
+}
+
+
 /**
   build a GUID from a string
@@ -82 +101 @@
                 size_t rlen = strhex_to_str((char *)blob16.data, blob16.length,
                                             (const char *)s->data, s->length);
-                if (rlen == blob16.length) {
-                        /* goto the ndr_pull_struct_blob() path */
-                        status = NT_STATUS_OK;
-                        s = &blob16;
+                if (rlen != blob16.length) {
+                        return NT_STATUS_INVALID_PARAMETER;
                 }
+
+                s = &blob16;
+                return GUID_from_ndr_blob(s, guid);
         }
 
         if (s->length == 16) {
-                enum ndr_err_code ndr_err;
-                struct GUID guid2;
-                TALLOC_CTX *mem_ctx;
-
-                mem_ctx = talloc_new(NULL);
-                NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
-
-                ndr_err = ndr_pull_struct_blob(s, mem_ctx, NULL, &guid2,
-                                               (ndr_pull_flags_fn_t)ndr_pull_GUID);
-                talloc_free(mem_ctx);
-                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                        return ndr_map_error2ntstatus(ndr_err);
-                }
-                *guid = guid2;
-                return NT_STATUS_OK;
+                return GUID_from_ndr_blob(s, guid);
         }