Changeset 873 for server


Ignore:
Timestamp:
Nov 8, 2008, 12:20:41 AM (16 years ago)
Author:
andersk
Message:
No more x bit hack.
Location:
server/common/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • server/common/patches/httpd-suexec-scripts.patch

    r855 r873  
    259259         (gid != dir_info.st_gid) ||
    260260         (uid != prg_info.st_uid) ||
    261 @@ -574,14 +676,15 @@
     261@@ -574,12 +676,14 @@
    262262                 prg_info.st_uid, prg_info.st_gid);
    263263         exit(120);
     
    271271-    if (!(prg_info.st_mode & S_IXUSR)) {
    272272+    if (!is_static_extension(cmd) && !is_php_extension(cmd) &&
    273 +        !(prg_info.st_mode & S_IXGRP)) {
     273+        !(prg_info.st_mode & S_IXUSR)) {
    274274         log_err("file has no execute permission: (%s/%s)\n", cwd, cmd);
    275 -        exit(121);
    276      }
    277  
    278  #ifdef AP_SUEXEC_UMASK
     275         exit(121);
     276     }
    279277@@ -606,6 +709,21 @@
    280278       exit(122);
  • server/common/patches/openafs-scripts.patch

    r843 r873  
    178178     }
    179179 }
    180 @@ -192,6 +215,7 @@
    181      OSI_VC_CONVERT(avc);
    182  
    183      AFS_STATCNT(afs_access);
    184 +    amode = amode & ~VEXEC;
    185      afs_Trace3(afs_iclSetp, CM_TRACE_ACCESS, ICL_TYPE_POINTER, avc,
    186                ICL_TYPE_INT32, amode, ICL_TYPE_OFFSET,
    187                ICL_HANDLE_OFFSET(avc->m.Length));
    188180diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c
    189181--- openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c  2007-11-05 23:08:46.000000000 -0500
     
    200192     attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0];
    201193 #elif defined(AFS_OSF_ENV)
    202 @@ -172,6 +172,8 @@
    203  #else /* everything else */
    204      attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0);
    205  #endif
    206 +    attrs->va_mode &= ~010;
    207 +    attrs->va_mode |= 0100 | (attrs->va_mode & 0100) >> 3;
    208      return 0;
    209  }
    210  
Note: See TracChangeset for help on using the changeset viewer.