Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (10 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

  • branches/fc17-dev/host/debian/scripts-syslog-ng-config/d_zroot.pl

    r1969 r2195  
    1717@USERS{@USERS} = undef;
    1818
    19 sub zwrite($;$$@) {
    20     my ($message, $class, $instance, @recipients) = @_;
     19sub zwrite($;$$\@) {
     20    my ($message, $class, $instance, $recipref) = @_;
     21    my @recipients = ();
     22    if (defined($recipref)) {
     23        if (@$recipref) {
     24            @recipients = @$recipref;
     25        } else {
     26            $message = '@b(Empty recipient list specified, message redacted)';
     27            $class = $ZCLASS;
     28        }
     29    }
    2130    $class ||= $ZCLASS;
    2231    $instance ||= 'root.'.hostname;
     
    2433    print ZWRITE $message;
    2534    close(ZWRITE);
     35}
     36
     37unless (@RECIPIENTS) {
     38    # Also give a warning at startup
     39    zwrite('@b(No .k5login found, sensitive logs will not be zephyred)', $ZCLASS);
    2640}
    2741
     
    120134        } elsif ($message =~ m|^ *root : TTY=|) {
    121135        } elsif ($message =~ m|^Set /proc/self/oom_adj to |) {
     136        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
    122137        } else {
    123138            sendmsg($message, "scripts-spew");
     
    126141
    127142    foreach my $class (keys %toclass) {
    128         if ($class eq "scripts-auto") {
     143        if ($class eq $ZCLASS) {
    129144            zwrite($toclass{$class}, $class);
    130145        } else {
  • branches/fc17-dev/host/debian/scripts-syslog-ng-config/debian/changelog

    r1970 r2195  
     1scripts-syslog-ng-config (0.4) stable; urgency=low
     2
     3  * Synchronize filtered logs with Fedora copy (r2095).
     4  * Avoid accidentally sending sensitive logs to a public class (r2096).
     5
     6 -- Geoffrey Thomas <geofft@mit.edu>  Sat, 17 Dec 2011 03:06:59 -0500
     7
     8scripts-syslog-ng-config (0.3) stable; urgency=low
     9
     10  * Depend on debathena-zephyr-config
     11
     12 -- Alexander Chernyakhovsky <achernya@mit.edu>  Sat, 12 Nov 2011 23:27:51 -0500
     13 
    114scripts-syslog-ng-config (0.2) stable; urgency=low
    215
  • branches/fc17-dev/host/debian/scripts-syslog-ng-config/debian/control

    r1969 r2195  
    1010Architecture: all
    1111Depends: ${misc:Depends},
    12  syslog-ng,
     12 syslog-ng, debathena-zephyr-config
    1313Description: Configures syslog-ng for zephyr logging
    1414 Configures a machine to log messages sent to syslog-ng to zephyr.
Note: See TracChangeset for help on using the changeset viewer.