Changeset 2096 for trunk/host/debian/scripts-syslog-ng-config

Timestamp:

Dec 17, 2011, 3:05:13 AM (13 years ago)

Author:

geofft

Message:

d_zroot: Merge r2093 and r2094 into Debian copy

File:

• trunk/host/debian/scripts-syslog-ng-config/d_zroot.pl (modified) (3 diffs)

trunk/host/debian/scripts-syslog-ng-config/d_zroot.pl

@@ -17 +17 @@
 @USERS{@USERS} = undef;
 
-sub zwrite($;$$@) {
-    my ($message, $class, $instance, @recipients) = @_;
+sub zwrite($;$$\@) {
+    my ($message, $class, $instance, $recipref) = @_;
+    my @recipients = ();
+    if (defined($recipref)) {
+        if (@$recipref) {
+            @recipients = @$recipref;
+        } else {
+            $message = '@b(Empty recipient list specified, message redacted)';
+            $class = $ZCLASS;
+        }
+    }
     $class ||= $ZCLASS;
     $instance ||= 'root.'.hostname;
@@ -24 +33 @@
     print ZWRITE $message;
     close(ZWRITE);
+}
+
+unless (@RECIPIENTS) {
+    # Also give a warning at startup
+    zwrite('@b(No .k5login found, sensitive logs will not be zephyred)', $ZCLASS);
 }
 
@@ -127 +141 @@
 
     foreach my $class (keys %toclass) {
-        if ($class eq "scripts-auto") {
+        if ($class eq $ZCLASS) {
             zwrite($toclass{$class}, $class);
         } else {