logind: enforce a limit on inhibitors we hand out

[elogind.git] / src / login / logind-seat.c

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 126c5b84cc5b4f4ade8dddfb53174c635ddb6754..33fd3afacae4ff38af25d10fc71fa4205dc4cbdc 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-

 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.
 


@@ -19,21 +17,25 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <errno.h>

-#include <unistd.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <sys/ioctl.h>
-#include <linux/vt.h>

 #include <string.h>
 #include <string.h>

+#include <unistd.h>

 
 

-#include "sd-id128.h"

 #include "sd-messages.h"
 #include "sd-messages.h"

-#include "logind-seat.h"
+
+#include "alloc-util.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "formats-util.h"

 #include "logind-acl.h"
 #include "logind-acl.h"

-#include "util.h"
+#include "logind-seat.h"

 #include "mkdir.h"
 #include "mkdir.h"

-#include "path-util.h"
+#include "parse-util.h"
+#include "stdio-util.h"
+#include "string-util.h"
+#include "terminal-util.h"
+#include "util.h"

 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;


@@ -96,11 +98,11 @@ int seat_save(Seat *s) {
 
         r = mkdir_safe_label("/run/systemd/seats", 0755, 0, 0);
         if (r < 0)
 
         r = mkdir_safe_label("/run/systemd/seats", 0755, 0, 0);
         if (r < 0)

-                goto finish;
+                goto fail;

 
         r = fopen_temporary(s->state_file, &f, &temp_path);
         if (r < 0)
 
         r = fopen_temporary(s->state_file, &f, &temp_path);
         if (r < 0)

-                goto finish;
+                goto fail;

 
         fchmod(fileno(f), 0644);
 
 
         fchmod(fileno(f), 0644);
 


@@ -144,19 +146,24 @@ int seat_save(Seat *s) {
                                 i->sessions_by_seat_next ? ' ' : '\n');
         }
 
                                 i->sessions_by_seat_next ? ' ' : '\n');
         }
 

-        fflush(f);
+        r = fflush_and_check(f);
+        if (r < 0)
+                goto fail;

 
 

-        if (ferror(f) || rename(temp_path, s->state_file) < 0) {
+        if (rename(temp_path, s->state_file) < 0) {

                 r = -errno;
                 r = -errno;

-                unlink(s->state_file);
-                unlink(temp_path);
+                goto fail;

         }
 
         }
 

-finish:
-        if (r < 0)
-                log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
+        return 0;

 
 

-        return r;
+fail:
+        (void) unlink(s->state_file);
+
+        if (temp_path)
+                (void) unlink(temp_path);
+
+        return log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);

 }
 
 int seat_load(Seat *s) {
 }
 
 int seat_load(Seat *s) {


@@ -167,13 +174,14 @@ int seat_load(Seat *s) {
         return 0;
 }
 
         return 0;
 }
 

