Documents for Merijn and lots of XXXs for NI-S :-)

[p5sagit/p5-mst-13.2.git] / utils / perldoc.PL

diff --git a/utils/perldoc.PL b/utils/perldoc.PL
index 62a82f3..7929a27 100644 (file)
--- a/utils/perldoc.PL
+++ b/utils/perldoc.PL
@@ -169,13 +169,27 @@ if (!($Is_VMS || $Is_MSWin32 || $Is_Dos || $Is_OS2) && ($> == 0 || $< == 0)
         my $id = eval { getpwnam("nobody") };
            $id = eval { getpwnam("nouser") } unless defined $id;
            $id = -2 unless defined $id;
+       #
+       # According to Stevens' APUE and various
+       # (BSD, Solaris, HP-UX) man pages setting
+       # the real uid first and effective uid second
+       # is the way to go if one wants to drop privileges,
+       # because if one changes into an effective uid of
+       # non-zero, one cannot change the real uid any more.
+       #
+       # Actually, it gets even messier.  There is
+       # a third uid, called the saved uid, and as
+       # long as that is zero, one can get back to
+       # uid of zero.  Setting the real-effective *twice*
+       # helps in *most* systems (FreeBSD and Solaris)
+       # but apparently in HP-UX even this doesn't help:
+       # the saved uid stays zero (apparently the only way
+       # in HP-UX to change saved uid is to call setuid()
+       # when the effective uid is zero).
+       #
         eval {
-           # According to Stevens' APUE and various
-           # (BSD, Solaris, HP-UX) man pages setting
-           # the real uid first and effective uid second
-           # is the way to go if one wants to drop privileges,
-           # because if one changes into an effective uid of
-           # non-zero, one cannot change the real uid any more.
+            $< = $id; # real uid
+            $> = $id; # effective uid
             $< = $id; # real uid
             $> = $id; # effective uid
         };
@@ -328,7 +342,7 @@ sub searchfor {
     for ($i=0; $i<@dirs; $i++) {
        $dir = $dirs[$i];
        ($dir = VMS::Filespec::unixpath($dir)) =~ s!/\z!! if $Is_VMS;
-       if (       ( $ret = check_file $dir,"$s.pod")
+       if (       (! $opt_m && ( $ret = check_file $dir,"$s.pod"))
                or ( $ret = check_file $dir,"$s.pm")
                or ( $ret = check_file $dir,$s)
                or ( $Is_VMS and
@@ -444,7 +458,8 @@ foreach (@pages) {
            print STDERR "Loosely found as @files\n" if $opt_v;
        }
        else {
-           print STDERR "No documentation found for \"$_\".\n";
+           print STDERR "No " .
+               ($opt_m ? "module" : "documentation") . " found for \"$_\".\n";
            if (@global_found) {
                print STDERR "However, try\n";
                for my $dir (@global_found) {
@@ -574,7 +589,7 @@ EOD
            $found = 1;
            push @pod, "=head1 Found in $ARGV\n\n" unless $found_in{$ARGV}++;
        }
-       elsif (/^=head2/) {
+       elsif (/^=head[12]/) {
            $found = 0;
        }
        next unless $found;