Strip commented out debug cruft.

1 files changed, 1 insertions, 7 deletions

diff --git a/localmkpostfixvirtual b/localmkpostfixvirtual
index 40d12df..7c6b949 100755
--- a/localmkpostfixvirtual
+++ b/localmkpostfixvirtual
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localmkpostfixvirtual
 # Copyright 2001-2006 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localmkpostfixvirtual,v 1.28 2006-08-22 23:11:33 jonas Exp $
+# $Id: localmkpostfixvirtual,v 1.29 2006-08-22 23:14:02 jonas Exp $
 #
 # Generate virtual file for postfix
 #
@@ -39,7 +39,6 @@ use strict;
 
 use User::pwent;
 use User::grent;
-#use Data::Dumper;
 
 my (%username, %fullname, %office, %workphone, %homephone, %other);
 my (%username_by_gid, %addresshints, %domains);
@@ -51,7 +50,6 @@ while (my $pw = getpwent()) {
 	if (defined($other{$pw->name})) {
 		@{$addresshints{$pw->name}} = grep {/^([\.[:alnum:]_-]+|\+)?@([\.[:alnum:]_-]+)?$/} split /\s+/, $other{$pw->name};
 	}
-#DEBUG: ($pw->name eq "annette") and print STDERR Dumper(@{$addresses{$pw->name}});
 }
 
 my (%owner, %members, %groups);
@@ -86,8 +84,6 @@ sub print_accounts($$$$) {
 
 	($pre_text) && print $pre_text . "\n";
 	my $joker_seen;
-#DEBUG: print STDERR "$mailgroup $maildomain\n";
-#DEBUG: ($username eq "annette") and print STDERR Dumper(@{$addresshints{$username}});
 	if (&warnonce(defined(@{$addresshints{$username}}), "addresshints_$username", "Skipping non-hinted username \"$username\".")) {
 		my @localparthints = @{$addresshints{$username}};
 		my @localparts = grep {s/(.+)@($mailgroup|$maildomain)?$/$1/} @localparthints;
@@ -147,7 +143,6 @@ foreach my $mailgroup (@mailgroups) {
 		}
 		my @mailgroupowners_sorted = sort @mailgroupowners;
 		my @mailusers_sorted = sort @mailusers;
-#DEBUG: print STDERR Dumper(@mailusers); die;
 		if ($loop) {
 			print "\n##################################################################\n\n";
 		}
@@ -159,7 +154,6 @@ foreach my $mailgroup (@mailgroups) {
 		}
 		# Do secondary mailgroup members
 		foreach my $mailuser (@mailusers_sorted) {
-#			&print_accounts($mailuser, $mailgroup, $maildomain, '# ' . $fullname{$mailuser} . ' (' . join(' ', @{$groups{$mailuser}}) . ')', "#WARNING: No addresses for $mailuser");
 			&print_accounts($mailuser, $mailgroup, $maildomain, &usercomment($mailuser), "#WARNING: No addresses for $mailuser");
 		}
 	}