/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2015-07-02 18:22:22 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150702182222-034v03mb8orwhezn
mandos-client: Minor changes to check for more error conditions.

* mandos-client.c (add_remove_local_route): Do TEMP_FAILURE_RETRY
                                            around closing of
                                            /dev/null.  Check return
                                            value when opening helper
                                            directory and helper
                                            executable.
  (run_network_hooks): Cast return value of TEMP_FAILURE_RETRY to int.
                       Do TEMP_FAILURE_RETRY around closing of
                       /dev/null.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2012-05-26">
 
6
<!ENTITY TIMESTAMP "2013-10-23">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
36
36
      <year>2009</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
 
39
      <year>2013</year>
39
40
      <holder>Teddy Hogeborn</holder>
40
41
      <holder>Björn Påhlsson</holder>
41
42
    </copyright>
120
121
        <term><option>priority<literal> = </literal><replaceable
121
122
        >STRING</replaceable></option></term>
122
123
        <listitem>
123
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
124
          <xi:include href="mandos-options.xml"
 
125
                      xpointer="priority_compat"/>
124
126
        </listitem>
125
127
      </varlistentry>
126
128