+#if 0 /// UNNEEDED by elogind

 static int vt_allocate(unsigned int vtnr) {
         char p[sizeof("/dev/tty") + DECIMAL_STR_MAX(unsigned int)];
         _cleanup_close_ int fd = -1;
 
         assert(vtnr >= 1);
 
 static int vt_allocate(unsigned int vtnr) {
         char p[sizeof("/dev/tty") + DECIMAL_STR_MAX(unsigned int)];
         _cleanup_close_ int fd = -1;
 
         assert(vtnr >= 1);
 

-        snprintf(p, sizeof(p), "/dev/tty%u", vtnr);
+        xsprintf(p, "/dev/tty%u", vtnr);

         fd = open_terminal(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;
         fd = open_terminal(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;


@@ -208,6 +216,7 @@ int seat_preallocate_vts(Seat *s) {
 
         return r;
 }
 
         return r;
 }

+#endif // 0

 
 int seat_apply_acls(Seat *s, Session *old_active) {
         int r;
 
 int seat_apply_acls(Seat *s, Session *old_active) {
         int r;


@@ -272,7 +281,7 @@ int seat_set_active(Seat *s, Session *session) {
 int seat_switch_to(Seat *s, unsigned int num) {
         /* Public session positions skip 0 (there is only F1-F12). Maybe it
          * will get reassigned in the future, so return error for now. */
 int seat_switch_to(Seat *s, unsigned int num) {
         /* Public session positions skip 0 (there is only F1-F12). Maybe it
          * will get reassigned in the future, so return error for now. */

-        if (!num)
+        if (num == 0)

                 return -EINVAL;
 
         if (num >= s->position_count || !s->positions[num]) {
                 return -EINVAL;
 
         if (num >= s->position_count || !s->positions[num]) {


@@ -289,12 +298,12 @@ int seat_switch_to(Seat *s, unsigned int num) {
 int seat_switch_to_next(Seat *s) {
         unsigned int start, i;
 
 int seat_switch_to_next(Seat *s) {
         unsigned int start, i;
 

-        if (!s->position_count)
+        if (s->position_count == 0)

                 return -EINVAL;
 
         start = 1;
                 return -EINVAL;
 
         start = 1;

-        if (s->active && s->active->pos > 0)
-                start = s->active->pos;
+        if (s->active && s->active->position > 0)
+                start = s->active->position;

 
         for (i = start + 1; i < s->position_count; ++i)
                 if (s->positions[i])
 
         for (i = start + 1; i < s->position_count; ++i)
                 if (s->positions[i])


@@ -310,12 +319,12 @@ int seat_switch_to_next(Seat *s) {
 int seat_switch_to_previous(Seat *s) {
         unsigned int start, i;
 
 int seat_switch_to_previous(Seat *s) {
         unsigned int start, i;
 

-        if (!s->position_count)
+        if (s->position_count == 0)

                 return -EINVAL;
 
         start = 1;
                 return -EINVAL;
 
         start = 1;

-        if (s->active && s->active->pos > 0)
-                start = s->active->pos;
+        if (s->active && s->active->position > 0)
+                start = s->active->position;

 
         for (i = start - 1; i > 0; --i)
                 if (s->positions[i])
 
         for (i = start - 1; i > 0; --i)
                 if (s->positions[i])


@@ -359,7 +368,10 @@ int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
         }
 
         r = seat_set_active(s, new_active);
         }
 
         r = seat_set_active(s, new_active);

+
+#if 0 /// elogind does not spawn autovt

         manager_spawn_autovt(s->manager, vtnr);
         manager_spawn_autovt(s->manager, vtnr);

+#endif // 0

 
         return r;
 }
 
         return r;
 }


@@ -418,7 +430,9 @@ int seat_start(Seat *s) {
                    NULL);
 
         /* Initialize VT magic stuff */
                    NULL);
 
         /* Initialize VT magic stuff */

+#if 0 /// elogind does not support autospawning vts

         seat_preallocate_vts(s);
         seat_preallocate_vts(s);

+#endif // 0

 
         /* Read current VT */
         seat_read_active_vt(s);
 
         /* Read current VT */
         seat_read_active_vt(s);


@@ -475,21 +489,21 @@ int seat_stop_sessions(Seat *s, bool force) {
 
 void seat_evict_position(Seat *s, Session *session) {
         Session *iter;
 
 void seat_evict_position(Seat *s, Session *session) {
         Session *iter;

-        unsigned int pos = session->pos;
+        unsigned int pos = session->position;

 
 

-        session->pos = 0;
+        session->position = 0;

 
 

-        if (!pos)
+        if (pos == 0)

                 return;
 
         if (pos < s->position_count && s->positions[pos] == session) {
                 s->positions[pos] = NULL;
 
                 /* There might be another session claiming the same
                 return;
 
         if (pos < s->position_count && s->positions[pos] == session) {
                 s->positions[pos] = NULL;
 
                 /* There might be another session claiming the same

-                 * position (eg., during gdm->session transition), so lets look
+                 * position (eg., during gdm->session transition), so let's look

                  * for it and set it on the free slot. */
                 LIST_FOREACH(sessions_by_seat, iter, s->sessions) {
                  * for it and set it on the free slot. */
                 LIST_FOREACH(sessions_by_seat, iter, s->sessions) {

-                        if (iter->pos == pos) {
+                        if (iter->position == pos && session_get_state(iter) != SESSION_CLOSING) {

                                 s->positions[pos] = iter;
                                 break;
                         }
                                 s->positions[pos] = iter;
                                 break;
                         }


@@ -507,15 +521,15 @@ void seat_claim_position(Seat *s, Session *session, unsigned int pos) {
 
         seat_evict_position(s, session);
 
 
         seat_evict_position(s, session);
 

-        session->pos = pos;
-        if (pos > 0 && !s->positions[pos])
+        session->position = pos;
+        if (pos > 0)

                 s->positions[pos] = session;
 }
 
 static void seat_assign_position(Seat *s, Session *session) {
         unsigned int pos;
 
                 s->positions[pos] = session;
 }
 
 static void seat_assign_position(Seat *s, Session *session) {
         unsigned int pos;
 

-        if (session->pos > 0)
+        if (session->position > 0)

                 return;
 
         for (pos = 1; pos < s->position_count; ++pos)
                 return;
 
         for (pos = 1; pos < s->position_count; ++pos)


@@ -602,7 +616,7 @@ bool seat_can_graphical(Seat *s) {
 int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
         Session *session;
         bool idle_hint = true;
 int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
         Session *session;
         bool idle_hint = true;

-        dual_timestamp ts = { 0, 0 };
+        dual_timestamp ts = DUAL_TIMESTAMP_NULL;

 
         assert(s);
 
 
         assert(s);