diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-09-08 10:29:22 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-09-08 10:29:22 +0000 |
| commit | 80e34c69f50d0676cb0ff384168493026de02c99 (patch) | |
| tree | dea8815d1e4218f4e360576fc16e18462af3e160 /pkgs/tools/networking/lsh | |
| parent | b44d46ee2106180dc13cc3d1b8d45874495a4b61 (diff) | |
| download | nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.tar nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.tar.gz nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.tar.bz2 nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.tar.lz nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.tar.xz nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.tar.zst nixpkgs-80e34c69f50d0676cb0ff384168493026de02c99.zip | |
lsh: Use GNU URL; handle `--no-root-login' in `lshd'.
svn path=/nixpkgs/trunk/; revision=16985
Diffstat (limited to 'pkgs/tools/networking/lsh')
| -rw-r--r-- | pkgs/tools/networking/lsh/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/lsh/lshd-no-root-login.patch | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index f81e650e4db..e60a45dd941 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -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. diff --git a/pkgs/tools/networking/lsh/lshd-no-root-login.patch b/pkgs/tools/networking/lsh/lshd-no-root-login.patch new file mode 100644 index 00000000000..9dd81de3fbc --- /dev/null +++ b/pkgs/tools/networking/lsh/lshd-no-root-login.patch @@ -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; + |