Changeset 745 for trunk/server/source4/libcli/raw/rawrequest.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/rawrequest.c (modified) (21 diffs)

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

@@ -120 +120 @@
 */
 struct smbcli_request *smbcli_request_setup_transport(struct smbcli_transport *transport,
-                                                      uint8_t command, uint_t wct, uint_t buflen)
+                                                      uint8_t command, unsigned int wct, unsigned int buflen)
 {
         struct smbcli_request *req;
@@ -168 +168 @@
 */
 struct smbcli_request *smbcli_request_setup_session(struct smbcli_session *session,
-                                                    uint8_t command, uint_t wct, size_t buflen)
+                                                    uint8_t command, unsigned int wct, size_t buflen)
 {
         struct smbcli_request *req;
@@ -191 +191 @@
 struct smbcli_request *smbcli_request_setup(struct smbcli_tree *tree,
                                             uint8_t command, 
-                                            uint_t wct, uint_t buflen)
+                                            unsigned int wct, unsigned int buflen)
 {
         struct smbcli_request *req;
@@ -212 +212 @@
   point at the same offset into the packet as before this call
 */
-static void smbcli_req_grow_allocation(struct smbcli_request *req, uint_t new_size)
+static void smbcli_req_grow_allocation(struct smbcli_request *req, unsigned int new_size)
 {
         int delta;
@@ -253 +253 @@
   point at the same offset into the packet as before this call
 */
-static void smbcli_req_grow_data(struct smbcli_request *req, uint_t new_size)
+static void smbcli_req_grow_data(struct smbcli_request *req, unsigned int new_size)
 {
         int delta;
@@ -275 +275 @@
 NTSTATUS smbcli_chained_request_setup(struct smbcli_request *req,
                                       uint8_t command, 
-                                      uint_t wct, size_t buflen)
-{
-        uint_t new_size = 1 + (wct*2) + 2 + buflen;
+                                      unsigned int wct, size_t buflen)
+{
+        unsigned int new_size = 1 + (wct*2) + 2 + buflen;
 
         SSVAL(req->out.vwv, VWV(0), command);
@@ -372 +372 @@
   an oplock break
 */
-bool smbcli_handle_oplock_break(struct smbcli_transport *transport, uint_t len, const uint8_t *hdr, const uint8_t *vwv)
+bool smbcli_handle_oplock_break(struct smbcli_transport *transport, unsigned int len, const uint8_t *hdr, const uint8_t *vwv)
 {
         /* we must be very fussy about what we consider an oplock break to avoid
@@ -417 +417 @@
   return the number of bytes added to the packet
 */
-size_t smbcli_req_append_string(struct smbcli_request *req, const char *str, uint_t flags)
+size_t smbcli_req_append_string(struct smbcli_request *req, const char *str, unsigned int flags)
 {
         size_t len;
@@ -449 +449 @@
  placed in the packet as a separate field  
 */
-size_t smbcli_req_append_string_len(struct smbcli_request *req, const char *str, uint_t flags, int *len)
+size_t smbcli_req_append_string_len(struct smbcli_request *req, const char *str, unsigned int flags, int *len)
 {
         int diff = 0;
@@ -490 +490 @@
   if dest_len is -1 then no limit applies
 */
-size_t smbcli_req_append_ascii4(struct smbcli_request *req, const char *str, uint_t flags)
+size_t smbcli_req_append_ascii4(struct smbcli_request *req, const char *str, unsigned int flags)
 {
         size_t size;
@@ -556 +556 @@
 */
 static size_t smbcli_req_pull_ucs2(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ctx,
-                                char **dest, const uint8_t *src, int byte_len, uint_t flags)
+                                char **dest, const uint8_t *src, int byte_len, unsigned int flags)
 {
         int src_len, src_len2, alignment=0;
@@ -610 +610 @@
 */
 size_t smbcli_req_pull_ascii(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ctx,
-                             char **dest, const uint8_t *src, int byte_len, uint_t flags)
+                             char **dest, const uint8_t *src, int byte_len, unsigned int flags)
 {
         int src_len, src_len2;
@@ -654 +654 @@
 */
 size_t smbcli_req_pull_string(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ctx, 
-                           char **dest, const uint8_t *src, int byte_len, uint_t flags)
+                           char **dest, const uint8_t *src, int byte_len, unsigned int flags)
 {
         if (!(flags & STR_ASCII) && 
@@ -752 +752 @@
 size_t smbcli_blob_pull_ucs2(TALLOC_CTX* mem_ctx,
                              const DATA_BLOB *blob, const char **dest, 
-                             const uint8_t *src, int byte_len, uint_t flags)
+                             const uint8_t *src, int byte_len, unsigned int flags)
 {
         int src_len, src_len2, alignment=0;
@@ -809 +809 @@
 static size_t smbcli_blob_pull_ascii(TALLOC_CTX *mem_ctx,
                                      const DATA_BLOB *blob, const char **dest, 
-                                     const uint8_t *src, int byte_len, uint_t flags)
+                                     const uint8_t *src, int byte_len, unsigned int flags)
 {
         int src_len, src_len2;
@@ -861 +861 @@
                                struct smb_wire_string *dest, 
                                uint16_t len_offset, uint16_t str_offset, 
-                               uint_t flags)
+                               unsigned int flags)
 {
         int extra;
@@ -928 +928 @@
                             const char **dest, 
                             uint16_t str_offset, 
-                            uint_t flags)
+                            unsigned int flags)
 {
         int extra = 0;
@@ -962 +962 @@
 size_t smbcli_blob_append_string(struct smbcli_session *session,
                               TALLOC_CTX *mem_ctx, DATA_BLOB *blob, 
-                              const char *str, uint_t flags)
+                              const char *str, unsigned int flags)
 {
         size_t max_len;
@@ -992 +992 @@
   bytes long
  */
-enum ndr_err_code smbcli_pull_guid(void *base, uint16_t offset, 
-                                   struct GUID *guid)
+NTSTATUS smbcli_pull_guid(void *base, uint16_t offset,
+                          struct GUID *guid)
 {
         DATA_BLOB blob;
-        TALLOC_CTX *tmp_ctx = talloc_new(NULL);
-        enum ndr_err_code ndr_err;
 
         ZERO_STRUCTP(guid);
@@ -1003 +1001 @@
         blob.data       = offset + (uint8_t *)base;
         blob.length     = 16;
-        ndr_err = ndr_pull_struct_blob(&blob, tmp_ctx, NULL, guid, 
-                                       (ndr_pull_flags_fn_t)ndr_pull_GUID);
-        talloc_free(tmp_ctx);
-        return ndr_err;
+
+        return GUID_from_ndr_blob(&blob, guid);
 }
 
@@ -1012 +1008 @@
   push a guid onto the wire. The buffer must hold 16 bytes
  */
-enum ndr_err_code smbcli_push_guid(void *base, uint16_t offset, 
-                                   const struct GUID *guid)
+NTSTATUS smbcli_push_guid(void *base, uint16_t offset, const struct GUID *guid)
 {
         TALLOC_CTX *tmp_ctx = talloc_new(NULL);
-        enum ndr_err_code ndr_err;
+        NTSTATUS status;
         DATA_BLOB blob;
-        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, NULL,
-                                       guid, (ndr_push_flags_fn_t)ndr_push_GUID);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err) || blob.length != 16) {
+        status = GUID_to_ndr_blob(guid, tmp_ctx, &blob);
+        if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(tmp_ctx);
-                return ndr_err;
+                return status;
         }
         memcpy(offset + (uint8_t *)base, blob.data, blob.length);
         talloc_free(tmp_ctx);
-        return ndr_err;
-}
+        return NT_STATUS_OK;
+}