projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d6e81f
)
make svc_acct_sm skip blank lines in sendmail import
author
ivan
<ivan>
Thu, 29 Jun 2000 10:48:25 +0000
(10:48 +0000)
committer
ivan
<ivan>
Thu, 29 Jun 2000 10:48:25 +0000
(10:48 +0000)
bin/svc_acct_sm.import
patch
|
blob
|
history
diff --git
a/bin/svc_acct_sm.import
b/bin/svc_acct_sm.import
index
50b0f67
..
8777abe
100755
(executable)
--- a/
bin/svc_acct_sm.import
+++ b/
bin/svc_acct_sm.import
@@
-1,6
+1,6
@@
#!/usr/bin/perl -Tw
#
#!/usr/bin/perl -Tw
#
-# $Id: svc_acct_sm.import,v 1.
5 2000-02-03 05:16:52
ivan Exp $
+# $Id: svc_acct_sm.import,v 1.
6 2000-06-29 10:48:25
ivan Exp $
#
# ivan@sisd.com 98-mar-9
#
#
# ivan@sisd.com 98-mar-9
#
@@
-16,7
+16,10
@@
# ivan@sisd.com 98-jul-13
#
# $Log: svc_acct_sm.import,v $
# ivan@sisd.com 98-jul-13
#
# $Log: svc_acct_sm.import,v $
-# Revision 1.5 2000-02-03 05:16:52 ivan
+# Revision 1.6 2000-06-29 10:48:25 ivan
+# make svc_acct_sm skip blank lines in sendmail import
+#
+# Revision 1.5 2000/02/03 05:16:52 ivan
# beginning of DNS and Apache support
#
# Revision 1.4 1999/03/25 08:42:20 ivan
# beginning of DNS and Apache support
#
# Revision 1.4 1999/03/25 08:42:20 ivan
@@
-151,6
+154,7
@@
my(%svcnum);
while (<RCPTHOSTS>) {
next if /^(#|$)/;
while (<RCPTHOSTS>) {
next if /^(#|$)/;
+ next if $mta{$mta} eq 'sendmail' && /^\s*$/; #blank lines
/^\.?([\w\-\.]+)$/
#or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
or die "Strange rcpthosts/sendmail.cw line: $_";
/^\.?([\w\-\.]+)$/
#or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
or die "Strange rcpthosts/sendmail.cw line: $_";
@@
-243,6
+247,7
@@
END
or die "Can't open $spooldir/virtusertable.import: $!";
while (<VIRTUSERTABLE>) {
next if /^#/; #comments?
or die "Can't open $spooldir/virtusertable.import: $!";
while (<VIRTUSERTABLE>) {
next if /^#/; #comments?
+ next if /^\s*$/; #blank lines
/^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/
#or do { warn "Strange virtusertable line: $_"; next; };
or die "Strange virtusertable line: $_";
/^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/
#or do { warn "Strange virtusertable line: $_"; next; };
or die "Strange virtusertable line: $_";