tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- avsm@cvs.openbsd.org 2003/10/26 16:57:43 

[sshconnect2.c]
     rename 'supported' static var in userauth_gssapi() to 'gss_supported'
     to avoid shadowing the global version.  markus@ ok
This commit is contained in:
Darren Tucker 2003-11-03 20:06:14 +11:00
parent 8cc39788cb
commit 56afe145e0
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -9,6 +9,10 @@
- markus@cvs.openbsd.org 2003/10/21 09:50:06 - markus@cvs.openbsd.org 2003/10/21 09:50:06
[auth2-gss.c] [auth2-gss.c]
make sure the doid is larger than 2 make sure the doid is larger than 2
- avsm@cvs.openbsd.org 2003/10/26 16:57:43
[sshconnect2.c]
rename 'supported' static var in userauth_gssapi() to 'gss_supported'
to avoid shadowing the global version. markus@ ok
20031021 20031021
- (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
@ -1383,4 +1387,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3088 2003/11/03 09:05:03 dtucker Exp $ $Id: ChangeLog,v 1.3089 2003/11/03 09:06:14 dtucker Exp $

26
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.127 2003/10/11 08:26:43 markus Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.128 2003/10/26 16:57:43 avsm Exp $");
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"
@ -480,7 +480,7 @@ int
userauth_gssapi(Authctxt *authctxt) userauth_gssapi(Authctxt *authctxt)
{ {
Gssctxt *gssctxt = NULL; Gssctxt *gssctxt = NULL;
static gss_OID_set supported = NULL; static gss_OID_set gss_supported = NULL;
static int mech = 0; static int mech = 0;
OM_uint32 min; OM_uint32 min;
int ok = 0; int ok = 0;
@ -488,18 +488,18 @@ userauth_gssapi(Authctxt *authctxt)
/* Try one GSSAPI method at a time, rather than sending them all at /* Try one GSSAPI method at a time, rather than sending them all at
* once. */ * once. */
if (supported == NULL) if (gss_supported == NULL)
gss_indicate_mechs(&min, &supported); gss_indicate_mechs(&min, &gss_supported);
/* Check to see if the mechanism is usable before we offer it */ /* Check to see if the mechanism is usable before we offer it */
while (mech<supported->count && !ok) { while (mech < gss_supported->count && !ok) {
if (gssctxt) if (gssctxt)
ssh_gssapi_delete_ctx(&gssctxt); ssh_gssapi_delete_ctx(&gssctxt);
ssh_gssapi_build_ctx(&gssctxt); ssh_gssapi_build_ctx(&gssctxt);
ssh_gssapi_set_oid(gssctxt, &supported->elements[mech]); ssh_gssapi_set_oid(gssctxt, &gss_supported->elements[mech]);
/* My DER encoding requires length<128 */ /* My DER encoding requires length<128 */
if (supported->elements[mech].length < 128 && if (gss_supported->elements[mech].length < 128 &&
!GSS_ERROR(ssh_gssapi_import_name(gssctxt, !GSS_ERROR(ssh_gssapi_import_name(gssctxt,
authctxt->host))) { authctxt->host))) {
ok = 1; /* Mechanism works */ ok = 1; /* Mechanism works */
@ -521,14 +521,14 @@ userauth_gssapi(Authctxt *authctxt)
/* Some servers encode the OID incorrectly (as we used to) */ /* Some servers encode the OID incorrectly (as we used to) */
if (datafellows & SSH_BUG_GSSAPI_BER) { if (datafellows & SSH_BUG_GSSAPI_BER) {
packet_put_string(supported->elements[mech].elements, packet_put_string(gss_supported->elements[mech].elements,
supported->elements[mech].length); gss_supported->elements[mech].length);
} else { } else {
packet_put_int((supported->elements[mech].length)+2); packet_put_int((gss_supported->elements[mech].length)+2);
packet_put_char(SSH_GSS_OIDTYPE); packet_put_char(SSH_GSS_OIDTYPE);
packet_put_char(supported->elements[mech].length); packet_put_char(gss_supported->elements[mech].length);
packet_put_raw(supported->elements[mech].elements, packet_put_raw(gss_supported->elements[mech].elements,
supported->elements[mech].length); gss_supported->elements[mech].length);
} }
packet_send(); packet_send();