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

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

  • branches/fc17-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl

    r2066 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
     
    108122        } elsif ($message =~ m|^error: PAM: Authentication failure|) {
    109123        } elsif ($message =~ m|^pam_unix\(sshd:auth\): authentication failure|) {
     124        } elsif ($message =~ m|^pam_unix\(sshd:auth\): check pass; user unknown|) {
    110125        } elsif ($message =~ m|^Postponed keyboard-interactive for invalid user |) {
    111126        } elsif ($message =~ m|^Failed keyboard-interactive/pam for invalid user |) {
     
    119134        } elsif ($message =~ m|^ *root : TTY=|) {
    120135        } elsif ($message =~ m|^Set /proc/self/oom_adj to |) {
     136        } elsif ($message =~ m|^Set /proc/self/oom_score_adj to |) {
    121137        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
    122138        } else {
     
    126142
    127143    foreach my $class (keys %toclass) {
    128         if ($class eq "scripts-auto") {
     144        if ($class eq $ZCLASS) {
    129145            zwrite($toclass{$class}, $class);
    130146        } else {
Note: See TracChangeset for help on using the changeset viewer.