From ebf4c1e73da73481bbd1558e851ccc1ef30fa379 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 14 Oct 2012 22:10:54 +0200
Subject: [PATCH] =?UTF-8?q?Log=20de=20l'utilisateur=20authentifi=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/usr/share/qpsmtpd/plugins/logging/log2sql | 16 ++++++++++++++++
 smtp_log.sql                                   |  1 +
 2 files changed, 17 insertions(+)

diff --git a/root/usr/share/qpsmtpd/plugins/logging/log2sql b/root/usr/share/qpsmtpd/plugins/logging/log2sql
index 4706f5f..dc85ca3 100644
--- a/root/usr/share/qpsmtpd/plugins/logging/log2sql
+++ b/root/usr/share/qpsmtpd/plugins/logging/log2sql
@@ -25,6 +25,8 @@ sub register {
     my (%args) = @_;
 
     $self->register_hook("connect", "connect_handler");
+    $self->register_hook("auth-plain", "auth_handler");
+    $self->register_hook("auth-login", "auth_handler");
     $self->register_hook("mail", "mail_handler");
     $self->register_hook("rcpt", "rcpt_handler");
     $self->register_hook("data_post", "data_post_handler");
@@ -92,6 +94,20 @@ sub connect_handler {
     return(DECLINED);
 }
 
+sub auth_handler {
+    my ($self, $transaction, $method, $user) = @_;
+
+    my ($statement) = "UPDATE ".$mail_table." SET auth_user=".
+                      $dbh->quote($user).
+                      " WHERE mail_id=".$mail_id;
+    
+    $self->log(LOGDEBUG,"auth_handler statement:".$statement);
+    
+    $dbh->do($statement)
+              || $self->log(LOGERROR,$dbh->errstr());
+    
+    return(DECLINED);
+}
 
 sub mail_handler {
     my ($self, $transaction, $sender) = @_;
diff --git a/smtp_log.sql b/smtp_log.sql
index 47dad49..8f00e7c 100644
--- a/smtp_log.sql
+++ b/smtp_log.sql
@@ -5,6 +5,7 @@ CREATE TABLE `messages` (
     `remote_ip` varchar(255) default NULL,
     `remote_host` varchar(255) default NULL,
     `remote_info` varchar(255) default NULL,
+    `auth_user` varchar(30) default NULL,
     `sender` varchar(255) default NULL,
     `subject` varchar(255) default NULL,
     `header_size` int(11) default NULL,