alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lsh: Use GNU URL; handle --no-root-login' in lshd'.

Browse source 
svn path=/nixpkgs/trunk/; revision=16985
This commit is contained in:
Ludovic Courtès 2009-09-08 10:29:22 +00:00
parent b44d46ee21
commit 80e34c69f5
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/networking/lsh/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation {
name = "lsh-2.0.4";
src = fetchurl {
url = http://www.lysator.liu.se/~nisse/archive/lsh-2.0.4.tar.gz;
url = "mirror://gnu/lsh/${name}.tar.gz";
sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091";
};
patches = [ ./pam-service-name.patch ];
patches = [ ./pam-service-name.patch ./lshd-no-root-login.patch ];
preConfigure = ''
# Patch `lsh-make-seed' so that it can gather enough entropy.

16
pkgs/tools/networking/lsh/lshd-no-root-login.patch Normal file
View file

@ -0,0 +1,16 @@
Correctly handle the `--no-root-login' option.
--- lsh-2.0.4/src/lshd.c 2006-05-01 13:47:44.000000000 +0200
+++ lsh-2.0.4/src/lshd.c 2009-09-08 12:20:36.000000000 +0200
@@ -758,6 +758,10 @@ main_argp_parser(int key, char *arg, str
self->allow_root = 1;
break;
+ case OPT_NO_ROOT_LOGIN:
+ self->allow_root = 0;
+ break;
+
case OPT_KERBEROS_PASSWD:
self->pw_helper = PATH_KERBEROS_HELPER;
break;