sync - don't know when this got out of sync
diff --git a/auth-krb5.c b/auth-krb5.c
index b56f43a..bf24120 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -2,7 +2,7 @@
* Kerberos v5 authentication and ticket-passing routines.
*
* $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $
- * $OpenBSD: auth-krb5.c,v 1.2 2001/11/12 01:47:09 dugsong Exp $
+ * $OpenBSD: auth-krb5.c,v 1.4 2002/01/27 15:12:09 markus Exp $
*/
#include "includes.h"
@@ -26,7 +26,7 @@
Authctxt *authctxt = (Authctxt *)context;
krb5_error_code problem;
static int cleanup_registered = 0;
-
+
if (authctxt->krb5_ctx == NULL) {
problem = krb5_init_context(&authctxt->krb5_ctx);
if (problem)
@@ -45,7 +45,7 @@
* only, in auth is received ticket, in client is returned principal
* from the ticket
*/
-int
+int
auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client)
{
krb5_error_code problem;
@@ -58,52 +58,52 @@
server = NULL;
ticket = NULL;
reply.length = 0;
-
+
problem = krb5_init(authctxt);
- if (problem)
+ if (problem)
goto err;
-
+
problem = krb5_auth_con_init(authctxt->krb5_ctx,
&authctxt->krb5_auth_ctx);
if (problem)
goto err;
-
+
fd = packet_get_connection_in();
problem = krb5_auth_con_setaddrs_from_fd(authctxt->krb5_ctx,
authctxt->krb5_auth_ctx, &fd);
if (problem)
goto err;
-
+
problem = krb5_sname_to_principal(authctxt->krb5_ctx, NULL, NULL ,
KRB5_NT_SRV_HST, &server);
if (problem)
goto err;
-
+
problem = krb5_rd_req(authctxt->krb5_ctx, &authctxt->krb5_auth_ctx,
auth, server, NULL, NULL, &ticket);
if (problem)
goto err;
-
+
problem = krb5_copy_principal(authctxt->krb5_ctx, ticket->client,
&authctxt->krb5_user);
if (problem)
goto err;
-
+
/* if client wants mutual auth */
problem = krb5_mk_rep(authctxt->krb5_ctx, authctxt->krb5_auth_ctx,
&reply);
if (problem)
goto err;
-
+
/* Check .k5login authorization now. */
if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user,
authctxt->pw->pw_name))
goto err;
-
+
if (client)
krb5_unparse_name(authctxt->krb5_ctx, authctxt->krb5_user,
client);
-
+
packet_start(SSH_SMSG_AUTH_KERBEROS_RESPONSE);
packet_put_string((char *) reply.data, reply.length);
packet_send();
@@ -117,7 +117,7 @@
krb5_free_ticket(authctxt->krb5_ctx, ticket);
if (reply.length)
xfree(reply.data);
-
+
if (problem)
debug("Kerberos v5 authentication failed: %s",
krb5_get_err_text(authctxt->krb5_ctx, problem));
@@ -131,51 +131,51 @@
krb5_error_code problem;
krb5_ccache ccache = NULL;
char *pname;
-
+
if (authctxt->pw == NULL || authctxt->krb5_user == NULL)
return (0);
-
+
temporarily_use_uid(authctxt->pw);
-
+
problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_fcc_ops, &ccache);
if (problem)
goto fail;
-
+
problem = krb5_cc_initialize(authctxt->krb5_ctx, ccache,
authctxt->krb5_user);
if (problem)
goto fail;
-
+
problem = krb5_rd_cred2(authctxt->krb5_ctx, authctxt->krb5_auth_ctx,
ccache, tgt);
if (problem)
goto fail;
-
+
authctxt->krb5_fwd_ccache = ccache;
ccache = NULL;
-
+
authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
-
+
problem = krb5_unparse_name(authctxt->krb5_ctx, authctxt->krb5_user,
&pname);
if (problem)
goto fail;
-
+
debug("Kerberos v5 TGT accepted (%s)", pname);
-
+
restore_uid();
-
+
return (1);
-
+
fail:
if (problem)
debug("Kerberos v5 TGT passing failed: %s",
krb5_get_err_text(authctxt->krb5_ctx, problem));
if (ccache)
krb5_cc_destroy(authctxt->krb5_ctx, ccache);
-
+
restore_uid();
-
+
return (0);
}
@@ -183,47 +183,50 @@
auth_krb5_password(Authctxt *authctxt, const char *password)
{
krb5_error_code problem;
-
+
if (authctxt->pw == NULL)
return (0);
-
+
temporarily_use_uid(authctxt->pw);
-
+
problem = krb5_init(authctxt);
if (problem)
goto out;
-
+
problem = krb5_parse_name(authctxt->krb5_ctx, authctxt->pw->pw_name,
&authctxt->krb5_user);
if (problem)
goto out;
-
+
problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_mcc_ops,
&authctxt->krb5_fwd_ccache);
if (problem)
goto out;
-
+
problem = krb5_cc_initialize(authctxt->krb5_ctx,
authctxt->krb5_fwd_ccache, authctxt->krb5_user);
if (problem)
goto out;
-
+
+ restore_uid();
problem = krb5_verify_user(authctxt->krb5_ctx, authctxt->krb5_user,
authctxt->krb5_fwd_ccache, password, 1, NULL);
+ temporarily_use_uid(authctxt->pw);
+
if (problem)
goto out;
-
+
authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
-
+
out:
restore_uid();
-
+
if (problem) {
debug("Kerberos password authentication failed: %s",
krb5_get_err_text(authctxt->krb5_ctx, problem));
-
+
krb5_cleanup_proc(authctxt);
-
+
if (options.kerberos_or_local_passwd)
return (-1);
else
@@ -236,7 +239,7 @@
krb5_cleanup_proc(void *context)
{
Authctxt *authctxt = (Authctxt *)context;
-
+
debug("krb5_cleanup_proc called");
if (authctxt->krb5_fwd_ccache) {
krb5_cc_destroy(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);