Changeset 745 for trunk/server/source4/smb_server/blob.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/smb_server/blob.c (modified) (11 diffs)

trunk/server/source4/smb_server/blob.c

@@ -101 +101 @@
   return the number of bytes consumed in the output
 */
-size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
-                               DATA_BLOB *blob,
-                               uint32_t len_offset,
-                               uint32_t offset,
-                               const char *str,
-                               int dest_len,
-                               int default_flags,
-                               int flags)
+static ssize_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
+                                       DATA_BLOB *blob,
+                                       uint32_t len_offset,
+                                       uint32_t offset,
+                                       const char *str,
+                                       int dest_len,
+                                       int default_flags,
+                                       int flags)
 {
         int alignment = 0, ret = 0, pkt_len;
@@ -143 +143 @@
                 ret = push_string(blob->data + offset, str, dest_len, flags);
         }
+        if (ret == -1) {
+                return -1;
+        }
 
         /* sometimes the string needs to be terminated, but the length
@@ -174 +177 @@
                                    DATA_BLOB *blob,
                                    const char *str,
-                                   uint_t len_offset,
+                                   unsigned int len_offset,
                                    int default_flags,
                                    int flags)
@@ -198 +201 @@
                                      int default_str_flags)
 {
-        uint_t i;
+        unsigned int i;
         DATA_BLOB guid_blob;
 
@@ -273 +276 @@
 
         case RAW_QFS_OBJECTID_INFORMATION: {
-                enum ndr_err_code ndr_err;
+                NTSTATUS status;
 
                 BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 64));
 
-                ndr_err = ndr_push_struct_blob(&guid_blob, mem_ctx, NULL, 
-                                               &fsinfo->objectid_information.out.guid,
-                                               (ndr_push_flags_fn_t)ndr_push_GUID);
-                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                        BLOB_CHECK(ndr_map_error2ntstatus(ndr_err));
+                status = GUID_to_ndr_blob(&fsinfo->objectid_information.out.guid, mem_ctx, &guid_blob);
+                if (!NT_STATUS_IS_OK(status)) {
+                        BLOB_CHECK(status);
                 }
 
@@ -295 +296 @@
                 return NT_STATUS_INVALID_LEVEL;
         }
-
-        return NT_STATUS_INVALID_LEVEL;
 }
 
@@ -305 +304 @@
                                        int default_str_flags)
 {
-        uint_t i;
+        unsigned int i;
         size_t list_size;
 
@@ -512 +511 @@
                 return NT_STATUS_INVALID_LEVEL;
         }
-
-        return NT_STATUS_INVALID_LEVEL;
 }
 
@@ -639 +636 @@
                 return NT_STATUS_INVALID_LEVEL;
         }
-
-        return NT_STATUS_INVALID_LEVEL;
 }
 
@@ -653 +648 @@
 {
         uint8_t *data;
-        uint_t ofs = blob->length;
+        unsigned int ofs = blob->length;
 
         switch (level) {
@@ -787 +782 @@
                 return NT_STATUS_INVALID_LEVEL;
         }
-
-        return NT_STATUS_INVALID_LEVEL;
-}
+}