JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: accounts: Unify nsswitch.conf db_* defaults

Browse Source 
Signed-off-by: David Macek <david.macek.0@gmail.com>
This commit is contained in:
David Macek via Cygwin-patches 2020-04-21 20:31:09 +02:00 committed by Corinna Vinschen
parent f47347716c
commit d5add9ee5e
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/uinfo.cc
View File

@ -626,15 +626,12 @@ cygheap_pwdgrp::init ()
grp_cache.cygserver.init_grp (); grp_cache.cygserver.init_grp ();
grp_cache.file.init_grp (); grp_cache.file.init_grp ();
grp_cache.win.init_grp (); grp_cache.win.init_grp ();
/* Default settings: /* Default settings (excluding fallbacks):
passwd: files db passwd: files db
group: files db group: files db
db_prefix: auto DISABLED db_prefix: auto DISABLED
db_separator: + DISABLED db_separator: + DISABLED
db_home: cygwin desc
db_shell: cygwin desc
db_gecos: cygwin desc
db_enum: cache builtin db_enum: cache builtin
*/ */
pwd_src = (NSS_SRC_FILES | NSS_SRC_DB); pwd_src = (NSS_SRC_FILES | NSS_SRC_DB);
@ -831,12 +828,6 @@ cygheap_pwdgrp::nss_init_line (const char *line)
c += strspn (c, " \t"); c += strspn (c, " \t");
++idx; ++idx;
} }
/* If nothing has been set, revert to default. */
if (scheme[0].method == NSS_SCHEME_FALLBACK)
{
scheme[0].method = NSS_SCHEME_CYGWIN;
scheme[1].method = NSS_SCHEME_DESC;
}
} }
} }
break; break;

21
winsup/doc/ntsec.xml
View File

@ -1507,19 +1507,16 @@ of each schema when used with <literal>db_home:</literal>
</variablelist> </variablelist>
<para> <para>
As has been briefly mentioned before, the default setting for <literal>db_home:</literal> defines no default schemata. If this setting is not
<literal>db_home:</literal> is present in <filename>/etc/nsswitch.conf</filename>, the aforementioned fallback
takes over, which is equivalent to a <filename>/etc/nsswitch.conf</filename>
settting of
</para> </para>
<screen> <screen>
db_home: /home/%U db_home: /home/%U
</screen> </screen>
<para>
So by default, Cygwin just sets the home dir to
<filename>/home/$USERNAME</filename>.
</para>
</sect4> </sect4>
<sect4 id="ntsec-mapping-nsswitch-shell"> <sect4 id="ntsec-mapping-nsswitch-shell">
@ -1590,8 +1587,10 @@ when used with <literal>db_shell:</literal>
</variablelist> </variablelist>
<para> <para>
As for <literal>db_home:</literal>, the default setting for <literal>db_shell:</literal> defines no default schemata. If this setting is
<literal>db_shell:</literal> is pretty much a constant not present in <filename>/etc/nsswitch.conf</filename>, the aforementioned
fallback takes over, which is equivalent to a
<filename>/etc/nsswitch.conf</filename> settting of
</para> </para>
<screen> <screen>
@ -1664,13 +1663,13 @@ The following list describes the meaning of each schema when used with
<varlistentry> <varlistentry>
<term>Fallback</term> <term>Fallback</term>
<listitem>If none of the schemes given for <literal>db_gecos:</literal> <listitem>If none of the schemes given for <literal>db_gecos:</literal>
define a non-empty pathname, nothing is added to define a non-empty string, nothing is added to
<literal>pw_gecos</literal>.</listitem> <literal>pw_gecos</literal>.</listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para> <para>
The default setting for <literal>db_gecos:</literal> is the empty string. <literal>db_gecos:</literal> defines no default schemata.
</para> </para>
</sect4> </sect4>