~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to nss/nsswitch.h

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* Copyright (C) 1996-1999,2001,2002,2003,2004,2007,2010,2011
2
 
   Free Software Foundation, Inc.
 
1
/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
3
2
   This file is part of the GNU C Library.
4
3
 
5
4
   The GNU C Library is free software; you can redistribute it and/or
118
117
/* Flags whether custom rules for database is set.  */
119
118
extern bool __nss_database_custom[NSS_DBSIDX_max];
120
119
 
 
120
/* Warning for NSS functions, which don't require dlopen if glibc
 
121
   was built with --enable-static-nss.  */
 
122
#ifdef DO_STATIC_NSS
 
123
# define nss_interface_function(name)
 
124
#else
 
125
# define nss_interface_function(name) static_link_warning (name)
 
126
#endif
 
127
 
121
128
 
122
129
/* Interface functions for NSS.  */
123
130
 
208
215
                                       int *h_errnop);
209
216
libc_hidden_proto (__nss_hostname_digits_dots)
210
217
 
 
218
/* Maximum number of aliases we allow.  */
 
219
#define MAX_NR_ALIASES  48
 
220
#define MAX_NR_ADDRS    48
 
221
 
211
222
#endif  /* nsswitch.h */