diff options
| author | ivan <ivan> | 2002-07-03 11:23:25 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2002-07-03 11:23:25 +0000 |
| commit | 5786c8244a188823b01b87e2d7e9fd6bc72644b3 (patch) | |
| tree | 2e6cd4d4c3aa1e9bb8631c2322e41cc458a97077 /FS | |
| parent | 98567e531e90ee1c7c195d5f1e708898d47a8452 (diff) | |
fix to allow running during apache init
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/InitHandler.pm | 7 | ||||
| -rw-r--r-- | FS/FS/UID.pm | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm index b1b9eaf03..31aacc731 100644 --- a/FS/FS/InitHandler.pm +++ b/FS/FS/InitHandler.pm @@ -64,6 +64,9 @@ sub handler { warn "[FS::InitHandler] handler called\n" if $DEBUG; + #this is sure to be broken on freebsd + $> = $FS::UID::freeside_uid; + open(MAPSECRETS,"<$FS::UID::conf_dir/mapsecrets") or die "can't read $FS::UID::conf_dir/mapsecrets: $!"; @@ -80,6 +83,10 @@ sub handler { close MAPSECRETS; + #lalala probably broken on freebsd + ($<, $>) = ($>, $<); + $< = 0; + } 1; diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm index 15f15a171..0b10612c5 100644 --- a/FS/FS/UID.pm +++ b/FS/FS/UID.pm @@ -83,7 +83,7 @@ sub forksuidsetup { $ENV{'ENV'} = ''; $ENV{'BASH_ENV'} = ''; - croak "Not running uid freeside!" unless checkeuid() || !$>; + croak "Not running uid freeside!" unless checkeuid(); getsecrets; $dbh = DBI->connect($datasrc,$db_user,$db_pass, { 'AutoCommit' => 0, @@ -256,7 +256,7 @@ coderef into the hash %FS::UID::callback : =head1 VERSION -$Id: UID.pm,v 1.17 2002-07-03 11:10:12 ivan Exp $ +$Id: UID.pm,v 1.18 2002-07-03 11:23:25 ivan Exp $ =head1 BUGS |