c5a8b87f73
Resolve conflicts
2006-09-28 21:22:14 +00:00
fab0e5bf66
resolve conflicts
2006-02-04 22:32:13 +00:00
8b8ab8547b
Resolve conflicts.
2005-02-13 05:57:25 +00:00
3514116803
Apply patch from lha@, via OpenBSD portable SSH's revision 1.11 of this file:
...
mcc -> fcc; from Love Hörnquist Åstrand <lha@it.su.se>
otherwise the kerberos credentinal is stored in a memory cache
in the privileged sshd.
Presumably, this will also come in as part of a later OpenSSH release via
`cvs import', but this is worth having now.
2003-07-28 15:50:17 +00:00
b1395375fd
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
...
binary when we only have the vendor's RCSID.
2003-07-10 01:09:41 +00:00
e7e7c84a6a
sync w/ 3.6.1
2003-04-03 06:21:31 +00:00
ef7d24574a
upgrade to openssh 3.5. major changes include:
...
- krb4/5 support for privsep (krb5 diff was already applied)
includes fake implementaation of getpeereid() from openssh-portable, which
does nothing useful - need improvement.
2002-10-01 14:07:26 +00:00
32e004f92a
kerberos support w/ privsep. confirmed to work by lha@stacken.kth.se
2002-09-09 06:45:17 +00:00
34b40b030e
sync with openssh 3.2 as of 2002/4/22.
...
- privilege separation
- afs/kerberos auth security issue fixed
2002-04-22 07:59:35 +00:00
af34a358ff
sync w/ 3.1 as of 2002/3/8. configuration file directory is still /etc
...
(openbsd usr.bin/ssh is using /etc/ssh)
2002-03-08 02:00:50 +00:00
a8d19a98fc
don't try to use the krb5 context if the init fails; should fix
...
bin/15585
2002-02-26 11:16:08 +00:00
ad08960f5c
When calling krb5_verify_user(), we must restore root's uid, since it will need to read /etc/krb5.keytab.
2001-12-19 10:28:47 +00:00
1eb2191d4f
fix auth_krb5() error case behavior. found by jhawk, sync with openbsd tree
2001-11-12 05:45:29 +00:00
ba613513e8
sync with openssh 2.9.9 around 9/27.
2001-09-27 03:24:01 +00:00
6fe37483a3
Set the KRB5CCNAME envrironment variable in the child if we received
...
forwarded Kerberos 5 credentials, so that the process that needs them
can actually find them.
2001-03-28 03:31:52 +00:00
8ab184566c
When we receive forwarded Kerberos credentials, stuff them into
...
a file credential cache (rather than a memory credential cache)
so that they're useful.
2001-03-28 03:17:23 +00:00
e625c71295
add krb5 support to ssh/sshd. based on code initially from Daniel Kouril <kouril@informatics.muni.cz> and Björn Grönvall <bg@sics.se>
2001-03-04 00:41:27 +00:00
christos