* cygheap.h (cygheap_pwdgrp): Remove constants NSS_FILES and NSS_DB.

Use NSS_SRC_FILES and NSS_SRC_DB throughout instead.
	(cygheap_pwdgrp::nss_pwd_src): New inline method.
	(cygheap_pwdgrp::nss_grp_src): Ditto.
	* external.cc (cygwin_internal): Add CW_GETNSS_PWD_SRC and
	CW_GETNSS_GRP_SRC cases.
	* uinfo.cc: Use NSS_SRC_FILES and NSS_SRC_DB throughout.
	* include/cygwin/version.h (CYGWIN_VERSION_API_MINOR): Bump.
	* include/sys/cygwin.h (cygwin_getinfo_types): Add CW_GETNSS_PWD_SRC
	and CW_GETNSS_GRP_SRC.
	(NSS_SRC_FILES): Define.
	(NSS_SRC_DB): Define.
This commit is contained in:
Corinna Vinschen
2014-11-12 11:19:08 +00:00
parent 3dce84ad07
commit 54f79f8650
6 changed files with 48 additions and 13 deletions

View File

@@ -400,8 +400,6 @@ public:
class cygheap_pwdgrp
{
static const int NSS_FILES = 1;
static const int NSS_DB = 2;
enum pfx_t {
NSS_AUTO = 0,
NSS_PRIMARY,
@@ -434,10 +432,12 @@ public:
void init ();
inline void nss_init () { if (!nss_inited) _nss_init (); }
inline bool nss_pwd_files () const { return !!(pwd_src & NSS_FILES); }
inline bool nss_pwd_db () const { return !!(pwd_src & NSS_DB); }
inline bool nss_grp_files () const { return !!(grp_src & NSS_FILES); }
inline bool nss_grp_db () const { return !!(grp_src & NSS_DB); }
inline bool nss_pwd_files () const { return !!(pwd_src & NSS_SRC_FILES); }
inline bool nss_pwd_db () const { return !!(pwd_src & NSS_SRC_DB); }
inline int nss_pwd_src () const { return pwd_src; } /* CW_GETNSS_PWD_SRC */
inline bool nss_grp_files () const { return !!(grp_src & NSS_SRC_FILES); }
inline bool nss_grp_db () const { return !!(grp_src & NSS_SRC_DB); }
inline int nss_grp_src () const { return grp_src; } /* CW_GETNSS_GRP_SRC */
inline bool nss_prefix_auto () const { return prefix == NSS_AUTO; }
inline bool nss_prefix_primary () const { return prefix == NSS_PRIMARY; }
inline bool nss_prefix_always () const { return prefix == NSS_ALWAYS; }