Bumped to version 1.0.0

Configuration for multiseat
Bug fixes and improvements

Change-Id: I3ebc2f5e6da8bedab33a51a3ea1e1831f6783651
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/configure b/configure
index 5b265b3..ccae522 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tlm 0.0.7.
+# Generated by GNU Autoconf 2.69 for tlm 1.0.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tlm'
 PACKAGE_TARNAME='tlm'
-PACKAGE_VERSION='0.0.7'
-PACKAGE_STRING='tlm 0.0.7'
+PACKAGE_VERSION='1.0.0'
+PACKAGE_STRING='tlm 1.0.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tlm 0.0.7 to adapt to many kinds of systems.
+\`configure' configures tlm 1.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tlm 0.0.7:";;
+     short | recursive ) echo "Configuration of tlm 1.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1599,7 +1599,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tlm configure 0.0.7
+tlm configure 1.0.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1964,7 +1964,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tlm $as_me 0.0.7, which was
+It was created by tlm $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2832,7 +2832,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tlm'
- VERSION='0.0.7'
+ VERSION='1.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14250,7 +14250,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tlm $as_me 0.0.7, which was
+This file was extended by tlm $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14316,7 +14316,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tlm config.status 0.0.7
+tlm config.status 1.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 2c92f18..dbf3e86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([tlm], [0.0.7], [])
+AC_INIT([tlm], [1.0.0], [])
 AC_CONFIG_SRCDIR([src/daemon/tlm-main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/data/multi-seat/etc/session.d/app-session b/data/multi-seat/etc/session.d/app-session
deleted file mode 100755 (executable)
index 0187a36..0000000
--- a/data/multi-seat/etc/session.d/app-session
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-export WAYLAND_CLIENT_DIR=/tmp
-weston --backend=wayland-backend.so --log=/tmp/app-weston.log #--width=1920 --height=1080

diff --git a/data/multi-seat/etc/session.d/tizen-session b/data/multi-seat/etc/session.d/genivi-session
similarity index 72%
rename from data/multi-seat/etc/session.d/tizen-session
rename to data/multi-seat/etc/session.d/genivi-session
index 633836d..935cc2d 100755 (executable)
--- a/data/multi-seat/etc/session.d/tizen-session
+++ b/data/multi-seat/etc/session.d/genivi-session
@@ -7,4 +7,4 @@ export WAYLAND_SERVER_DIR=/tmp
 #export WAYLAND_SERVER_DIR=/run/memory/display
 export WAYLAND_SERVER_GROUP=weston-launch
 export WAYLAND_SERVER_MODE=0660
-/usr/bin/weston-launch -- -i0 --current-mode --log=/tmp/tizen-weston.log --shell=desktop-shell.so
+/usr/bin/weston-launch -- -i0 --current-mode --log=/tmp/genivi-weston.log --shell=desktop-shell.so

diff --git a/data/multi-seat/etc/session.d/user-session b/data/multi-seat/etc/session.d/user-session
new file mode 100755 (executable)
index 0000000..0a0ba41
--- /dev/null
+++ b/data/multi-seat/etc/session.d/user-session
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+export WAYLAND_CLIENT_DIR=/tmp
+#export XDG_SEAT=seat0
+weston --backend=wayland-backend.so --log=/tmp/user-weston.log --width=960 --height=1080
+#weston-terminal

diff --git a/data/multi-seat/etc/tlm.conf b/data/multi-seat/etc/tlm.conf
index e36175d..7408cc3 100644 (file)
--- a/data/multi-seat/etc/tlm.conf
+++ b/data/multi-seat/etc/tlm.conf
@@ -60,10 +60,10 @@ NSEATS=2
 #
 # Seat specific settings where the group name is seat id
 [seat0]
-DEFAULT_USER=tizen
+DEFAULT_USER=genivi
 SETUP_TERMINAL=1
 VTNR=7
-SESSION_CMD=/etc/session.d/tizen-session
+SESSION_CMD=/etc/session.d/genivi-session
 #SESSION_CMD=bash
 #SESSION_CMD=weston
 DEFAULT_PAM_SERVICE=tlm-system-login
@@ -72,11 +72,13 @@ SETUP_RUNTIME_DIR=1
 #
 [seat1]
 DEFAULT_USER=app
-SESSION_CMD=/etc/session.d/app-session
+SESSION_CMD=/etc/session.d/user-session
 #DEFAULT_PAM_SERVICE=tlm-system-login
 #SETUP_RUNTIME_DIR=1
 #ACTIVE=0
 #DEFAULT_USER=guest_%S
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
 #
 #
 # plugin specific settings.

diff --git a/data/tlm.service b/data/tlm.service
index bc1135a..c078621 100644 (file)
--- a/data/tlm.service
+++ b/data/tlm.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Tizen Login Manager
-After=systemd-user-sessions.service systemd-logind.service
+After=systemd-user-sessions.service systemd-logind.service dbus.service
 Requires=multi-user.target
 
 [Service]

diff --git a/dists/debian/changelog b/dists/debian/changelog
index 22223fa..3b4d02f 100644 (file)
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,10 @@
+tlm (1.0.0-0) unstable; urgency=low
+
+  * Configuration for multiseat
+  * Bug fixes and improvements
+
+ -- Imran Zaman <imran.zaman@intel.com>  Tue, 11 Nov 2014 17:55:53 +0200
+
 tlm (0.0.7-0) unstable; urgency=low
 
   * iNotify support

diff --git a/dists/rpm/tizen/packaging/tlm.changes b/dists/rpm/tizen/packaging/tlm.changes
index 2338578..90dbac2 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.changes
+++ b/dists/rpm/tizen/packaging/tlm.changes
@@ -1,3 +1,7 @@
+* Tue Nov 11 2014 Imran Zaman <imran.zaman@intel.com>
+- Configuration for multiseat
+- Bug fixes and improvements
+
 * Fri Oct 31 2014 Imran Zaman <imran.zaman@intel.com>
 - iNotify support
 - Support for fake seats

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index f0f82f6..c97eb99 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -4,7 +4,7 @@
 
 Name: tlm
 Summary: Login manager for Tizen
-Version: 0.0.7
+Version: 1.0.0
 Release: 0
 Group: System/Service
 License: LGPL-2.1+
@@ -76,6 +76,9 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
+install -m 644 data/multi-seat/etc/tlm.conf %{buildroot}%{_sysconfdir}
+install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
+install -m 755 data/multi-seat/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
 
 
 %post
@@ -100,11 +103,12 @@ install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
 %{_bindir}/%{name}-client
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/%{name}/plugins/*.so*
-%config %{_unitdir}/tlm.service
+%{_unitdir}/tlm.service
 %config(noreplace) %{_sysconfdir}/tlm.conf
 %config %{_sysconfdir}/pam.d/tlm-login
 %config %{_sysconfdir}/pam.d/tlm-default-login
 %config %{_sysconfdir}/pam.d/tlm-system-login
+%config(noreplace) %{_sysconfdir}/session.d/*
 
 
 %files devel

diff --git a/dists/rpm/tlm-suse.spec b/dists/rpm/tlm-suse.spec
index f1fc1eb..5b1313f 100644 (file)
--- a/dists/rpm/tlm-suse.spec
+++ b/dists/rpm/tlm-suse.spec
@@ -4,7 +4,7 @@
 
 Name: tlm
 Summary: Login manager for Tizen
-Version: 0.0.7
+Version: 1.0.0
 Release: 0
 Group: System/Daemons
 License: LGPL-2.1+
@@ -99,6 +99,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov 11 2014 Imran Zaman <imran.zaman@intel.com>
+- Configuration for multiseat
+- Bug fixes and improvements
+
 * Fri Oct 31 2014 Imran Zaman <imran.zaman@intel.com>
 - iNotify support
 - Support for fake seats

diff --git a/docs/html/api-index-full.html b/docs/html/api-index-full.html
index 193f3cb..dd1983b 100644 (file)
--- a/docs/html/api-index-full.html
+++ b/docs/html/api-index-full.html
@@ -237,11 +237,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="tlm-Errors.html#TlmError" title="enum TlmError">TlmError</a>, enum in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
+<a class="link" href="tlm-Errors.html#TLM-ERROR:CAPS" title="TLM_ERROR">TLM_ERROR</a>, macro in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="tlm-Errors.html#TLM-ERROR:CAPS" title="TLM_ERROR">TLM_ERROR</a>, macro in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
+<a class="link" href="tlm-Errors.html#TlmError" title="enum TlmError">TlmError</a>, enum in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
 </dt>
 <dd></dd>
 <dt>

diff --git a/packaging/tlm.changes b/packaging/tlm.changes
index 2338578..90dbac2 100644 (file)
--- a/packaging/tlm.changes
+++ b/packaging/tlm.changes
@@ -1,3 +1,7 @@
+* Tue Nov 11 2014 Imran Zaman <imran.zaman@intel.com>
+- Configuration for multiseat
+- Bug fixes and improvements
+
 * Fri Oct 31 2014 Imran Zaman <imran.zaman@intel.com>
 - iNotify support
 - Support for fake seats

diff --git a/packaging/tlm.conf b/packaging/tlm.conf
deleted file mode 100644 (file)
index 9bdb913..0000000
--- a/packaging/tlm.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# TLM configuration for Tizen(IVI).
-#
-
-#
-# This group contains top-level settings.
-#
-[General]
-#
-# Name of the account plugin to use to manage(add/remove) guest user accounts
-ACCOUNTS_PLUGIN=gumd
-#
-# Number of seats
-# Default: obtain from systemd
-#NSEATS=2
-#
-# Auto-login default user
-AUTO_LOGIN=1
-#
-# Prepare default/guest users before auto-login
-# Default: off
-# PREPARE_DEFAULT=0
-#
-# PAM service file to use
-PAM_SERVICE=tlm-login
-#
-# PAM service file for default user
-DEFAULT_PAM_SERVICE=tlm-default-login
-#
-# Default (guest) username or template to use
-#  %S - seat number
-#  %I - seat id string
-# Default: "guest"
-DEFAULT_USER=guest_%S
-#
-# Session command : The command run after successfull login
-SESSION_CMD=/usr/bin/weston-launch
-#
-# Session termination timeout in seconds
-# Default: 10
-#TERMINATE_TIMEOUT=10
-#
-# Setup terminal for session
-# Default: off
-#SETUP_TERMINAL=1
-#
-# Specify session type, needs to be specified for
-# XDG_SESSION_CLASS and XDG_SESSION_TYPE to be set
-SESSION_TYPE=wayland
-#
-#
-# Seat specific settings where the group name is seat id
-[seat0]
-DEFAULT_USER=app
-SETUP_TERMINAL=1
-SETUP_RUNTIME_DIR=1
-VTNR=7
-

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index fb9f4be..c97eb99 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -4,14 +4,13 @@
 
 Name: tlm
 Summary: Login manager for Tizen
-Version: 0.0.7
+Version: 1.0.0
 Release: 0
 Group: System/Service
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
 URL: https://github.com/01org/tlm
 Source1001: %{name}.manifest
-Source1002: %{name}.conf
 Requires(post): /sbin/ldconfig, systemd
 Requires(postun): /sbin/ldconfig, systemd
 Requires: gumd
@@ -56,11 +55,11 @@ Requires:   %{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1001} .
-cp %{SOURCE1002} .
 
 
 %build
 %if %{debug_build} == 1
+./autogen.sh
 %configure --enable-gum --enable-gtk-doc --enable-examples --enable-debug
 %else
 %configure --enable-gum --enable-examples
@@ -77,7 +76,9 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
-install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/
+install -m 644 data/multi-seat/etc/tlm.conf %{buildroot}%{_sysconfdir}
+install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
+install -m 755 data/multi-seat/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
 
 
 %post
@@ -102,11 +103,12 @@ install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/
 %{_bindir}/%{name}-client
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/%{name}/plugins/*.so*
-%config %{_unitdir}/tlm.service
+%{_unitdir}/tlm.service
 %config(noreplace) %{_sysconfdir}/tlm.conf
 %config %{_sysconfdir}/pam.d/tlm-login
 %config %{_sysconfdir}/pam.d/tlm-default-login
 %config %{_sysconfdir}/pam.d/tlm-system-login
+%config(noreplace) %{_sysconfdir}/session.d/*
 
 
 %files devel

diff --git a/src/daemon/dbus/tlm-dbus-server-p2p.c b/src/daemon/dbus/tlm-dbus-server-p2p.c
index 5a4c08a..1534390 100644 (file)
--- a/src/daemon/dbus/tlm-dbus-server-p2p.c
+++ b/src/daemon/dbus/tlm-dbus-server-p2p.c
@@ -353,7 +353,10 @@ _tlm_dbus_server_p2p_start (
             if (chown (path, server->priv->uid, -1) < 0) {
                 WARN("Unable to set ownership");
             }
-            g_chmod (path, S_IRUSR | S_IWUSR);
+            if (g_chmod (path, S_IRUSR | S_IWUSR) < 0) {
+                WARN("Unable to set mode '%d' for '%s'",
+                    S_IRUSR|S_IWUSR, path);
+            }
         }
     }
     DBG("dbus server started at : %s", server->priv->address);

diff --git a/src/daemon/tlm-dbus-observer.c b/src/daemon/tlm-dbus-observer.c
index 073f019..4211266 100644 (file)
--- a/src/daemon/tlm-dbus-observer.c
+++ b/src/daemon/tlm-dbus-observer.c
@@ -474,17 +474,11 @@ _process_request (
     }
 
 _finished:
-    if (err) {
-        if (req) {
-            _complete_request (self, req, err);
-        } else {
-            g_error_free (err);
-        }
+    if (req && err) {
+        _complete_request (self, req, err);
     }
-    if (!self->priv->active_request)
-        _process_next_request_in_idle (self);
 
-    return FALSE;
+    return self->priv->active_request != NULL ? FALSE : TRUE;
 }
 
 static void

diff --git a/src/daemon/tlm-manager.c b/src/daemon/tlm-manager.c
index df236e6..f2b2b6f 100644 (file)
--- a/src/daemon/tlm-manager.c
+++ b/src/daemon/tlm-manager.c
@@ -519,7 +519,7 @@ _seat_watch_cb (gint ifd, GIOCondition condition, gpointer user_data)
             DBG ("seat %s watch for %s succeeded, %u left",
                  closure->seat_id, (gchar *) res->data, closure->nwatch - 1);
             g_free (res->data);
-            closure->watch_list = g_list_remove (closure->watch_list, res);
+            closure->watch_list = g_list_delete_link (closure->watch_list, res);
             inotify_rm_watch (ifd, ievent->wd);
             closure->nwatch--;
         }

diff --git a/src/plugins/default/tlm-auth-plugin-default.c b/src/plugins/default/tlm-auth-plugin-default.c
index a650cca..e9ba0f6 100644 (file)
--- a/src/plugins/default/tlm-auth-plugin-default.c
+++ b/src/plugins/default/tlm-auth-plugin-default.c
@@ -169,7 +169,7 @@ tlm_auth_plugin_default_class_init (TlmAuthPluginDefaultClass *kls)
 static void
 tlm_auth_plugin_default_init (TlmAuthPluginDefault *self)
 {
-    struct sigaction sa;
+    struct sigaction sa = { 0 };
 
     g_weak_ref_init (&__self, self);
 

diff --git a/src/sessiond/tlm-session.c b/src/sessiond/tlm-session.c
index abc10dd..539e65e 100644 (file)
--- a/src/sessiond/tlm-session.c
+++ b/src/sessiond/tlm-session.c
@@ -436,8 +436,7 @@ _set_environment (TlmSessionPrivate *priv)
     if (home_dir) _setenv_to_session ("HOME", home_dir, priv);
     shell = tlm_user_get_shell (priv->username);
     if (shell) _setenv_to_session ("SHELL", shell, priv);
-    // TODO: figure out if this should be set or not for logical seats (NSEATS)
-    if (priv->seat_id) _setenv_to_session ("XDG_SEAT", priv->seat_id, priv);
+    //if (priv->seat_id) _setenv_to_session ("XDG_SEAT", priv->seat_id, priv);
 
     const gchar *xdg_data_dirs =
         tlm_config_get_string (priv->config,
@@ -563,8 +562,12 @@ _exec_user_session (
 
     //close all open descriptors other than stdin, stdout, stderr
     open_max = sysconf (_SC_OPEN_MAX);
-    for (fd = 3; fd < open_max; fd++)
-        fcntl (fd, F_SETFD, FD_CLOEXEC);
+    for (fd = 3; fd < open_max; fd++) {
+        if (fcntl (fd, F_SETFD, FD_CLOEXEC) < -1) {
+            WARN("Failed to close desriptor '%d', error: %s",
+                fd, strerror(errno));
+        }
+    }
 
     uid_t target_uid = tlm_user_get_uid (priv->username);
     gid_t target_gid = tlm_user_get_gid (priv->username);
@@ -746,7 +749,7 @@ tlm_session_start (TlmSession *session,
         session_type = tlm_config_get_string (priv->config,
                                               TLM_CONFIG_GENERAL,
                                               TLM_CONFIG_GENERAL_SESSION_TYPE);
-    if (tlm_config_has_key (priv->config,
+    if (!tlm_config_has_key (priv->config,
                             TLM_CONFIG_GENERAL,
                             TLM_CONFIG_GENERAL_NSEATS))
         tlm_auth_session_putenv (priv->auth_session,