diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-17 16:47:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-17 16:47:12 -0400 |
| commit | dcaf70897a0bad38a4638a2905aaa3c46b1f1402 (patch) | |
| tree | 439c42bf27972a628ebc0fef11a63b9130ca19a5 /gnu/packages/ssh.scm | |
| parent | bf62b8ff79f9d60136996b8251b6475965cf4994 (diff) | |
| parent | 040b6299d505c034b4960c335434a500ae2f8187 (diff) | |
| download | guix-dcaf70897a0bad38a4638a2905aaa3c46b1f1402.tar guix-dcaf70897a0bad38a4638a2905aaa3c46b1f1402.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c551f18481..9fd1506dbd 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) + #:use-module (gnu packages mit-krb5) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:autoload (gnu packages protobuf) (protobuf) @@ -126,15 +127,21 @@ a server that supports the SSH-2 protocol.") (inputs `(("groff" ,groff) ("openssl" ,openssl) ("pam" ,linux-pam) + ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) ("xauth" ,xauth))) ;for 'ssh -X' and 'ssh -Y' (arguments `(#:test-target "tests" - #:configure-flags '("--sysconfdir=/etc/ssh" + #:configure-flags `("--sysconfdir=/etc/ssh" - ;; Default value of 'PATH' used by sshd. + ;; Default value of 'PATH' used by sshd. "--with-default-path=/run/current-system/profile/bin" + ;; configure needs to find krb5-config + ,(string-append "--with-kerberos5=" + (assoc-ref %build-inputs "mit-krb5") + "/bin") + ;; Enable PAM support in sshd. "--with-pam") |