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

- (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove 

calls to krb5_init_ets, which has not been required since krb-1.1.x and
   most Kerberos versions no longer export in their public API.  From sxw
   at inf.ed.ac.uk, ok djm@
This commit is contained in:
Darren Tucker 2005-07-07 20:33:36 +10:00
parent a83f2612c2
commit 893c602ef0
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -6,6 +6,10 @@
- (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno
in the case where the buffer is insufficient, so always return ENOMEM. in the case where the buffer is insufficient, so always return ENOMEM.
Also pointed out by sxw at inf.ed.ac.uk. Also pointed out by sxw at inf.ed.ac.uk.
- (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove
calls to krb5_init_ets, which has not been required since krb-1.1.x and
most Kerberos versions no longer export in their public API. From sxw
at inf.ed.ac.uk, ok djm@
20050706 20050706
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -2791,4 +2795,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.3837 2005/07/07 10:09:35 dtucker Exp $ $Id: ChangeLog,v 1.3838 2005/07/07 10:33:36 dtucker Exp $

5
acconfig.h
View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.182 2005/05/27 11:13:41 dtucker Exp $ */ /* $Id: acconfig.h,v 1.183 2005/07/07 10:33:36 dtucker Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -202,9 +202,6 @@
/* Define if you don't want to use lastlog in session.c */ /* Define if you don't want to use lastlog in session.c */
#undef NO_SSH_LASTLOG #undef NO_SSH_LASTLOG
/* Define if have krb5_init_ets */
#undef KRB5_INIT_ETS
/* Define if you don't want to use utmp */ /* Define if you don't want to use utmp */
#undef DISABLE_UTMP #undef DISABLE_UTMP

3
auth-krb5.c
View File

@ -54,9 +54,6 @@ krb5_init(void *context)
problem = krb5_init_context(&authctxt->krb5_ctx); problem = krb5_init_context(&authctxt->krb5_ctx);
if (problem) if (problem)
return (problem); return (problem);
#ifdef KRB5_INIT_ETS
krb5_init_ets(authctxt->krb5_ctx);
#endif
} }
return (0); return (0);
} }

3
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.276 2005/06/19 00:19:43 djm Exp $ # $Id: configure.ac,v 1.277 2005/07/07 10:33:36 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -2717,7 +2717,6 @@ AC_ARG_WITH(kerberos5,
LIBS="$LIBS $K5LIBS" LIBS="$LIBS $K5LIBS"
AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS))
] ]
) )

3
gss-serv-krb5.c
View File

@ -65,9 +65,6 @@ ssh_gssapi_krb5_init(void)
logit("Cannot initialize krb5 context"); logit("Cannot initialize krb5 context");
return 0; return 0;
} }
#ifdef KRB5_INIT_ETS
krb5_init_ets(krb_context);
#endif
return 1; return 1;
} }