Changeset 2195 for branches/fc17-dev/host/debian

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• host/debian/scripts-syslog-ng-config/d_zroot.pl (modified) (4 diffs)
• host/debian/scripts-syslog-ng-config/debian/changelog (modified) (1 diff)
• host/debian/scripts-syslog-ng-config/debian/control (modified) (1 diff)
• host/debian/scripts-syslog-ng-config/debian/docs (deleted)

branches/fc17-dev/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);
 }
 
@@ -120 +134 @@
         } elsif ($message =~ m|^ *root : TTY=|) {
         } elsif ($message =~ m|^Set /proc/self/oom_adj to |) {
+        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
         } else {
             sendmsg($message, "scripts-spew");
@@ -126 +141 @@
 
     foreach my $class (keys %toclass) {
-        if ($class eq "scripts-auto") {
+        if ($class eq $ZCLASS) {
             zwrite($toclass{$class}, $class);
         } else {

branches/fc17-dev/host/debian/scripts-syslog-ng-config/debian/changelog

@@ +1 @@
+scripts-syslog-ng-config (0.4) stable; urgency=low
+
+  * Synchronize filtered logs with Fedora copy (r2095).
+  * Avoid accidentally sending sensitive logs to a public class (r2096).
+
+ -- Geoffrey Thomas <geofft@mit.edu>  Sat, 17 Dec 2011 03:06:59 -0500
+
+scripts-syslog-ng-config (0.3) stable; urgency=low
+
+  * Depend on debathena-zephyr-config
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Sat, 12 Nov 2011 23:27:51 -0500
+  
 scripts-syslog-ng-config (0.2) stable; urgency=low
 

branches/fc17-dev/host/debian/scripts-syslog-ng-config/debian/control

@@ -10 +10 @@
 Architecture: all
 Depends: ${misc:Depends},
- syslog-ng,
+ syslog-ng, debathena-zephyr-config
 Description: Configures syslog-ng for zephyr logging
  Configures a machine to log messages sent to syslog-ng to zephyr.