pam: remove only sessions we ourselves created in the first place

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 9f2a569029b5b91cad3ca92eafc50e6288be5354..964bb9cc325f8bac2cb1fd4d9e0ba58c33e9a8b7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -44,6 +44,7 @@
 #include "special.h"
 #include "conf-parser.h"
 #include "bus-errors.h"
+#include "missing.h"
 
 static enum {
         ACTION_RUN,
@@ -545,7 +546,8 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_LOG_COLOR,
                 ARG_LOG_LOCATION,
                 ARG_UNIT,
-                ARG_RUNNING_AS,
+                ARG_SYSTEM,
+                ARG_SESSION,
                 ARG_TEST,
                 ARG_DUMP_CONFIGURATION_ITEMS,
                 ARG_DUMP_CORE,
@@ -562,7 +564,8 @@ static int parse_argv(int argc, char *argv[]) {
                 { "log-color",                optional_argument, NULL, ARG_LOG_COLOR                },
                 { "log-location",             optional_argument, NULL, ARG_LOG_LOCATION             },
                 { "unit",                     required_argument, NULL, ARG_UNIT                     },
-                { "running-as",               required_argument, NULL, ARG_RUNNING_AS               },
+                { "system",                   no_argument,       NULL, ARG_SYSTEM                   },
+                { "session",                  no_argument,       NULL, ARG_SESSION                  },
                 { "test",                     no_argument,       NULL, ARG_TEST                     },
                 { "help",                     no_argument,       NULL, 'h'                          },
                 { "dump-configuration-items", no_argument,       NULL, ARG_DUMP_CONFIGURATION_ITEMS },
@@ -580,7 +583,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "hD", options, NULL)) >= 0)
 
                 switch (c) {
 
@@ -634,17 +637,13 @@ static int parse_argv(int argc, char *argv[]) {
 
                         break;
 
-                case ARG_RUNNING_AS: {
-                        ManagerRunningAs as;
-
-                        if ((as = manager_running_as_from_string(optarg)) < 0) {
-                                log_error("Failed to parse running as value %s", optarg);
-                                return -EINVAL;
-                        }
+                case ARG_SYSTEM:
+                        arg_running_as = MANAGER_SYSTEM;
+                        break;
 
-                        arg_running_as = as;
+                case ARG_SESSION:
+                        arg_running_as = MANAGER_SESSION;
                         break;
-                }
 
                 case ARG_TEST:
                         arg_action = ACTION_TEST;
@@ -717,6 +716,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_action = ACTION_HELP;
                         break;
 
+                case 'D':
+                        log_set_max_level(LOG_DEBUG);
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -746,7 +749,8 @@ static int help(void) {
                "     --dump-configuration-items  Dump understood unit configuration items\n"
                "     --introspect[=INTERFACE]    Extract D-Bus interface data\n"
                "     --unit=UNIT                 Set default unit\n"
-               "     --running-as=AS             Set running as (system, session)\n"
+               "     --system                    Run a system instance, even if PID != 1\n"
+               "     --session                   Run a session instance\n"
                "     --dump-core                 Dump core on crash\n"
                "     --crash-shell               Run shell on crash\n"
                "     --confirm-spawn             Ask for confirmation when spawning processes\n"
@@ -769,7 +773,7 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds) {
         assert(_f);
         assert(_fds);
 
-        if ((r = manager_open_serialization(&f)) < 0) {
+        if ((r = manager_open_serialization(m, &f)) < 0) {
                 log_error("Failed to create serialization faile: %s", strerror(-r));
                 goto fail;
         }
@@ -832,7 +836,7 @@ int main(int argc, char *argv[]) {
                 return 1;
         }
 
-        log_show_color(true);
+        log_show_color(isatty(STDERR_FILENO) > 0);
         log_show_location(false);
         log_set_max_level(LOG_INFO);
 
@@ -932,13 +936,24 @@ int main(int argc, char *argv[]) {
 
         log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as));
 
-        if (arg_running_as == MANAGER_SYSTEM && !serialization) {
-                if (arg_show_status)
-                        status_welcome();
-                modprobe_setup(arg_nomodules);
-                kmod_setup();
-                hostname_setup();
-                loopback_setup();
+        if (arg_running_as == MANAGER_SYSTEM) {
+
+                /* Disable nscd, to avoid deadlocks when systemd uses
+                 * NSS and the nscd socket is maintained by us. */
+                if (nss_disable_nscd) {
+                        log_debug("Disabling nscd");
+                        nss_disable_nscd();
+                } else
+                        log_debug("Hmm, can't disable nscd.");
+
+                if (!serialization) {
+                        if (arg_show_status)
+                                status_welcome();
+                        modprobe_setup(arg_nomodules);
+                        kmod_setup();
+                        hostname_setup();
+                        loopback_setup();
+                }
         }
 
         if ((r = manager_new(arg_running_as, &m)) < 0) {
@@ -1042,7 +1057,7 @@ finish:
         dbus_shutdown();
 
         if (reexecute) {
-                const char *args[11];
+                const char *args[14];
                 unsigned i = 0;
                 char sfd[16];
 
@@ -1057,8 +1072,22 @@ finish:
                 args[i++] = "--log-target";
                 args[i++] = log_target_to_string(log_get_target());
 
-                args[i++] = "--running-as";
-                args[i++] = manager_running_as_to_string(arg_running_as);
+                if (arg_running_as == MANAGER_SYSTEM)
+                        args[i++] = "--system";
+                else
+                        args[i++] = "--session";
+
+                if (arg_dump_core)
+                        args[i++] = "--dump-core";
+
+                if (arg_crash_shell)
+                        args[i++] = "--crash-shell";
+
+                if (arg_confirm_spawn)
+                        args[i++] = "--confirm-spawn";
+
+                if (arg_show_status)
+                        args[i++] = "--show-status";
 
                 snprintf(sfd, sizeof(sfd), "%i", fileno(serialization));
                 char_array_0(sfd);
@@ -1066,9 +1095,6 @@ finish:
                 args[i++] = "--deserialize";
                 args[i++] = sfd;
 
-                if (arg_confirm_spawn)
-                        args[i++] = "--confirm-spawn";
-
                 args[i++] = NULL;
 
                 assert(i <= ELEMENTSOF(args));