Changeset 745 for trunk/server/source4/libcli/raw/rawfsinfo.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/raw/rawfsinfo.c (modified) (2 diffs)

trunk/server/source4/libcli/raw/rawfsinfo.c

@@ -160 +160 @@
 {
         NTSTATUS status = NT_STATUS_OK;
-        enum ndr_err_code ndr_err;
         int i;
 
@@ -216 +215 @@
                 break;          
 
-        case RAW_QFS_OBJECTID_INFORMATION:
+        case RAW_QFS_OBJECTID_INFORMATION: {
+                DATA_BLOB b2 = data_blob_const(blob.data, MIN(16, blob.length));
                 QFS_CHECK_SIZE(64);
-                ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &fsinfo->objectid_information.out.guid,
-                                               (ndr_pull_flags_fn_t)ndr_pull_GUID);
-                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                        status = ndr_map_error2ntstatus(ndr_err);
-                }
+                status = GUID_from_ndr_blob(&b2, &fsinfo->objectid_information.out.guid);
+                NT_STATUS_NOT_OK_RETURN(status);
                 for (i=0;i<6;i++) {
                         fsinfo->objectid_information.out.unknown[i] = BVAL(blob.data, 16 + i*8);
                 }
                 break;
+        }
                 
         default: