Changeset 1911 for branches/fc15-dev/server/fedora

Timestamp:

Jun 17, 2011, 8:40:06 PM (13 years ago)

Author:

achernya

Message:

Make d_zroot work properly

d_zroot.pl was copied to a-h, and it was noticed that it failed quite
horribly. Fixed by Quentin, these changes are also relevant to the
Fedora VMs.

File:

• branches/fc15-dev/server/fedora/config/etc/syslog-ng/d_zroot.pl (modified) (3 diffs)

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

@@ -32 +32 @@
 sub buildKeyMap($) {
     my ($file) = @_;
-    open (KEYS, $file) or warn "Couldn't open $file: $!";
+    open (KEYS, $file) or (warn "Couldn't open $file: $!\n" and return);
     while (<KEYS>) {
         chomp;
@@ -58 +58 @@
 buildKeyMap("/root/.ssh/authorized_keys2");
 
-while (1) {
-    my @message = scalar(<>);
+my @message;
+
+while (my $line = <>) {
+    @message = $line;
     eval {
         local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
@@ -80 +82 @@
         } elsif ($message =~ m|Root (\S+) shell|) {
             sendmsg($message);
-        } elsif ($message =~ m|session \S+ for user (\S+)|) {
-            sendmsg($message) if exists $USERS{$1};
+        } elsif ($message =~ m|pam_unix\(([^:]+):session\): session \S+ for user (\S+)|) {
+            sendmsg($message) if $1 ne "cron" and exists $USERS{$2};
         } elsif ($message =~ m|^Found matching (\w+) key: (\S+)|) {
             if ($sshkeys{$2}) {