[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / include / client.h

diff --git a/source/include/client.h b/source/include/client.h
index 30e0fae87441ad1f449ed5a2862f7b9c363a8dcf..5165b85df11e2af0f7223d8d80d6242165b71ff0 100644 (file)
--- a/source/include/client.h
+++ b/source/include/client.h
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CLIENT_H
@@ -27,29 +26,15 @@
    overlap on the wire. This size gives us a nice read/write size, which
    will be a multiple of the page size on almost any system */
 #define CLI_BUFFER_SIZE (0xFFFF)
-#define CLI_MAX_LARGE_READX_SIZE (127*1024)
+#define CLI_SAMBA_MAX_LARGE_READX_SIZE (127*1024) /* Works for Samba servers */
+#define CLI_WINDOWS_MAX_LARGE_READX_SIZE ((64*1024)-2) /* Windows servers are broken.... */
+#define CLI_SAMBA_MAX_POSIX_LARGE_READX_SIZE (0xFFFF00) /* 24-bit len. */
 
 /*
  * These definitions depend on smb.h
  */
 
-typedef struct file_info
-{
-       SMB_BIG_UINT size;
-       uint16 mode;
-       uid_t uid;
-       gid_t gid;
-       /* these times are normally kept in GMT */
-       time_t mtime;
-       time_t atime;
-       time_t ctime;
-       pstring name;
-       pstring dir;
-       char short_name[13*3]; /* the *3 is to cope with multi-byte */
-} file_info;
-
-struct print_job_info
-{
+struct print_job_info {
        uint16 id;
        uint16 priority;
        size_t size;
@@ -143,7 +128,9 @@ struct cli_state {
        unsigned int bufsize;
        int initialised;
        int win95;
+       BOOL is_samba;
        uint32 capabilities;
+       uint32 posix_capabilities;
        BOOL dfsroot;
 
        TALLOC_CTX *mem_ctx;
@@ -169,14 +156,25 @@ struct cli_state {
 
        BOOL force_dos_errors;
        BOOL case_sensitive; /* False by default. */
-
-       /* was this structure allocated by cli_initialise? If so, then
-           free in cli_shutdown() */
-       BOOL allocated;
 };
 
+typedef struct file_info {
+       struct cli_state *cli;
+       SMB_BIG_UINT size;
+       uint16 mode;
+       uid_t uid;
+       gid_t gid;
+       /* these times are normally kept in GMT */
+       struct timespec mtime_ts;
+       struct timespec atime_ts;
+       struct timespec ctime_ts;
+       pstring name;
+       pstring dir;
+       char short_name[13*3]; /* the *3 is to cope with multi-byte */
+} file_info;
+
 #define CLI_FULL_CONNECTION_DONT_SPNEGO 0x0001
 #define CLI_FULL_CONNECTION_USE_KERBEROS 0x0002
-#define CLI_FULL_CONNECTION_ANNONYMOUS_FALLBACK 0x0004
+#define CLI_FULL_CONNECTION_ANONYMOUS_FALLBACK 0x0004
 
 #endif /* _CLIENT_H */