tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache

Browse Source 
file using FILE: method, fixes problems on Mac OSX.
   Patch from simon@sxw.org.uk; ok dtucker@
This commit is contained in:
Damien Miller 2004-04-16 22:47:55 +10:00
parent c99a19b445
commit 9c870f966a
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,9 @@
20040416 20040416
- (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since
FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com
- (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache
file using FILE: method, fixes problems on Mac OSX.
Patch from simon@sxw.org.uk; ok dtucker@
20040412 20040412
- (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
@ -970,4 +973,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3312 2004/04/16 07:58:28 dtucker Exp $ $Id: ChangeLog,v 1.3313 2004/04/16 12:47:55 djm Exp $

6
auth-krb5.c
View File

@ -72,6 +72,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
#endif #endif
krb5_error_code problem; krb5_error_code problem;
krb5_ccache ccache = NULL; krb5_ccache ccache = NULL;
int len;
if (!authctxt->valid) if (!authctxt->valid)
return (0); return (0);
@ -177,6 +178,11 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache); authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
len = strlen(authctxt->krb5_ticket_file) + 6;
authctxt->krb5_ccname = xmalloc(len);
snprintf(authctxt->krb5_ccname, len, "FILE:%s",
authctxt->krb5_ticket_file);
out: out:
restore_uid(); restore_uid();

1
auth.h
View File

@ -66,6 +66,7 @@ struct Authctxt {
krb5_ccache krb5_fwd_ccache; krb5_ccache krb5_fwd_ccache;
krb5_principal krb5_user; krb5_principal krb5_user;
char *krb5_ticket_file; char *krb5_ticket_file;
char *krb5_ccname;
#endif #endif
void *methoddata; void *methoddata;
}; };

4
session.c
View File

@ -1093,9 +1093,9 @@ do_setup_env(Session *s, const char *shell)
} }
#endif #endif
#ifdef KRB5 #ifdef KRB5
if (s->authctxt->krb5_ticket_file) if (s->authctxt->krb5_ccname)
child_set_env(&env, &envsize, "KRB5CCNAME", child_set_env(&env, &envsize, "KRB5CCNAME",
s->authctxt->krb5_ticket_file); s->authctxt->krb5_ccname);
#endif #endif
#ifdef USE_PAM #ifdef USE_PAM
/* /*