Move some definitions, and small fixes

Follow coding standard

configure.ac

@@ -5,6 +5,7 @@ AC_INIT([xrdp], [0.9.7], [xrdp-devel@googlegroups.com])
 AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
 AM_INIT_AUTOMAKE([1.7.2 foreign])
 AC_CONFIG_MACRO_DIR([m4])
+AC_GNU_SOURCE
 AC_PROG_CC
 AC_C_CONST
 AC_PROG_LIBTOOL
@@ -321,6 +322,8 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h], [],
   [AC_MSG_ERROR([please install libxrandr-dev or libXrandr-devel])],
   [#include <X11/Xlib.h>])
 
+AC_CHECK_HEADERS(utmp.h utmpx.h)
+
 CFLAGS="$save_CFLAGS"
 
 AC_SUBST([moduledir], '${libdir}/xrdp')

instfiles/pam.d/xrdp-sesman.debian

@@ -1,5 +1,8 @@
 #%PAM-1.0
 @include common-auth
 @include common-account
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
 @include common-session
 @include common-password

instfiles/pam.d/xrdp-sesman.redhat

@@ -1,5 +1,8 @@
 #%PAM-1.0
 auth        include     password-auth
 account     include     password-auth
+
+# Set the loginuid process attribute.
+session     required    pam_loginuid.so
 session     include     password-auth
 password    include     password-auth

instfiles/pam.d/xrdp-sesman.suse

@@ -1,5 +1,8 @@
 #%PAM-1.0
 auth        include     common-auth
 account     include     common-account
+
+# Set the loginuid process attribute.
+session    required     pam_loginuid.so
 session     include     common-session
 password    include     common-password

sesman/Makefile.am

@@ -61,6 +61,8 @@ xrdp_sesman_SOURCES = \
   sesman.h \
   session.c \
   session.h \
+  sessionrecord.c \
+  sessionrecord.h \
   sig.c \
   sig.h \
   xauth.c \

sesman/session.c

@@ -40,6 +40,7 @@
 #include "sesman.h"
 #include "libscp_types.h"
 #include "xauth.h"
+#include "sessionrecord.h"
 #include "xrdp_sockets.h"
 
 #ifndef PR_SET_NO_NEW_PRIVS
@@ -520,6 +521,7 @@ session_start_fork(tbus data, tui8 type, struct SCP_CONNECTION *c,
              */
         }
 #endif
+        utmp_login(g_getpid(), display, s->username, s->client_ip);
         window_manager_pid = g_fork(); /* parent becomes X,
                              child forks wm, and waits, todo */
         if (window_manager_pid == -1)
@@ -942,8 +944,8 @@ session_kill(int pid)
         {
             /* deleting the session */
             log_message(LOG_LEVEL_INFO, "++ terminated session:  username %s, display :%d.0, session_pid %d, ip %s", tmp->item->name, tmp->item->display, tmp->item->pid, tmp->item->client_ip);
+            utmp_logout(tmp->item->pid, tmp->item->display, tmp->item->name, tmp->item->client_ip);
             g_free(tmp->item);
-
             if (prev == 0)
             {
                 /* prev does no exist, so it's the first element - so we set

sesman/sessionrecord.c

@@ -0,0 +1,165 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Emmanuel Blindauer 2017
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * @file sessionrecord.c
+ * @brief utmp/wtmp handling code
+ * Idea: Only implement actual utmp, i.e. utmpx for 99%.
+ *       See http://80386.nl/unix/utmpx/
+ */
+
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
+#include <paths.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+#include "log.h"
+#include "os_calls.h"
+#include "sessionrecord.h"
+
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+typedef struct utmpx _utmp;
+#else
+#include <utmpx.h>
+typedef struct utmp _utmp;
+#endif
+
+
+#define XRDP_LINE_FORMAT "xrdp:%d"
+
+/*
+ * update the wtmp file on UTMPX platforms (~ Linux)
+ * but no on FreeBSD : FreeBSD uses utx to do the job
+ */
+#ifdef HAVE_UTMPX_H
+#if !defined(__FreeBSD__)
+static inline void
+_updwtmp(const _utmp *ut)
+{
+    updwtmpx(_PATH_WTMP, ut);
+}
+#else
+static inline void
+_updwtmp(const _utmp ut)
+{
+}
+#endif
+#elif defined(HAVE_UTMP_H)
+/* Does such system still exist ? */
+_updwtmp(const _utmp *ut)
+{
+    log_message(LOG_LEVEL_DEBUG,
+            "Unsupported system: HAVE_UTMP_H defined without HAVE_UTMPX_H");
+    updwtmp("/var/log/wtmp", ut);
+}
+#endif
+
+
+/*
+ * Prepare the utmp struct and write it.
+ * this can handle login and logout at once with the 'state' parameter
+ */
+
+void
+add_xtmp_entry(int pid, const char *display_id, const char *user, const char *rhostname, const short state)
+{
+    _utmp ut;
+    struct timeval tv;
+    char *hostname = 0;
+
+    /* The string rhostname containt too much data, only get the ip
+     * the format is
+     * "2001:123:12:1234:1234:1234:1234:1234:53194 - socket: 12"
+     * "::ffff:99.99.9.999:51165 - socket: 12"
+     * "99.99.9.999:51165 - socket: 12"
+     *
+     * So the IP is the string up the two last colons
+     */
+    int i = g_strlen(rhostname) - 1;
+    while ((i > 0) && (rhostname[i] != ':'))
+    {
+        i--;
+    }
+    i--;
+    while ((i > 0) && (rhostname[i] != ':'))
+    {
+        i--;
+    }
+
+    hostname = g_strndup(rhostname, i);
+
+    g_memset(&ut, 0, sizeof(ut));
+
+    ut.ut_type = state;
+    ut.ut_pid = pid;
+    gettimeofday(&tv, NULL);
+    ut.ut_tv.tv_sec = tv.tv_sec;
+    ut.ut_tv.tv_usec = tv.tv_usec;
+    g_strncpy(ut.ut_line, display_id , sizeof(ut.ut_line));
+    g_strncpy(ut.ut_user, user , sizeof(ut.ut_user));
+    g_strncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
+
+    /* update the utmp file */
+    /* open utmp */
+    setutxent();
+    /* add the computed entry */
+    pututxline(&ut);
+    /* closes utmp */
+    endutxent();
+
+    /* update the wtmp file if needed */
+
+    _updwtmp(&ut);
+
+    g_free(hostname);
+}
+
+void
+utmp_login(int pid, int display, const char *user, const char *rhostname)
+{
+    char str_display[16];
+
+    log_message(LOG_LEVEL_DEBUG,
+                "adding login info for utmp/wtmp: %d - %d - %s - %s",
+                pid, display, user, rhostname);
+    g_snprintf(str_display, 15, XRDP_LINE_FORMAT, display);
+
+    add_xtmp_entry(pid, str_display, user, rhostname, USER_PROCESS);
+}
+
+void
+utmp_logout(int pid, int display, const char *user, const char *rhostname)
+{
+    char str_display[16];
+
+    log_message(LOG_LEVEL_DEBUG,
+                "adding logout info for utmp/wtmp: %d - %d - %s - %s",
+                pid, display, user, rhostname);
+    g_snprintf(str_display, 15, XRDP_LINE_FORMAT, display);
+
+    add_xtmp_entry(pid, str_display, user, rhostname, DEAD_PROCESS);
+}

sesman/sessionrecord.h

@@ -0,0 +1,39 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Emmanuel Blindauer 2017
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * @file sessionrecord.h
+ * @brief utmp/wtmp handling code
+ *
+ */
+
+#ifndef SESSIONRECORD_H
+#define SESSIONRECORD_H
+
+
+/**
+ * @brief functions for adding utmp entries. one at login, one for logout
+ *
+ * @param pid of the session, display, login, and hostname
+ */
+void utmp_login(int pid, int display, const char *user, const char *rhostname);
+
+void utmp_logout(int pid, int display, const char *user, const char *rhostname);
+
+#endif