Changeset 222 for branches/samba-3.3.x/source/include

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

Location:

branches/samba-3.3.x/source/include

Files:

• config.h.in (modified) (1 diff)
• includes.h (modified) (1 diff)
• libsmbclient.h (modified) (1 diff)
• proto.h (modified) (3 diffs)
• smb.h (modified) (1 diff)
• version.h (modified) (1 diff)

branches/samba-3.3.x/source/include/config.h.in

@@ -3225 +3225 @@
 #undef vfs_prealloc_init
 
+/* Whether to build vfs_preopen as shared module */
+#undef vfs_preopen_init
+
 /* Whether to build vfs_readahead as shared module */
 #undef vfs_readahead_init

branches/samba-3.3.x/source/include/includes.h

@@ -208 +208 @@
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
 #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
 #endif
 

branches/samba-3.3.x/source/include/libsmbclient.h

@@ -2678 +2678 @@
 
 void
-smbc_set_credentials(char *workgroup,
-                     char *user,
-                     char *password,
+smbc_set_credentials(const char *workgroup,
+                     const char *user,
+                     const char *password,
                      smbc_bool use_kerberos,
-                     char *signing_state);
+                     const char *signing_state);
 
 /*

branches/samba-3.3.x/source/include/proto.h

@@ -4943 +4943 @@
 void srv_calculate_sign_mac(char *outbuf);
 void srv_defer_sign_response(uint16 mid);
-void srv_cancel_sign_response(uint16 mid);
+void srv_cancel_sign_response(uint16 mid, bool cancel);
 void srv_set_signing_negotiated(void);
 bool srv_is_signing_active(void);
@@ -5203 +5203 @@
 NTSTATUS can_set_delete_on_close(files_struct *fsp, bool delete_on_close,
                                  uint32 dosmode);
-void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok);
-void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok);
-bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok);
+void set_delete_on_close_token(struct share_mode_lock *lck, const UNIX_USER_TOKEN *tok);
+void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, const UNIX_USER_TOKEN *tok);
+bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USER_TOKEN *tok);
 bool set_sticky_write_time(struct file_id fileid, struct timespec write_time);
 bool set_write_time(struct file_id fileid, struct timespec write_time);
@@ -8907 +8907 @@
 files_struct *file_find_di_next(files_struct *start_fsp);
 files_struct *file_find_print(void);
+bool file_find_subpath(files_struct *dir_fsp);
 void file_sync_all(connection_struct *conn);
 void file_free(files_struct *fsp);

branches/samba-3.3.x/source/include/smb.h

@@ -597 +597 @@
          */
         struct auth_serversupplied_info *server_info;
+
+        /*
+         * If the "force group" parameter is set, this is the primary gid that
+         * may be used in the users token, depending on the vuid using this tid.
+         */
+        gid_t force_group_gid;
 
         char client_address[INET6_ADDRSTRLEN]; /* String version of client IP address. */

branches/samba-3.3.x/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 3
-#define SAMBA_VERSION_RELEASE 1
-#define SAMBA_VERSION_OFFICIAL_STRING "3.3.1"
+#define SAMBA_VERSION_RELEASE 2
+#define SAMBA_VERSION_OFFICIAL_STRING "3.3.2"
 #define SAMBA_VERSION_STRING samba_version_string()