Deleted Added
full compact
auth-krb5.c (106130) auth-krb5.c (113911)
1/*
2 * Kerberos v5 authentication and ticket-passing routines.
3 *
4 * $xFreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp$
5 */
6/*
7 * Copyright (c) 2002 Daniel Kouril. All rights reserved.
8 *

--- 14 unchanged lines hidden (view full) ---

23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include "includes.h"
1/*
2 * Kerberos v5 authentication and ticket-passing routines.
3 *
4 * $xFreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp$
5 */
6/*
7 * Copyright (c) 2002 Daniel Kouril. All rights reserved.
8 *

--- 14 unchanged lines hidden (view full) ---

23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include "includes.h"
31RCSID("$OpenBSD: auth-krb5.c,v 1.9 2002/09/09 06:48:06 itojun Exp $");
32RCSID("$FreeBSD: head/crypto/openssh/auth-krb5.c 106130 2002-10-29 10:16:02Z des $");
31RCSID("$OpenBSD: auth-krb5.c,v 1.10 2002/11/21 23:03:51 deraadt Exp $");
32RCSID("$FreeBSD: head/crypto/openssh/auth-krb5.c 113911 2003-04-23 17:13:13Z des $");
33
34#include "ssh.h"
35#include "ssh1.h"
36#include "packet.h"
37#include "xmalloc.h"
38#include "log.h"
39#include "servconf.h"
40#include "uidswap.h"

--- 62 unchanged lines hidden (view full) ---

103 problem = krb5_auth_con_genaddrs(authctxt->krb5_ctx,
104 authctxt->krb5_auth_ctx,fd,
105 KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR |
106 KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR);
107#endif
108 if (problem)
109 goto err;
110
33
34#include "ssh.h"
35#include "ssh1.h"
36#include "packet.h"
37#include "xmalloc.h"
38#include "log.h"
39#include "servconf.h"
40#include "uidswap.h"

--- 62 unchanged lines hidden (view full) ---

103 problem = krb5_auth_con_genaddrs(authctxt->krb5_ctx,
104 authctxt->krb5_auth_ctx,fd,
105 KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR |
106 KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR);
107#endif
108 if (problem)
109 goto err;
110
111 problem = krb5_sname_to_principal(authctxt->krb5_ctx, NULL, NULL ,
111 problem = krb5_sname_to_principal(authctxt->krb5_ctx, NULL, NULL,
112 KRB5_NT_SRV_HST, &server);
113 if (problem)
114 goto err;
115
116 problem = krb5_rd_req(authctxt->krb5_ctx, &authctxt->krb5_auth_ctx,
117 auth, server, NULL, NULL, &ticket);
118 if (problem)
119 goto err;

--- 287 unchanged lines hidden ---
112 KRB5_NT_SRV_HST, &server);
113 if (problem)
114 goto err;
115
116 problem = krb5_rd_req(authctxt->krb5_ctx, &authctxt->krb5_auth_ctx,
117 auth, server, NULL, NULL, &ticket);
118 if (problem)
119 goto err;

--- 287 unchanged lines hidden ---