Changeset 873 for server

Timestamp:

Nov 8, 2008, 12:20:41 AM (16 years ago)

Author:

andersk

Message:

No more x bit hack.

Location:

server/common/patches

Files:

• httpd-suexec-scripts.patch (modified) (2 diffs)
• openafs-scripts.patch (modified) (2 diffs)

server/common/patches/httpd-suexec-scripts.patch

@@ -259 +259 @@
          (gid != dir_info.st_gid) ||
          (uid != prg_info.st_uid) ||
-@@ -574,14 +676,15 @@
+@@ -574,12 +676,14 @@
                  prg_info.st_uid, prg_info.st_gid);
          exit(120);
@@ -271 +271 @@
 -    if (!(prg_info.st_mode & S_IXUSR)) {
 +    if (!is_static_extension(cmd) && !is_php_extension(cmd) &&
-+        !(prg_info.st_mode & S_IXGRP)) {
++        !(prg_info.st_mode & S_IXUSR)) {
          log_err("file has no execute permission: (%s/%s)\n", cwd, cmd);
--        exit(121);
-     }
- 
- #ifdef AP_SUEXEC_UMASK
+         exit(121);
+     }
 @@ -606,6 +709,21 @@
        exit(122);

server/common/patches/openafs-scripts.patch

@@ -178 +178 @@
      }
  }
-@@ -192,6 +215,7 @@
-     OSI_VC_CONVERT(avc);
- 
-     AFS_STATCNT(afs_access);
-+    amode = amode & ~VEXEC;
-     afs_Trace3(afs_iclSetp, CM_TRACE_ACCESS, ICL_TYPE_POINTER, avc,
-               ICL_TYPE_INT32, amode, ICL_TYPE_OFFSET,
-               ICL_HANDLE_OFFSET(avc->m.Length));
 diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c
 --- openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c  2007-11-05 23:08:46.000000000 -0500
@@ -200 +192 @@
      attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0];
  #elif defined(AFS_OSF_ENV)
-@@ -172,6 +172,8 @@
- #else /* everything else */
-     attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0);
- #endif
-+    attrs->va_mode &= ~010;
-+    attrs->va_mode |= 0100 | (attrs->va_mode & 0100) >> 3;
-     return 0;
- }
-