* 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

@ -586,8 +586,8 @@ cygheap_pwdgrp::init ()
db_separator: + DISABLED
db_enum: cache builtin
*/
pwd_src = (NSS_FILES | NSS_DB);
grp_src = (NSS_FILES | NSS_DB);
pwd_src = (NSS_SRC_FILES | NSS_SRC_DB);
grp_src = (NSS_SRC_FILES | NSS_SRC_DB);
prefix = NSS_AUTO;
separator[0] = L'+';
enums = (ENUM_CACHE | ENUM_BUILTIN);
@ -628,12 +628,12 @@ cygheap_pwdgrp::nss_init_line (const char *line)
break;
if (!strncmp (c, "files", 5) && strchr (" \t", c[5]))
{
*src |= NSS_FILES;
*src |= NSS_SRC_FILES;
c += 5;
}
else if (!strncmp (c, "db", 2) && strchr (" \t", c[2]))
{
*src |= NSS_DB;
*src |= NSS_SRC_DB;
c += 2;
}
else
@ -643,7 +643,7 @@ cygheap_pwdgrp::nss_init_line (const char *line)
}
}
if (*src == 0)
*src = (NSS_FILES | NSS_DB);
*src = (NSS_SRC_FILES | NSS_SRC_DB);
}
}
break;