[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.1-60-g9b91fa4

[Enrico Zini]

The following commit has been merged in the master branch:
commit d5e1123a0ed37b5b781ae449e0c267661cc25eb1
Author: Enrico Zini <enrico at enricozini.org>
Date:   Mon Feb 23 20:34:38 2009 +0000

    Added manpage

diff --git a/Makefile.am b/Makefile.am
index a4adb12..8c56e5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,8 @@ nodm_SOURCES = nodm.c
 nodm_LDFLAGS = $(PAM_LIBS)
 nodm_CFLAGS = -DNODM_SESSION='"$(sbindir)/nodm"'
 
-EXTRA_DIST = test_nodm TODO
+nodm.8: nodm
+	help2man --section=8 --name="X display manager for automatic logins" \
+		 --no-info --include=nodm-man-extras ./$< > $@
+
+EXTRA_DIST = test_nodm TODO nodm-man-extras
diff --git a/nodm.8 b/nodm.8
new file mode 100644
index 0000000..cc6fcea
--- /dev/null
+++ b/nodm.8
@@ -0,0 +1,37 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH NODM "8" "February 2009" "nodm version 0.2" "System Administration Utilities"
+.SH NAME
+nodm \- X display manager for automatic logins
+.SH SYNOPSIS
+.B nodm
+[\fIoptions\fR]
+.SH DESCRIPTION
+\fBnodm\fP is a minimal display manager that simply logs in as a given user and
+starts an X session, without asking for username or password.
+.P
+On a normal computer, using \fBnodm\fP is a big security issue because it would
+give anyone access to the computer.
+.P
+However, there are cases where automatic login is needed: for example in an
+embedded system such as a mobile phone, or in a kiosk setup, or in a control
+panel for industrial machinery.  For those cases, \fBnodm\fP is simple to
+setup, lightweight, and it should do exactly the right thing.
+.SH OPTIONS
+.TP
+\fB\-\-help\fR
+print this help message
+.TP
+\fB\-\-version\fR
+print nodm's version number
+.TP
+\fB\-\-session\fR=\fIcmd\fR
+run cmd instead of /usr/sbin/nodm
+(use for testing)
+.SH AUTHOR
+\fBnodm\fP is written and maintained by Enrico Zini <enrico at enricozini.org> and
+Joachim Breitner <nomeata at debian.org>.
+.SH "SEE ALSO"
+.BR xinit (1),
+.BR xdm (1),
+.BR gdm (1),
+.BR kdm (1).
diff --git a/nodm.c b/nodm.c
index 9f107c9..92334c5 100644
--- a/nodm.c
+++ b/nodm.c
@@ -53,6 +53,7 @@
 /* #define DEBUG_NODM */
 
 
+#include "config.h"
 #include <getopt.h>
 #include <grp.h>
 #include <pwd.h>
@@ -380,6 +381,7 @@ static void monitor_cmdline_help(int argc, char** argv, FILE* out)
 	fprintf(out, "Usage: %s [options]\n\n", argv[0]);
 	fprintf(out, "Options:\n");
 	fprintf(out, " --help         print this help message\n");
+	fprintf(out, " --version      print %s's version number\n", NAME);
 	fprintf(out, " --session=cmd  run cmd instead of %s\n", NODM_SESSION);
 	fprintf(out, "                (use for testing)\n");
 }
@@ -390,10 +392,12 @@ static void monitor_cmdline_help(int argc, char** argv, FILE* out)
 static int nodm_monitor(int argc, char **argv)
 {
 	static int opt_help = 0;
+	static int opt_version = 0;
 	static struct option options[] =
 	{
 		/* These options set a flag. */
 		{"help",    no_argument,       &opt_help, 1},
+		{"version", no_argument,       &opt_version, 1},
 		{"session", required_argument, 0, 's'},
 		{0, 0, 0, 0}
 	};
@@ -424,6 +428,11 @@ static int nodm_monitor(int argc, char **argv)
 		monitor_cmdline_help(argc, argv, stdout);
 		return 0;
 	}
+	if (opt_version)
+	{
+		printf("%s version %s\n", NAME, VERSION);
+		return 0;
+	}
 
 	syslog(LOG_INFO, "Starting nodm monitor");
 

-- 
Automatic Display Manager