jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-22 17:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make DAFS 'bos salvage' work in restricted mode

Browse Source 
bosserver currently has code to specifically allow 'bos
salvage'-initiated salvages to run when in restricted mode. This only
specifically tests for running salvager, though, and so fails when 'bos
salvage' is run against a DAFS fileserver and tries to run
'salvageserver -client' instead.

Test for 'salvageserver -client' as well, so we can run 'bos salvage'
for DAFS fileservers in restricted mode.

Change-Id: I27052a440ea8d6347a9d86e4a1f1a7131a277b0b
Reviewed-on: http://gerrit.openafs.org/1048
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Andrew Deason 2009-12-30 11:44:39 -05:00 committed by Derrick Brashear
parent 12f35e8493
commit d11ca53be7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bozo/bosoprocs.c
View File

@ -775,10 +775,16 @@ SBOZO_CreateBnode(struct rx_call *acall, char *atype, char *ainstance,
goto fail; goto fail;
} }
if (bozo_isrestricted) { if (bozo_isrestricted) {
const char *salvpath = AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH;
/* for DAFS, 'bos salvage' will pass "salvageserver -client" instead */
const char *salsrvpath = AFSDIR_CANONICAL_SERVER_SALSRV_FILEPATH " -client ";
/* still allow 'bos salvage' to work */
if (strcmp(atype, "cron") || strcmp(ainstance, "salvage-tmp") if (strcmp(atype, "cron") || strcmp(ainstance, "salvage-tmp")
|| strcmp(ap2, "now") || strcmp(ap2, "now")
|| strncmp(ap1, AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH, || (strncmp(ap1, salvpath, strlen(salvpath))
strlen(AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH))) { && strncmp(ap1, salsrvpath, strlen(salsrvpath)))) {
code = BZACCESS; code = BZACCESS;
goto fail; goto fail;
} }