m + add log-login-lastlog

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 74 insertions, 1 deletions

diff --git a/src/common.h b/src/common.h
index 0acee7f..086dd7f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -23,6 +23,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 
 
@@ -34,6 +39,9 @@
 #endif
 
 
+/* ttyname is defined in <unistd.h> */
+#define ttyname tty
+
 
 #define LIST_ARGUMENTS  X(action) X(username) X(ttyname) X(pid) X(hostname)
 #define streq(a, b)     ((a == b) || (a && b && !strcmp(a, b)))
@@ -88,5 +96,19 @@ static inline const char* get_hostaddress(const char* hostname)
 }
 
 
+static inline int write_all(int fd, char* data, size_t n)
+{
+  ssize_t wrote;
+  
+  while (n > 0)
+    if (wrote = write(fd, data, n), wrote >= 0)
+      data += wrote, n -= (size_t)wrote;
+    else if (errno != EINTR)
+      return -1;
+  
+  return 0;
+}
+
+
 int do_log(void);
 
diff --git a/src/log-login-lastlog.c b/src/log-login-lastlog.c
new file mode 100644
index 0000000..fd0b617
--- /dev/null
+++ b/src/log-login-lastlog.c
@@ -0,0 +1,51 @@
+/**
+ * cerberus-logging – Log-in logging extension for cerberus
+ * 
+ * Copyright © 2014  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "common.h"
+#include <lastlog.h>
+#include <pwd.h>
+
+
+int do_log(void)
+{
+  struct passwd* pwd;
+  struct lastlog ll;
+  time_t t;
+  int fd;
+  
+  if (!streq(action, "login"))
+    return 0;
+  
+  if (pwd = getpwnam(username), pwd == NULL)                         return -1;
+  if (fd = open(_PATH_LASTLOG, O_RDWR, 0), fd < 0)                   return -1;
+  if (lseek(fd, (off_t)(pwd->pw_uid * sizeof(ll)), SEEK_SET) == -1)  goto fail;
+  
+  memset(&ll, 0, sizeof(ll));
+  
+  time(&t), ll.ll_time = t;
+  xstrcpy(ll.ll_line, ttyname);
+  xstrcpy(ll.ll_host, hostname);
+  
+  if (write_all(fd, (char*)&ll, sizeof(ll)))
+    goto fail;
+  
+  return close(fd), 0;
+ fail:
+  return close(fd), -1;
+}
+
diff --git a/src/log-login-utmp.c b/src/log-login-utmp.c
index 081c63e..1325bed 100644
--- a/src/log-login-utmp.c
+++ b/src/log-login-utmp.c
@@ -29,7 +29,7 @@ int do_log(void)
   
   if (!streq(action, "login"))
     return 0;
-
+  
   pid_ = (pid_t)atoll(pid);
   ttyno = first_digit(ttyname);
   memset(&ut, 0, sizeof(struct utmp));