On 28/03/2023 11:35, Corinna Vinschen wrote:
Apart from the doc change, the patch is ok now.

The preceding text says "Four schema are predefined, two schemata are variable", then we add "env" to both lists? That doesn't make much sense to me. Surely it's just a "predefined schema"? In any case that text should be updated.

On Mar 28 10:17, Johannes Schindelin wrote:
diff --git a/winsup/doc/ntsec.xml b/winsup/doc/ntsec.xml
index c6871ecf05..1678ff6575 100644
--- a/winsup/doc/ntsec.xml
+++ b/winsup/doc/ntsec.xml
@@ -1203,6 +1203,17 @@ schemata are the following:
              See <xref linkend="ntsec-mapping-nsswitch-desc"></xref>
              for a more detailed description.</listitem>
    </varlistentry>
+  <varlistentry>
+    <term><literal>env</literal></term>
+    <listitem>Derives the home directory of the current user from the
+             environment variable <literal>HOME</literal> (falling back to
+             <literal>HOMEDRIVE\HOMEPATH</literal> and
+             <literal>USERPROFILE</literal>, in that order).  This is faster
+             than the <term><literal>windows</literal></term> schema at the
+             expense of determining only the current user's home directory
+             correctly.  This schema is skipped for any other account.
+             </listitem>
+  </varlistentry>
  </variablelist>

I'd rephrase that a bit here.  This is the description of the scheme
itself, so this should be something along the lines of "utilizes the
current environment ..." and "Right now only valid for db_home, see xref
linkend="ntsec-mapping-nsswitch-home"...

However, there's something strange going on, see below.

  <para>
@@ -1335,6 +1346,17 @@ of each schema when used with <literal>db_home:</literal>
              See <xref linkend="ntsec-mapping-nsswitch-desc"></xref>
              for a detailed description.</listitem>
    </varlistentry>
+  <varlistentry>
+    <term><literal>env</literal></term>
+    <listitem>Derives the home directory of the current user from the
+             environment variable <literal>HOME</literal> (falling back to
+             <literal>HOMEDRIVE\HOMEPATH</literal> and
+             <literal>USERPROFILE</literal>, in that order).  This is faster
+             than the <term><literal>windows</literal></term> schema at the

I think drop wrapping in <term> here should fix the error below. It's not valid docbook here.

+             expense of determining only the current user's home directory
+             correctly.  This schema is skipped for any other account.
+             </listitem>
+  </varlistentry>
    <varlistentry>
      <term><literal>@ad_attribute</literal></term>
      <listitem>AD only: The user's home directory is set to the path given

There's something wrong here. Building the docs, I get these new error
messages:

   
docbook2texi://sect4[@id='ntsec-mapping-nsswitch-passwd']/variablelist[1]/varlistentry[5]/listitem/term:
 element not matched by any template
   
docbook2texi://sect4[@id='ntsec-mapping-nsswitch-home']/variablelist/varlistentry[5]/listitem/term:
 element not matched by any template
   Element term in namespace '' encountered in listitem, but no template 
matches.
   Element term in namespace '' encountered in listitem, but no template 
matches.
   Element term in namespace '' encountered in listitem, but no template 
matches.
   Element term in namespace '' encountered in listitem, but no template 
matches.
   No template matches term in listitem.
   No template matches term in listitem.

It looks like this has something to do with the <term> expression?

Jon, do you have an idea?


Reply via email to