Commit 84572430 authored by Mike Hibler's avatar Mike Hibler

Fix a couple of nits.

Perl 5.12.4 needs the same self-loader patch as 5.10.1.

Doh! Forgot to turn off the debugging in runsuid.c. Hence it wasn't
actually exec'ing anything!
parent 1f83c9c6
......@@ -62,7 +62,12 @@ sub Install($$$)
};
}
Phase "perlselfloaderpatch", "Fixing perl self-loader", sub {
my $perldir = "/usr/local/lib/perl5/5.10.1";
my $perldir;
# need for 5.10 or 5.12
$perldir = "/usr/local/lib/perl5/5.12.4";
if (! -d $perldir) {
$perldir = "/usr/local/lib/perl5/5.10.1";
}
DoneIfDoesntExist("$perldir/SelfLoader.pm");
my $ver = `fgrep 'our \$VERSION =' $perldir/SelfLoader.pm 2>/dev/null`;
if ($? == 0 && $ver =~ /1\.18/) {
......
......@@ -42,7 +42,7 @@ char *badvars[] = {
"IFS=", "CDPATH=", "ENV=", "BASH_ENV="
};
static int debug = 1;
static int debug = 0;
static void
sanedir(char *dir)
......@@ -104,12 +104,10 @@ main(int argc, char **argv)
int i, len;
extern char **environ;
#if 0
if (getuid()) {
if (geteuid()) {
fprintf(stderr, "%s: not running as root; not suid?\n", name);
exit(1);
}
#endif
/* Check the state of the SUIDDIR */
sanedir(SUIDDIR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment