Changeset 745 for trunk/server/source4/libcli/raw/libcliraw.h

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/libcliraw.h (modified) (9 diffs)

trunk/server/source4/libcli/raw/libcliraw.h

@@ -64 +64 @@
         int server_zone;
         time_t server_time;
-        uint_t readbraw_supported:1;
-        uint_t writebraw_supported:1;
+        unsigned int readbraw_supported:1;
+        unsigned int writebraw_supported:1;
+        unsigned int lockread_supported:1;
 
         char *server_domain;
@@ -93 +94 @@
 */
 struct smbcli_options {
-        uint_t use_oplocks:1;
-        uint_t use_level2_oplocks:1;
-        uint_t use_spnego:1;
-        uint_t unicode:1;
-        uint_t ntstatus_support:1;
+        unsigned int use_oplocks:1;
+        unsigned int use_level2_oplocks:1;
+        unsigned int use_spnego:1;
+        unsigned int unicode:1;
+        unsigned int ntstatus_support:1;
         int max_protocol;
         uint32_t max_xmit;
@@ -122 +123 @@
         /* is a readbraw pending? we need to handle that case
            specially on receiving packets */
-        uint_t readbraw_pending:1;
+        unsigned int readbraw_pending:1;
         
         /* an idle function - if this is defined then it will be
@@ -130 +131 @@
                 void (*func)(struct smbcli_transport *, void *);
                 void *private_data;
-                uint_t period;
+                unsigned int period;
         } idle;
 
@@ -143 +144 @@
                               SOCKET_WRITE_ERROR,
                               SOCKET_READ_BAD_SIG} socket_error;
-                        uint_t nbt_error;
+                        unsigned int nbt_error;
                 } e;
         } error;
@@ -164 +165 @@
         /* context of the stream -> packet parser */
         struct packet_context *packet;
-
-        /* iconv convenience */
-        struct smb_iconv_convenience *iconv_convenience;
 };
 
@@ -193 +191 @@
 
         struct smbcli_session_options {
-                uint_t lanman_auth:1;
-                uint_t ntlmv2_auth:1;
-                uint_t plaintext_auth:1;
+                unsigned int lanman_auth:1;
+                unsigned int ntlmv2_auth:1;
+                unsigned int plaintext_auth:1;
         } options;
 
@@ -256 +254 @@
         
         /* the sequence number of this packet - used for signing */
-        uint_t seq_num;
+        unsigned int seq_num;
 
         /* list of ntcancel request for this requests */
@@ -263 +261 @@
         /* set if this is a one-way request, meaning we are not
            expecting a reply from the server. */
-        uint_t one_way_request:1;
+        unsigned int one_way_request:1;
 
         /* set this when the request should only increment the signing
            counter by one */
-        uint_t sign_single_increment:1;
+        unsigned int sign_single_increment:1;
 
         /* the caller wants to do the signing check */