Fix --mail and --fullname flags, and disable --mail per default.

1 files changed, 4 insertions, 4 deletions

diff --git a/localuserinfo b/localuserinfo
index 1773802..a5dfee6 100755
--- a/localuserinfo
+++ b/localuserinfo
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -wT
-my $ID = q$Id: localuserinfo,v 1.5 2007-02-07 13:09:10 jonas Exp $;
+my $ID = q$Id: localuserinfo,v 1.6 2007-02-07 13:10:50 jonas Exp $;
 #
 # localuserinfo -- List fullname for each user
 #
@@ -32,7 +32,7 @@ use User::grent;
 our $verbose = 1;		# should we be verbose?
 my $ignore_badname = 0;		# should we ignore bad names?
 my $include_fullname = 1;
-my $include_mail = 1;
+my $include_mail = 0;
 our $custom_string;
 my $use_custom_string = 0;
 
@@ -78,8 +78,8 @@ while (my $username = shift @names) {
 		die "Use of custom string not yet implemented!";
 	} else {
 		my @output;
-		push (@output, $fullname) if (defined($include_fullname));
-		push (@output, "$username\@$maildomain") if (defined($include_mail));
+		push (@output, $fullname) if ($include_fullname);
+		push (@output, "$username\@$maildomain") if ($include_mail);
 		$string = join(' ', @output);
 	}