diff options
| -rwxr-xr-x | CVSROOT/cvs_acls.pl | 3 | ||||
| -rwxr-xr-x | CVSROOT/log_accum.pl | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CVSROOT/cvs_acls.pl b/CVSROOT/cvs_acls.pl index 27b8e095cadd..3cf9b7ab0396 100755 --- a/CVSROOT/cvs_acls.pl +++ b/CVSROOT/cvs_acls.pl @@ -83,7 +83,8 @@ use CVSROOT::cfg; my $debug = $cfg::DEBUG; my $cvsroot = $ENV{'CVSROOT'}; my $availfile = $cvsroot . "/CVSROOT/avail"; -my $myname = $ENV{"LOGNAME"} || $ENV{"USER"}; +my $myname = $ENV{"CVS_USER"} || $ENV{"LOGNAME"} || $ENV{"USER"} || "unknown"; + my $die = ''; eval "print STDERR \$die='Unknown parameter $1\n' if !defined \$$1; \$$1=\$';" diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl index c41b66362fcd..669fd1acabf8 100755 --- a/CVSROOT/log_accum.pl +++ b/CVSROOT/log_accum.pl @@ -52,6 +52,8 @@ my $TAGS_FILE = "$BASE_FN.tags"; my $X_BRANCH_HDR = "X-FreeBSD-CVS-Branch:"; my $CVSROOT = $ENV{'CVSROOT'} || "/home/ncvs"; +my $CVSUSER = $ENV{"CVS_USER"} || $ENV{"LOGNAME"} || + $ENV{"USER"} || "unknown"; ############################################################ # @@ -354,9 +356,7 @@ sub build_header { my $datestr = `/bin/date +"%Y/%m/%d %H:%M:%S %Z"`; chomp $datestr; - my $login = $ENV{'USER'} || getlogin || - (getpwuid($<))[0] || sprintf("uid#%d",$<); - my $header = sprintf("%-8s %s", $login, $datestr); + my $header = sprintf("%-8s %s", $CVSUSER, $datestr); my @text; push @text, $header; |