source:
server/common/patches/openafs-scripts.patch
@
680
Last change on this file since 680 was 628, checked in by andersk, 17 years ago | |
---|---|
File size: 8.1 KB |
-
src/afs/afs_analyze.c
# scripts.mit.edu openafs patch # Copyright (C) 2006 Jeff Arnold <jbarnold@mit.edu> # with modifications by Joe Presbrey <presbrey@mit.edu> # and Anders Kaseorg <andersk@mit.edu> # # This file is available under both the MIT license and the GPL. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # # 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 (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # See /COPYRIGHT in this repository for more information. # diff -ur openafs-1.4/src/afs/afs_analyze.c openafs-1.4+scripts/src/afs/afs_analyze.c
old new 505 505 (afid ? afid->Fid.Volume : 0)); 506 506 } 507 507 508 if ( areq->busyCount > 100) {508 if (1) { 509 509 if (aerrP) 510 510 (aerrP->err_Volume)++; 511 511 areq->volumeError = VOLBUSY; -
src/afs/afs.h
diff -ur openafs-1.4/src/afs/afs.h openafs-1.4+scripts/src/afs/afs.h
old new 177 177 struct afs_q *prev; 178 178 }; 179 179 180 #define AFSAGENT_UID (101) 181 #define SIGNUP_UID (102) 182 #define HTTPD_UID (48) 183 #define POSTFIX_UID (89) 184 #define DAEMON_SCRIPTS_PTSID (33554596) 185 extern afs_int32 globalpag; 186 180 187 struct vrequest { 181 188 afs_int32 uid; /* user id making the request */ 189 afs_int32 realuid; 182 190 afs_int32 busyCount; /* how many busies we've seen so far */ 183 191 afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */ 184 192 char initd; /* if non-zero, non-uid fields meaningful */ -
src/afs/afs_osi_pag.c
diff -ur openafs-1.4/src/afs/afs_osi_pag.c openafs-1.4+scripts/src/afs/afs_osi_pag.c
old new 51 51 #endif 52 52 /* Local variables */ 53 53 54 afs_int32 globalpag = 0; 55 54 56 /* 55 57 * Pags are implemented as follows: the set of groups whose long 56 58 * representation is '41XXXXXX' hex are used to represent the pags. … … 442 444 av->uid = acred->cr_ruid; /* default when no pag is set */ 443 445 #endif 444 446 } 447 448 av->realuid = acred->cr_ruid; 449 if(!globalpag && acred->cr_ruid == AFSAGENT_UID) { 450 globalpag = av->uid; 451 } 452 else if (globalpag && av->uid == acred->cr_ruid) { 453 av->uid = globalpag; 454 } 455 445 456 av->initd = 0; 446 457 return 0; 447 458 } -
src/afs/afs_pioctl.c
diff -ur openafs-1.4/src/afs/afs_pioctl.c openafs-1.4+scripts/src/afs/afs_pioctl.c
old new 1208 1208 struct AFSFetchStatus OutStatus; 1209 1209 XSTATS_DECLS; 1210 1210 1211 if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { 1212 return EACCES; 1213 } 1214 1211 1215 AFS_STATCNT(PSetAcl); 1212 1216 if (!avc) 1213 1217 return EINVAL; … … 1428 1432 struct vrequest treq; 1429 1433 afs_int32 flag, set_parent_pag = 0; 1430 1434 1435 if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { 1436 return 0; 1437 } 1438 1431 1439 AFS_STATCNT(PSetTokens); 1432 1440 if (!afs_resourceinit_flag) { 1433 1441 return EIO; … … 1870 1878 register afs_int32 i; 1871 1879 register struct unixuser *tu; 1872 1880 1881 if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { 1882 return 0; 1883 } 1884 1873 1885 AFS_STATCNT(PUnlog); 1874 1886 if (!afs_resourceinit_flag) /* afs daemons haven't started yet */ 1875 1887 return EIO; /* Inappropriate ioctl for device */ -
src/afs/VNOPS/afs_vnop_access.c
diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_access.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_access.c
old new 118 118 119 119 if ((vType(avc) == VDIR) || (avc->states & CForeign)) { 120 120 /* rights are just those from acl */ 121 122 if ( areq->uid == globalpag && 123 !(areq->realuid == avc->fid.Fid.Volume) && 124 !((avc->anyAccess | arights) == avc->anyAccess) && 125 !(((arights & ~(PRSFS_LOOKUP|PRSFS_READ)) == 0) && areq->realuid == HTTPD_UID) && 126 !(((arights & ~(PRSFS_LOOKUP|PRSFS_READ)) == 0) && areq->realuid == POSTFIX_UID) && 127 !(PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq) && areq->realuid == 0) && 128 !(PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq) && (areq->realuid == 0 || areq->realuid == SIGNUP_UID)) ) { 129 return 0; 130 } 131 121 132 return (arights == afs_GetAccessBits(avc, arights, areq)); 122 133 } else { 123 134 /* some rights come from dir and some from file. Specifically, you … … 171 182 fileBits |= PRSFS_READ; 172 183 } 173 184 } 185 186 if ( areq->uid == globalpag && 187 !(areq->realuid == avc->fid.Fid.Volume) && 188 !((avc->anyAccess | arights) == avc->anyAccess) && 189 !(arights == PRSFS_LOOKUP && areq->realuid == HTTPD_UID) && 190 !(arights == PRSFS_LOOKUP && areq->realuid == POSTFIX_UID) && 191 !(arights == PRSFS_READ && areq->realuid == HTTPD_UID && avc->m.Mode == 33279) && 192 !(PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq) && areq->realuid == 0) && 193 !(PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq) && (areq->realuid == 0 || areq->realuid == SIGNUP_UID)) ) { 194 return 0; 195 } 196 174 197 return ((fileBits & arights) == arights); /* true if all rights bits are on */ 175 198 } 176 199 } … … 192 215 OSI_VC_CONVERT(avc); 193 216 194 217 AFS_STATCNT(afs_access); 218 amode = amode & ~VEXEC; 195 219 afs_Trace3(afs_iclSetp, CM_TRACE_ACCESS, ICL_TYPE_POINTER, avc, 196 220 ICL_TYPE_INT32, amode, ICL_TYPE_OFFSET, 197 221 ICL_HANDLE_OFFSET(avc->m.Length)); -
src/afs/VNOPS/afs_vnop_attrs.c
diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c
old new 87 87 } 88 88 } 89 89 #endif /* AFS_DARWIN_ENV */ 90 attrs->va_uid = fakedir ? 0 : avc-> m.Owner;91 attrs->va_gid = fakedir ? 0 : avc->m.Group; /* yeah! */90 attrs->va_uid = fakedir ? 0 : avc->fid.Fid.Volume; 91 attrs->va_gid = (avc->m.Owner == DAEMON_SCRIPTS_PTSID ? avc->m.Group : avc->m.Owner); 92 92 #if defined(AFS_SUN56_ENV) 93 93 attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0]; 94 94 #elif defined(AFS_OSF_ENV) … … 172 172 #else /* everything else */ 173 173 attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0); 174 174 #endif 175 attrs->va_mode |= 0100; 175 176 return 0; 176 177 } 177 178
Note: See TracBrowser
for help on using the repository browser.