no need for an extra user to use ssh

Signed-off-by: Mattias Andrée <maandree@operamail.com>

4 files changed, 2 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 44a5361..b254be6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ DATA = /usr/share
 LICENSES = $(DATA)/licenses
 COMMAND = got
 PKGNAME = gates-of-tartaros
-SSHUSER = sshlogin
 SSH = ssh
 
 BASH_SHEBANG = /usr/bin/env bash
@@ -36,7 +35,6 @@ info/%.texinfo.install: info/%.texinfo
 	sed -i 's:^@set DEV /dev:@set DEV $(DEV):g' "$@"
 	sed -i 's:^@set ETC /etc:@set ETC $(SYSCONF):g' "$@"
 	sed -i 's:^@set GOT got:@set GOT $(COMMAND):g' "$@"
-	sed -i 's:^@set SSHLOGIN sshlogin:@set SSHLOGIN $(SSHUSER):g' "$@"
 	sed -i 's:^@set SSH ssh:@set SSH $(SSH):g' "$@"
 
 .PHONY: cmd
@@ -49,7 +47,6 @@ got.install: got
 	sed -i 's:@dev@:$(DEV):g' "$@"
 	sed -i 's:@etc@:$(SYSCONF):g' "$@"
 	sed -i 's:@command@:$(COMMAND):g' "$@"
-	sed -i 's:@sshlogin@:$(SSHUSER):g' "$@"
 	sed -i 's:@ssh@:$(SSH):g' "$@"
 
 got-cmd.install: got-cmd
diff --git a/README b/README
index def30c7..a6509c1 100644
--- a/README
+++ b/README
@@ -9,10 +9,6 @@ To log in with over SSH type:
    or
    user@host port
 
-SSH login requires that you have a
-user without password called sshlogin
-that have got-cmd as its default shell.
-
 Usage:
 	got TTY EXPORTS...
 
diff --git a/got b/got
index 1e55158..990d6b7 100755
--- a/got
+++ b/got
@@ -58,8 +58,8 @@ login_function=_login
 function _login
 {
     if [ ! "${user/@/}" = "${user}" ]; then
-	export GOT_COMMAND="@ssh@ ${user}"
-	setsid -c login -p -f @sshlogin@
+	setsid -c @ssh@ ${user} || sleep 3
+	# The sleep allows you to see any error you made
     elif [ "${user::1}" = "-" ]; then
 	stty -icanon -echo -isig -ix{on,off,any}
 	echo $'\e[01;31mNice try! Sleeping for 10 minutes...\e[00m'
diff --git a/info/gates-of-tartaros.texinfo b/info/gates-of-tartaros.texinfo
index 02cbd0e..3b287d3 100644
--- a/info/gates-of-tartaros.texinfo
+++ b/info/gates-of-tartaros.texinfo
@@ -15,7 +15,6 @@
 @set DEV /dev
 @set ETC /etc
 @set GOT got
-@set SSHLOGIN sshlogin
 @set SSH ssh
 @c --- end of do not touch ---
 
@@ -100,16 +99,6 @@ for SSH logins include:
 @node Setting up
 @chapter Setting up
 
-@menu
-* Configure inittab::               Configure your system to use Gates of Tartaros.
-* Enable SSH::                      Enable SSH login on Gates of Tartaros.
-@end menu
-
-
-
-@node Configure inittab
-@section Configure inittab
-
 To set up your inittab to to use Gates of Tartaros instead
 of @command{agetty}, in your inittab, use the command
 @command{@value{SBIN}/@value{GOT}} with the first argument
@@ -128,21 +117,6 @@ c6:345:respawn:@value{SBIN}/@value{GOT} tty6 TERM=linux
 
 
 
-@node Enable SSH
-@section Enable SSH
-
-To enable SSH login support you must create a user
-named `@value{SSHLOGIN}', which will be logged in and
-run SSH when using SSH login.@footnote{SSH cannot operate
-without a using being logged in.} The user's default
-shell must be set to @code{@value{GOT}-cmd}.
-
-@example
-sudo useradd -m -s @value{BIN}/@value{GOT}-cmd @value{SSHLOGIN}
-@end example
-
-
-
 @node Extensibility
 @chapter Extensibility