mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 04:43:53 +00:00
openssh: diff reduction against upstream 7.9p1
Clean up whitespace and nonfunctional differences, and unused functions.
This commit is contained in:
parent
5cc82c563e
commit
6eac665c81
|
@ -313,7 +313,6 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
|
|||
"(%s,%s) -> (%s,%s)",
|
||||
authctxt->user, authctxt->service, user, service);
|
||||
}
|
||||
|
||||
/* reset state */
|
||||
auth2_challenge_stop(ssh);
|
||||
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
|
||||
#ifdef GSSAPI
|
||||
|
||||
#if defined(HAVE_GSSAPI_GSSAPI_H)
|
||||
#include <gssapi/gssapi.h>
|
||||
#elif defined(HAVE_GSSAPI_H)
|
||||
#ifdef HAVE_GSSAPI_H
|
||||
#include <gssapi.h>
|
||||
#elif defined(HAVE_GSSAPI_GSSAPI_H)
|
||||
#include <gssapi/gssapi.h>
|
||||
#endif
|
||||
|
||||
#ifdef KRB5
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "xmalloc.h"
|
||||
#include "ssherr.h"
|
||||
#include "sshbuf.h"
|
||||
|
||||
|
|
|
@ -176,14 +176,6 @@ int sshbuf_put_u32(struct sshbuf *buf, u_int32_t val);
|
|||
int sshbuf_put_u16(struct sshbuf *buf, u_int16_t val);
|
||||
int sshbuf_put_u8(struct sshbuf *buf, u_char val);
|
||||
|
||||
#if defined(__FreeBSD__) && defined(__i386__)
|
||||
#define sshbuf_get_time(b, vp) sshbuf_get_u32((b), (u_int32_t *)(vp))
|
||||
#define sshbuf_put_time(b, v) sshbuf_put_u32((b), (u_int32_t)(v))
|
||||
#else
|
||||
#define sshbuf_get_time(b, vp) sshbuf_get_u64((b), (u_int64_t *)(vp))
|
||||
#define sshbuf_put_time(b, v) sshbuf_put_u64((b), (u_int64_t)(v))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Functions to extract or store SSH wire encoded strings (u32 len || data)
|
||||
* The "cstring" variants admit no \0 characters in the string contents.
|
||||
|
|
Loading…
Reference in a new issue