← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to openbsd-compat/fake-rfc2553.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-09-30 23:09:58 UTC
  • mfrom: (1.13.3 upstream) (29 hardy)
  • mto: This revision was merged to the branch mainline in revision 43.
  • Revision ID: james.westby@ubuntu.com-20080930230958-o6vsgn8c4mm959s0
Tags: 1:5.1p1-3
http://bugs.debian.org/496495
http://bugs.debian.org/498681
* Remove unnecessary ssh-vulnkey output in non-verbose mode when no
  compromised or unknown keys were found (closes: #496495).
* Configure with --disable-strip; dh_strip will deal with stripping
  binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
  closes: #498681).
* Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
  #497026).

Show diffs side-by-side

added added

removed removed

Lines of Context:
openbsd-compat/fake-rfc2553.h
1
 
/* $Id: fake-rfc2553.h,v 1.13 2006/07/24 03:51:52 djm Exp $ */
 
1
/* $Id: fake-rfc2553.h,v 1.16 2008/07/14 11:37:37 djm Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
77
77
        u_int16_t       sin6_port;
78
78
        u_int32_t       sin6_flowinfo;
79
79
        struct in6_addr sin6_addr;
 
80
        u_int32_t       sin6_scope_id;
80
81
};
81
82
#endif /* !HAVE_STRUCT_SOCKADDR_IN6 */
82
83
 
128
129
#ifndef EAI_SYSTEM
129
130
# define EAI_SYSTEM     (INT_MAX - 4)
130
131
#endif
 
132
#ifndef EAI_FAMILY
 
133
# define EAI_FAMILY     (INT_MAX - 5)
 
134
#endif
131
135
 
132
136
#ifndef HAVE_STRUCT_ADDRINFO
133
137
struct addrinfo {
152
156
#endif /* !HAVE_GETADDRINFO */
153
157
 
154
158
#if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO)
155
 
#define gai_strerror(a)         (ssh_gai_strerror(a))
 
159
#define gai_strerror(a)         (_ssh_compat_gai_strerror(a))
156
160
char *gai_strerror(int);
157
161
#endif /* !HAVE_GAI_STRERROR */
158
162