diff options
author | Matt Fischer <> | 2011-12-09 14:22:25 +1100 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2011-12-09 14:22:25 +1100 |
commit | 2e67b092c08e17a1fd4751d18ee9dc5f4b15b193 (patch) | |
tree | ecc044aa03176cf30f0c5628b96b9869f0a8824b | |
parent | bc19fcf34885a654f42cbeffe28c632e2dcf2bcf (diff) | |
download | lightdm-git-2e67b092c08e17a1fd4751d18ee9dc5f4b15b193.tar.gz |
Remove references to non-existant --no-root option
-rw-r--r-- | data/lightdm.1 | 2 | ||||
-rw-r--r-- | src/lightdm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/lightdm.1 b/data/lightdm.1 index 6753ac2e..047fbc87 100644 --- a/data/lightdm.1 +++ b/data/lightdm.1 @@ -25,7 +25,7 @@ Print debugging messages Run as unprivileged user, skipping things that require root access .TP .B \-\-passwd\-file=FILE -Use the given password file for authentication (for testing, requires \-\-no\-root) +Use the given password file for authentication (for testing, requires \-\-test\-mode) .TP .B \-\-pid\-file=FILE File to write PID into diff --git a/src/lightdm.c b/src/lightdm.c index bacdfe36..866cdcef 100644 --- a/src/lightdm.c +++ b/src/lightdm.c @@ -889,7 +889,7 @@ main (int argc, char **argv) N_("Run as unprivileged user, skipping things that require root access"), NULL }, { "passwd-file", 0, 0, G_OPTION_ARG_STRING, &passwd_path, /* Help string for command line --use-passwd flag */ - N_("Use the given password file for authentication (for testing, requires --no-root)"), "FILE" }, + N_("Use the given password file for authentication (for testing, requires --test-mode)"), "FILE" }, { "pid-file", 0, 0, G_OPTION_ARG_STRING, &pid_path, /* Help string for command line --pid-file flag */ N_("File to write PID into"), "FILE" }, @@ -999,7 +999,7 @@ main (int argc, char **argv) /* Don't allow to be run as root and use a password file (asking for danger!) */ if (getuid () == 0 && passwd_path) { - g_printerr ("Only allowed to use --passwd-file when running with --no-root.\n"); + g_printerr ("Only allowed to use --passwd-file when running with --test-mode.\n"); return EXIT_FAILURE; } |