Changeset 285 for branches/samba-3.3.x/source

Timestamp:

Jun 24, 2009, 2:54:02 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.6

Location:

branches/samba-3.3.x/source

Files:

• VERSION (modified) (1 diff)
• include/version.h (modified) (1 diff)
• smbd/posix_acls.c (modified) (10 diffs)

branches/samba-3.3.x/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=3
-SAMBA_VERSION_RELEASE=5
+SAMBA_VERSION_RELEASE=6
 
 ########################################################

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 5
-#define SAMBA_VERSION_OFFICIAL_STRING "3.3.5"
+#define SAMBA_VERSION_RELEASE 6
+#define SAMBA_VERSION_OFFICIAL_STRING "3.3.6"
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.3.x/source/smbd/posix_acls.c

@@ -2385 +2385 @@
 
 static bool acl_group_override(connection_struct *conn,
-                                gid_t prim_gid,
+                                SMB_STRUCT_STAT *psbuf,
                                 const char *fname)
 {
-        SMB_STRUCT_STAT sbuf;
-
         if ((errno != EPERM) && (errno != EACCES)) {
                 return false;
@@ -2396 +2394 @@
         /* file primary group == user primary or supplementary group */
         if (lp_acl_group_control(SNUM(conn)) &&
-                        current_user_in_group(prim_gid)) {
+                        current_user_in_group(psbuf->st_gid)) {
                 return true;
         }
@@ -2402 +2400 @@
         /* user has writeable permission */
         if (lp_dos_filemode(SNUM(conn)) &&
-                        can_write_to_file(conn, fname, &sbuf)) {
+                        can_write_to_file(conn, fname, psbuf)) {
                 return true;
         }
@@ -2413 +2411 @@
 ****************************************************************************/
 
-static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool default_ace, gid_t prim_gid, bool *pacl_set_support)
+static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool default_ace, SMB_STRUCT_STAT *psbuf, bool *pacl_set_support)
 {
         connection_struct *conn = fsp->conn;
@@ -2592 +2590 @@
                         }
 
-                        if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
+                        if (acl_group_override(conn, psbuf, fsp->fsp_name)) {
                                 int sret;
 
@@ -2623 +2621 @@
                         }
 
-                        if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
+                        if (acl_group_override(conn, psbuf, fsp->fsp_name)) {
                                 int sret;
 
@@ -3619 +3617 @@
                         become_root();
                 }
-                ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);
+                ret = set_canon_ace_list(fsp, file_ace_list, False, &sbuf, &acl_set_support);
                 if (set_acl_as_root) {
                         unbecome_root();
@@ -3636 +3634 @@
                                 become_root();
                         }
-                        ret = set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support);
+                        ret = set_canon_ace_list(fsp, dir_ace_list, True, &sbuf, &acl_set_support);
                         if (set_acl_as_root) {
                                 unbecome_root();
@@ -3661 +3659 @@
                         }
                         if (sret == -1) {
-                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
+                                if (acl_group_override(conn, &sbuf, fsp->fsp_name)) {
                                         DEBUG(5,("set_nt_acl: acl group control on and "
                                                 "current user in file %s primary group. Override delete_def_acl\n",
@@ -3721 +3719 @@
                         }
                         if(sret == -1) {
-                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
+                                if (acl_group_override(conn, &sbuf, fsp->fsp_name)) {
                                         DEBUG(5,("set_nt_acl: acl group control on and "
                                                 "current user in file %s primary group. Override chmod\n",