From 54f79f8650452cafde18d54d54c38d0990a91eda Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 12 Nov 2014 11:19:08 +0000 Subject: * 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. --- winsup/cygwin/include/sys/cygwin.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/include/sys/cygwin.h') diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h index 7f40475e8..edfcc565a 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -151,7 +151,9 @@ typedef enum CW_GETPWSID, CW_GETGRSID, CW_CYGNAME_FROM_WINNAME, - CW_FIXED_ATEXIT + CW_FIXED_ATEXIT, + CW_GETNSS_PWD_SRC, + CW_GETNSS_GRP_SRC } cygwin_getinfo_types; #define CW_LOCK_PINFO CW_LOCK_PINFO @@ -210,6 +212,8 @@ typedef enum #define CW_GETGRSID CW_GETGRSID #define CW_CYGNAME_FROM_WINNAME CW_CYGNAME_FROM_WINNAME #define CW_FIXED_ATEXIT CW_FIXED_ATEXIT +#define CW_GETNSS_PWD_SRC CW_GETNSS_PWD_SRC +#define CW_GETNSS_GRP_SRC CW_GETNSS_GRP_SRC /* Token type for CW_SET_EXTERNAL_TOKEN */ enum @@ -218,6 +222,13 @@ enum CW_TOKEN_RESTRICTED = 1 }; +/* Source type for CW_GETNSS_PWD_SRC and CW_GETNSS_GRP_SRC. */ +enum +{ + NSS_SRC_FILES = 1, + NSS_SRC_DB = 2 +}; + /* Enumeration source constants for CW_SETENT called from mkpasswd/mkgroup. */ enum nss_enum_t { -- cgit v1.2.3