diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2022-12-02 17:13:24 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2022-12-02 18:35:31 +0300 |
| commit | 3b37a11870d5eb7880018955e88771c251c2c608 (patch) | |
| tree | d21e27da57298e19bb9de8d467f93c0bb2f944d1 /winsup/cygwin/local_includes/cygheap.h | |
| parent | 30add3e6b3e3211b3e2d4a093f45bee5c6e24b8b (diff) | |
Cygwin: uinfo: Drop long disabled nss_prefix and nss_separator
Originally the code was written to allow three ways of prefixing
accounts and to freely define a domain/account separator. This code
has been disabled even before being officially released, and it was
never re-enabled. Given there has been no complaints for eight years
now, drop this code eventually. Just add a macro to define the
domain/account separator statically.
Fixes: cc332c9e271b ("(cygheap_pwdgrp::nss_init_line): Disable db_prefix
and db_separator settings. Add comment")
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/local_includes/cygheap.h')
| -rw-r--r-- | winsup/cygwin/local_includes/cygheap.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/winsup/cygwin/local_includes/cygheap.h b/winsup/cygwin/local_includes/cygheap.h index e671c3d32..347cbf448 100644 --- a/winsup/cygwin/local_includes/cygheap.h +++ b/winsup/cygwin/local_includes/cygheap.h @@ -393,13 +393,11 @@ public: { return rfc2307_domain_buf ?: NULL; } }; +#define NSS_SEPARATOR_STRING L"+" +#define NSS_SEPARATOR_CHAR (NSS_SEPARATOR_STRING[0]) + class cygheap_pwdgrp { - enum nss_pfx_t { - NSS_PFX_AUTO = 0, - NSS_PFX_PRIMARY, - NSS_PFX_ALWAYS - }; public: enum nss_scheme_method { NSS_SCHEME_FALLBACK = 0, @@ -418,8 +416,6 @@ private: bool nss_inited; uint32_t pwd_src; uint32_t grp_src; - nss_pfx_t prefix; - WCHAR separator[2]; bool caching; #define NSS_SCHEME_MAX 4 @@ -458,10 +454,6 @@ public: 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_PFX_AUTO; } - inline bool nss_prefix_primary () const { return prefix == NSS_PFX_PRIMARY; } - inline bool nss_prefix_always () const { return prefix == NSS_PFX_ALWAYS; } - inline PCWSTR nss_separator () const { return separator; } inline bool nss_cygserver_caching () const { return caching; } inline void nss_disable_cygserver_caching () { caching = false; } |