Unbreak Kerberos5 compilation. This still remains untested.
Noticed by: obrien
This commit is contained in:
parent
75c6e0e253
commit
b787acb5e3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=60663
@ -11,7 +11,7 @@
|
||||
|
||||
#ifdef KRB5
|
||||
|
||||
extern krb5_context ssh_context;
|
||||
krb5_context ssh_context = NULL;
|
||||
krb5_auth_context auth_context;
|
||||
krb5_ccache mem_ccache = NULL; /* Credential cache for acquired ticket */
|
||||
|
||||
|
@ -20,6 +20,12 @@ RCSID("$OpenBSD: auth1.c,v 1.2 2000/04/29 18:11:52 markus Exp $");
|
||||
#include "auth.h"
|
||||
#include "session.h"
|
||||
|
||||
#ifdef KRB5
|
||||
extern krb5_context ssh_context;
|
||||
krb5_principal tkt_client = NULL; /* Principal from the received ticket.
|
||||
Also is used as an indication of succesful krb5 authentization. */
|
||||
#endif
|
||||
|
||||
/* import */
|
||||
extern ServerOptions options;
|
||||
extern char *forced_command;
|
||||
@ -412,11 +418,8 @@ do_authloop(struct passwd * pw)
|
||||
krb5_data tgt;
|
||||
tgt.data = packet_get_string(&tgt.length);
|
||||
|
||||
if (!auth_krb5_tgt(pw->pw_name, &tgt, tkt_client)) {
|
||||
if (!auth_krb5_tgt(pw->pw_name, &tgt, tkt_client))
|
||||
verbose ("Kerberos V5 TGT refused for %.100s", pw->pw_name);
|
||||
xfree(tgt.data);
|
||||
goto fail;
|
||||
}
|
||||
xfree(tgt.data);
|
||||
|
||||
break;
|
||||
|
@ -38,6 +38,10 @@ RCSID("$OpenBSD: session.c,v 1.12 2000/05/03 18:03:07 markus Exp $");
|
||||
#include <login_cap.h>
|
||||
#endif /* LOGIN_CAP */
|
||||
|
||||
#ifdef KRB5
|
||||
extern krb5_context ssh_context;
|
||||
#endif
|
||||
|
||||
/* types */
|
||||
|
||||
#define TTYSZ 64
|
||||
|
@ -59,9 +59,6 @@ int deny_severity = LOG_WARNING;
|
||||
|
||||
#ifdef KRB5
|
||||
#include <krb5.h>
|
||||
krb5_context ssh_context = NULL;
|
||||
krb5_principal tkt_client = NULL; /* Principal from the received ticket.
|
||||
Also is used as an indication of succesful krb5 authentization. */
|
||||
#endif /* KRB5 */
|
||||
|
||||
/* Server configuration options. */
|
||||
|
Loading…
Reference in New Issue
Block a user