diff -r -u amavisd-snapshot-20010407/amavis/amavisd.in amavisd-snapshot-20010407.orig/amavis/amavisd.in
--- amavisd-snapshot-20010407/amavis/amavisd.in	Tue Jun 12 12:21:37 2001
+++ amavisd-snapshot-20010407.orig/amavis/amavisd.in	Thu Apr  5 12:19:32 2001
@@ -139,11 +139,6 @@
 # Real execution starts here
 #
 
-# Who/what am I?
-my ($self,$where_am_I);
-($self = $0) =~ s#.*/##;
-($where_am_I = $0) =~ s#(.*/).*#\1#;
-
 # Set path explictly.  Don't trust environment
 delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
 
@@ -194,9 +189,7 @@
 # may need to do more - eg. if logging changes, close/reopen syslog/log file
 # rethink - handler should be simple
 sub read_config {
-	$0 = "$self: reading $config_file";
 	do "$config_file" || die "Cannot read config file: $!";
-	$0 = "$self: waiting for connections from client.";
 	$SIG{HUP} = \&read_config;
 }
 $SIG{HUP} = \&read_config;
@@ -217,7 +210,6 @@
 my $a;
 while (($a = accept(Client,Server)) || $diedpid != 0) {
 
-	$0 = "$self: waiting for connections";
 	do_log(3,"enter accept loop");
 	# now we start the repeating loop...
 	if ($diedpid) {
@@ -238,9 +230,6 @@
 	# if we're the parent, just go back to the accept loop
 	}
 
-	# We're a child... look like a child.
-	$0 = "$self: handling email message";
-
 	do_log(3,"forked off -- child running...");
 	$SIG{CHLD} = 'DEFAULT';
 
@@ -261,10 +250,6 @@
 		do_exit($REGERR, __LINE__);
 		# invalid directory
 	}
-
-	# Change our PS info once again to be useful...
-	$0 = "$self: working in $TEMPDIR";
-
 	if (!defined($ret)) {
 		do_log(0,"failed to send response to client - $!");
 		do_exit($REGERR, __LINE__);