PolicyKit: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Fri Aug 24 14:19:57 PDT 2007
configure.in | 56 --
doc/Makefile.am | 76 ++-
doc/api/Makefile.am | 9
doc/api/polkit-dbus/Makefile.am | 67 --
doc/api/polkit-dbus/polkit-dbus-docs.xml | 109 ----
doc/api/polkit-dbus/version.xml.in | 1
doc/api/polkit-grant/Makefile.am | 67 --
doc/api/polkit-grant/polkit-grant-docs.xml | 109 ----
doc/api/polkit-grant/version.xml.in | 1
doc/api/polkit/Makefile.am | 67 --
doc/api/polkit/polkit-docs.xml | 121 ----
doc/api/polkit/version.xml.in | 1
doc/man/Makefile.am | 29 -
doc/man/PolicyKit.conf.xml | 711 ++++++++++++++---------------
doc/man/PolicyKit.xml | 136 ++---
doc/man/polkit-config-file-validate.xml | 199 +++-----
doc/man/polkit-grant.xml | 239 ++++-----
doc/man/polkit-list-actions.xml | 191 +++----
doc/man/polkit-policy-file-validate.xml | 197 +++-----
doc/spec/Makefile.am | 30 -
doc/spec/config.xsl | 6
doc/spec/docbook.css | 18
doc/spec/polkit-spec.xml.in.in | 26 -
polkit-grant/polkit-grant-helper.c | 2
polkit/polkit-config.c | 8
polkit/polkit-config.h | 2
polkit/polkit-context.c | 25 -
polkit/polkit-context.h | 2
tools/Makefile.am | 9
tools/polkit-list-actions.c | 3
30 files changed, 937 insertions(+), 1580 deletions(-)
New commits:
diff-tree aa5d6085a352ef764980b2b78ac47f1625d4fa03 (from 7b3f73291a742e8ef41cd4b63dcbb79d599c88ad)
Author: David Zeuthen <davidz at redhat.com>
Date: Fri Aug 24 17:15:26 2007 -0400
clean up our documentation
- Put all three libraries in the same gtk-doc project
- Include the spec in the gtk-doc project
- Include the manual pages in the gtk-doc project
diff --git a/configure.in b/configure.in
index 4cdcc31..19f745e 100644
--- a/configure.in
+++ b/configure.in
@@ -29,10 +29,20 @@ AC_SYS_LARGEFILE
# Taken from dbus
AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(docbook-docs, [ --enable-docbook-docs build documentation (requires xmlto)],enable_docbook_docs=$enableval,enable_docbook_docs=no)
+
AC_ARG_ENABLE(man-pages, [ --enable-man-pages build manual pages],enable_man_pages=$enableval,enable_man_pages=yes)
+if test "${enable_man_page}" != no; then
+dnl
+dnl Check for xsltproc
+dnl
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test -z "$XSLTPROC"; then
+ enable_man_pages=no
+ fi
+fi
AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
+
GTK_DOC_CHECK([1.3])
#### gcc warning flags
@@ -141,36 +151,6 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP
[AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS)
-# DocBook Documentation
-
-AC_MSG_CHECKING([whether to build DocBook documentation])
-
-AC_PATH_PROG(XMLTO, xmlto, no)
-AC_PATH_PROG(XMLLINT, xmllint, no)
-
-if test x$XMLLINT = xno ; then
- have_xmllint=no
-else
- have_xmllint=yes
-fi
-
-if test x$enable_docbook_docs = xauto ; then
- if test x$have_xmlto = xno || test x$have_xmllint = xno ; then
- enable_docbook_docs=no
- else
- enable_docbook_docs=yes
- fi
-fi
-
-if test x$enable_docbook_docs = xyes; then
- if test x$have_xmlto = xno; then
- AC_MSG_ERROR([Building DocBook docs explicitly required, but xmlto not found])
- fi
-fi
-
-AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes)
-AC_MSG_RESULT(yes)
-
if test "x$GCC" = "xyes"; then
LDFLAGS="-Wl,--as-needed $LDFLAGS"
fi
@@ -390,15 +370,7 @@ polkit-dbus/Makefile
polkit-grant/Makefile
tools/Makefile
doc/Makefile
-doc/api/Makefile
-doc/api/polkit/Makefile
-doc/api/polkit/version.xml
-doc/api/polkit-dbus/Makefile
-doc/api/polkit-dbus/version.xml
-doc/api/polkit-grant/Makefile
-doc/api/polkit-grant/version.xml
-doc/spec/Makefile
-doc/spec/polkit-spec.xml.in
+doc/version.xml
doc/man/Makefile
policy/Makefile
])
@@ -421,8 +393,7 @@ echo "
compiler: ${CC}
cflags: ${CFLAGS}
cppflags: ${CPPFLAGS}
- xmlto: ${XMLTO}
- xmllint: ${XMLLINT}
+ xsltproc: ${XSLTPROC}
user for PolicyKit: ${POLKIT_USER}
group for PolicyKit: ${POLKIT_GROUP}
@@ -439,7 +410,6 @@ echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
Building verbose mode: ${enable_verbose_mode}
Building api docs: ${enable_gtk_doc}
- Building docs: ${enable_docbook_docs}
Building man pages: ${enable_man_pages}
"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d27607..2389a0b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,75 @@
+## Process this file with automake to create Makefile.in.
-EXTRA_DIST = TODO
+SUBDIRS = man
-SUBDIRS = api spec man
+NULL =
-clean-local:
- rm -f *~
+AUTOMAKE_OPTIONS = 1.7
+
+# The name of the module.
+DOC_MODULE=polkit
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=polkit-docs.xml
+
+# Extra options to supply to gtkdoc-scan
+#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
+
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=..
+
+# Used for dependencies
+HFILE_GLOB=$(top_srcdir)/polkit*/*.h
+CFILE_GLOB=$(top_srcdir)/polkit*/*.c
+
+# Headers to ignore
+IGNORE_HFILES= \
+ $(NULL)
+
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+INCLUDES = \
+ $(GLIB_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(NULL)
+
+GTKDOC_LIBS = \
+ $(GLIB_LIBS) \
+ $(top_builddir)/polkit/libpolkit.la \
+ $(NULL)
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+MKTMPL_OPTIONS=
+
+# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
+content_files = \
+ version.xml \
+ man/PolicyKit.xml \
+ man/PolicyKit.conf.xml \
+ man/polkit-grant.xml \
+ man/polkit-list-actions.xml \
+ man/polkit-policy-file-validate.xml \
+ man/polkit-config-file-validate.xml \
+ $(NULL)
+
+# Images to copy into HTML directory
+HTML_IMAGES =
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=
+
+MAINTAINERCLEANFILES = \
+ *~ \
+ Makefile.in \
+ polkit.types \
+ polkit-*.txt \
+ $(NULL)
+
+include $(top_srcdir)/gtk-doc.make
+
+# Version information for marking the documentation
+EXTRA_DIST += version.xml.in
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
deleted file mode 100644
index 81fbf84..0000000
--- a/doc/api/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-SUBDIRS = polkit polkit-dbus polkit-grant
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- $(NULL)
-
diff --git a/doc/api/polkit-dbus/Makefile.am b/doc/api/polkit-dbus/Makefile.am
deleted file mode 100644
index 6427986..0000000
--- a/doc/api/polkit-dbus/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-NULL =
-
-AUTOMAKE_OPTIONS = 1.7
-
-# The name of the module.
-DOC_MODULE=polkit-dbus
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=polkit-dbus-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../polkit-dbus
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/polkit-dbus/*.h
-CFILE_GLOB=$(top_srcdir)/polkit-dbus/*.c
-
-# Headers to ignore
-IGNORE_HFILES= \
- $(NULL)
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
- $(GLIB_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(NULL)
-
-GTKDOC_LIBS = \
- $(GLIB_LIBS) \
- $(top_builddir)/polkit-dbus/libpolkit-dbus.la \
- $(NULL)
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-MKTMPL_OPTIONS=
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files = \
- version.xml \
- $(NULL)
-
-# Images to copy into HTML directory
-HTML_IMAGES =
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- polkit-dbus.types \
- polkit-dbus-*.txt \
- $(NULL)
-
-include $(top_srcdir)/gtk-doc.make
-
-# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
diff --git a/doc/api/polkit-dbus/polkit-dbus-docs.xml b/doc/api/polkit-dbus/polkit-dbus-docs.xml
deleted file mode 100644
index ed64c6d..0000000
--- a/doc/api/polkit-dbus/polkit-dbus-docs.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
- <bookinfo>
- <title>PolicyKit D-Bus Helper Library Reference Manual</title>
- <releaseinfo>Version &version;</releaseinfo>
- <authorgroup>
- <author>
- <firstname>David</firstname>
- <surname>Zeuthen</surname>
- <affiliation>
- <address>
- <email>david at fubar.dk</email>
- </address>
- </affiliation>
- </author>
- </authorgroup>
-
- <copyright>
- <year>2007</year>
- <holder>The PolicyKit Authors</holder>
- </copyright>
-
- <legalnotice>
- <para>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the <citetitle>GNU Free
- Documentation License</citetitle>, Version 1.1 or any later
- version published by the Free Software Foundation with no
- Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. You may obtain a copy of the <citetitle>GNU Free
- Documentation License</citetitle> from the Free Software
- Foundation by visiting <ulink type="http"
- url="http://www.fsf.org">their Web site</ulink> or by writing
- to:
-
- <address>
- The Free Software Foundation, Inc.,
- <street>59 Temple Place</street> - Suite 330,
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
- <country>USA</country>
- </address>
- </para>
-
- <para>
- Many of the names used by companies to distinguish their
- products and services are claimed as trademarks. Where those
- names appear in any GNOME documentation, and those trademarks
- are made aware to the members of the GNOME Documentation
- Project, the names have been printed in caps or initial caps.
- </para>
- </legalnotice>
- </bookinfo>
-
- <reference>
- <title>API Reference</title>
-
- <partintro>
- <para>
- This part presents the class and function reference for the
- PolicyKit D-Bus helper library.
- </para>
- </partintro>
- <xi:include href="xml/polkit-dbus.xml"/>
- </reference>
-
- <index>
- <title>Index</title>
- </index>
-
- <!-- License -->
-
- <appendix id="license">
- <title>License</title>
-
- <para>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the <citetitle>GNU General
- Public License</citetitle> as published by the Free Software
- Foundation; either version 2 of the License, or (at your option)
- any later version.
- </para>
-
- <para>
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- <citetitle>GNU Library General Public License</citetitle> for
- more details.
- </para>
-
- <para>
- You may obtain a copy of the <citetitle>GNU General
- Public License</citetitle> from the Free Software Foundation by
- visiting <ulink type="http" url="http://www.fsf.org">their Web
- site</ulink> or by writing to:
-
- <address>
- Free Software Foundation, Inc.
- <street>59 Temple Place</street> - Suite 330
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
- <country>USA</country>
- </address>
- </para>
- </appendix>
-</book>
diff --git a/doc/api/polkit-dbus/polkit-dbus.types b/doc/api/polkit-dbus/polkit-dbus.types
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/api/polkit-dbus/version.xml.in b/doc/api/polkit-dbus/version.xml.in
deleted file mode 100644
index d78bda9..0000000
--- a/doc/api/polkit-dbus/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
- at VERSION@
diff --git a/doc/api/polkit-grant/Makefile.am b/doc/api/polkit-grant/Makefile.am
deleted file mode 100644
index b0a3bab..0000000
--- a/doc/api/polkit-grant/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-NULL =
-
-AUTOMAKE_OPTIONS = 1.7
-
-# The name of the module.
-DOC_MODULE=polkit-grant
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=polkit-grant-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../polkit-grant
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/polkit-grant/*.h
-CFILE_GLOB=$(top_srcdir)/polkit-grant/*.c
-
-# Headers to ignore
-IGNORE_HFILES= \
- $(NULL)
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
- $(GLIB_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(NULL)
-
-GTKDOC_LIBS = \
- $(GLIB_LIBS) \
- $(top_builddir)/polkit-grant/libpolkit-grant.la \
- $(NULL)
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-MKTMPL_OPTIONS=
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files = \
- version.xml \
- $(NULL)
-
-# Images to copy into HTML directory
-HTML_IMAGES =
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- polkit-grant.types \
- polkit-grant-*.txt \
- $(NULL)
-
-include $(top_srcdir)/gtk-doc.make
-
-# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
diff --git a/doc/api/polkit-grant/polkit-grant-docs.xml b/doc/api/polkit-grant/polkit-grant-docs.xml
deleted file mode 100644
index 41204c4..0000000
--- a/doc/api/polkit-grant/polkit-grant-docs.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
- <bookinfo>
- <title>PolicyKit Granting Library Reference Manual</title>
- <releaseinfo>Version &version;</releaseinfo>
- <authorgroup>
- <author>
- <firstname>David</firstname>
- <surname>Zeuthen</surname>
- <affiliation>
- <address>
- <email>david at fubar.dk</email>
- </address>
- </affiliation>
- </author>
- </authorgroup>
-
- <copyright>
- <year>2007</year>
- <holder>The PolicyKit Authors</holder>
- </copyright>
-
- <legalnotice>
- <para>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the <citetitle>GNU Free
- Documentation License</citetitle>, Version 1.1 or any later
- version published by the Free Software Foundation with no
- Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. You may obtain a copy of the <citetitle>GNU Free
- Documentation License</citetitle> from the Free Software
- Foundation by visiting <ulink type="http"
- url="http://www.fsf.org">their Web site</ulink> or by writing
- to:
-
- <address>
- The Free Software Foundation, Inc.,
- <street>59 Temple Place</street> - Suite 330,
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
- <country>USA</country>
- </address>
- </para>
-
- <para>
- Many of the names used by companies to distinguish their
- products and services are claimed as trademarks. Where those
- names appear in any GNOME documentation, and those trademarks
- are made aware to the members of the GNOME Documentation
- Project, the names have been printed in caps or initial caps.
- </para>
- </legalnotice>
- </bookinfo>
-
- <reference>
- <title>API Reference</title>
-
- <partintro>
- <para>
- This part presents the class and function reference for the
- PolicyKit granting helper library.
- </para>
- </partintro>
- <xi:include href="xml/polkit-grant.xml"/>
- </reference>
-
- <index>
- <title>Index</title>
- </index>
-
- <!-- License -->
-
- <appendix id="license">
- <title>License</title>
-
- <para>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the <citetitle>GNU General
- Public License</citetitle> as published by the Free Software
- Foundation; either version 2 of the License, or (at your option)
- any later version.
- </para>
-
- <para>
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- <citetitle>GNU Library General Public License</citetitle> for
- more details.
- </para>
-
- <para>
- You may obtain a copy of the <citetitle>GNU General
- Public License</citetitle> from the Free Software Foundation by
- visiting <ulink type="http" url="http://www.fsf.org">their Web
- site</ulink> or by writing to:
-
- <address>
- Free Software Foundation, Inc.
- <street>59 Temple Place</street> - Suite 330
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
- <country>USA</country>
- </address>
- </para>
- </appendix>
-</book>
diff --git a/doc/api/polkit-grant/polkit-grant.types b/doc/api/polkit-grant/polkit-grant.types
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/api/polkit-grant/version.xml.in b/doc/api/polkit-grant/version.xml.in
deleted file mode 100644
index d78bda9..0000000
--- a/doc/api/polkit-grant/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
- at VERSION@
diff --git a/doc/api/polkit/Makefile.am b/doc/api/polkit/Makefile.am
deleted file mode 100644
index 0b8d70a..0000000
--- a/doc/api/polkit/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Process this file with automake to create Makefile.in.
-
-NULL =
-
-AUTOMAKE_OPTIONS = 1.7
-
-# The name of the module.
-DOC_MODULE=polkit
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=polkit-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../polkit
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/polkit/*.h
-CFILE_GLOB=$(top_srcdir)/polkit/*.c
-
-# Headers to ignore
-IGNORE_HFILES= \
- $(NULL)
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
- $(GLIB_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(NULL)
-
-GTKDOC_LIBS = \
- $(GLIB_LIBS) \
- $(top_builddir)/polkit/libpolkit.la \
- $(NULL)
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-MKTMPL_OPTIONS=
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files = \
- version.xml \
- $(NULL)
-
-# Images to copy into HTML directory
-HTML_IMAGES =
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
-
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- polkit.types \
- polkit-*.txt \
- $(NULL)
-
-include $(top_srcdir)/gtk-doc.make
-
-# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
diff --git a/doc/api/polkit/polkit-docs.xml b/doc/api/polkit/polkit-docs.xml
deleted file mode 100644
index fd5f811..0000000
--- a/doc/api/polkit/polkit-docs.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
- <bookinfo>
- <title>PolicyKit Library Reference Manual</title>
- <releaseinfo>Version &version;</releaseinfo>
- <authorgroup>
- <author>
- <firstname>David</firstname>
- <surname>Zeuthen</surname>
- <affiliation>
- <address>
- <email>david at fubar.dk</email>
- </address>
- </affiliation>
- </author>
- </authorgroup>
-
- <copyright>
- <year>2007</year>
- <holder>The PolicyKit Authors</holder>
- </copyright>
-
- <legalnotice>
- <para>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the <citetitle>GNU Free
- Documentation License</citetitle>, Version 1.1 or any later
- version published by the Free Software Foundation with no
- Invariant Sections, no Front-Cover Texts, and no Back-Cover
- Texts. You may obtain a copy of the <citetitle>GNU Free
- Documentation License</citetitle> from the Free Software
- Foundation by visiting <ulink type="http"
- url="http://www.fsf.org">their Web site</ulink> or by writing
- to:
-
- <address>
- The Free Software Foundation, Inc.,
- <street>59 Temple Place</street> - Suite 330,
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
- <country>USA</country>
- </address>
- </para>
-
- <para>
- Many of the names used by companies to distinguish their
- products and services are claimed as trademarks. Where those
- names appear in any GNOME documentation, and those trademarks
- are made aware to the members of the GNOME Documentation
- Project, the names have been printed in caps or initial caps.
- </para>
- </legalnotice>
- </bookinfo>
-
- <reference>
- <title>API Reference</title>
-
- <partintro>
- <para>
- This part presents the class and function reference for the
- PolicyKit library.
- </para>
- </partintro>
- <xi:include href="xml/polkit-types.xml"/>
- <xi:include href="xml/polkit-error.xml"/>
- <xi:include href="xml/polkit-result.xml"/>
- <xi:include href="xml/polkit-context.xml"/>
- <xi:include href="xml/polkit-action.xml"/>
- <xi:include href="xml/polkit-policy-file.xml"/>
- <xi:include href="xml/polkit-policy-file-entry.xml"/>
- <xi:include href="xml/polkit-policy-default.xml"/>
- <xi:include href="xml/polkit-policy-cache.xml"/>
- <xi:include href="xml/polkit-seat.xml"/>
- <xi:include href="xml/polkit-session.xml"/>
- <xi:include href="xml/polkit-caller.xml"/>
- <xi:include href="xml/polkit-config.xml"/>
- </reference>
-
- <index>
- <title>Index</title>
- </index>
-
- <!-- License -->
-
- <appendix id="license">
- <title>License</title>
-
- <para>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the <citetitle>GNU General
- Public License</citetitle> as published by the Free Software
- Foundation; either version 2 of the License, or (at your option)
- any later version.
- </para>
-
- <para>
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- <citetitle>GNU Library General Public License</citetitle> for
- more details.
- </para>
-
- <para>
- You may obtain a copy of the <citetitle>GNU General
- Public License</citetitle> from the Free Software Foundation by
- visiting <ulink type="http" url="http://www.fsf.org">their Web
- site</ulink> or by writing to:
-
- <address>
- Free Software Foundation, Inc.
- <street>59 Temple Place</street> - Suite 330
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
- <country>USA</country>
- </address>
- </para>
- </appendix>
-</book>
diff --git a/doc/api/polkit/polkit.types b/doc/api/polkit/polkit.types
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/api/polkit/version.xml.in b/doc/api/polkit/version.xml.in
deleted file mode 100644
index d78bda9..0000000
--- a/doc/api/polkit/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
- at VERSION@
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 5771b67..4d6479a 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,22 +1,25 @@
if MAN_PAGES_ENABLED
-MAN_IN_FILES = polkit-check-caller.1.in polkit-check-session.1.in polkit-policy-file-validate.1.in PolicyKit.8.in PolicyKit.conf.5.in polkit-list-actions.1.in
-
-man_MANS = $(MAN_IN_FILES:.in=)
+man_MANS = polkit-grant.1 \
+ polkit-list-actions.1 \
+ polkit-config-file-validate.1 \
+ polkit-policy-file-validate.1 \
+ PolicyKit.conf.5 \
+ PolicyKit.8
+
+# TODO:
+%.1 %.5 %.8 : %.xml
+ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
endif # MAN_PAGES_ENABLED
-EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES)
+EXTRA_DIST= PolicyKit.conf.xml \
+ PolicyKit.xml \
+ polkit-config-file-validate.xml \
+ polkit-grant.xml \
+ polkit-list-actions.xml \
+ polkit-policy-file-validate.xml
clean-local:
rm -f *~ *.1 *.5 *.8
-
-%: %.in Makefile
- $(edit) $< >$@
-
-edit = sed \
- -e 's|@docdir[@]|$(docdir)|g' \
- -e 's|@sbindir[@]|$(sbindir)|g' \
- -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
- -e 's|@datadir[@]|$(datadir)|g'
diff --git a/doc/man/PolicyKit.conf.xml b/doc/man/PolicyKit.conf.xml
index b93d479..e931c14 100644
--- a/doc/man/PolicyKit.conf.xml
+++ b/doc/man/PolicyKit.conf.xml
@@ -1,323 +1,314 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<article>
- <section>
+<refentry>
+ <refentryinfo>
<title>PolicyKit.conf</title>
- <refentry>
- <refentryinfo>
- <title>PolicyKit.conf</title>
- <date>August 2007</date>
- <productname>PolicyKit</productname>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>PolicyKit.conf</refentrytitle>
- <manvolnum>5</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>PolicyKit.conf</refname>
- <refpurpose>PolicyKit configuration file</refpurpose>
- </refnamediv>
-
- <refsect1><title>DESCRIPTION</title>
- <para>
- The <filename>/etc/PolicyKit/PolicyKit.conf</filename>
- configuration file provides a way for system administrators
- to override policy for mechanisms that use the PolicyKit
- library to determine whether a caller is allowed to use the
- mechanism.
- </para>
-
- <para>
- Changes to this configuration file are immediately
- propagated to running processes using the PolicyKit
- library. If the configuration file is invalid, processes
- using this library will log this fact to the system logger
- and the library will only only
- return <emphasis>no</emphasis> as the answer to processes
- using it.
- </para>
-
- <para>
- The <citerefentry><refentrytitle>polkit-config-file-validate</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- tool can be used to verify that the configuration file is
- valid.
- </para>
- </refsect1>
-
- <refsect1>
- <title>FILE FORMAT</title>
- <para>
- The configuration file is an XML document. It must have the
- following doctype declaration:
- </para>
-
- <programlisting>
- <![CDATA[
+ <date>August 2007</date>
+ <productname>PolicyKit</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>PolicyKit.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>PolicyKit.conf</refname>
+ <refpurpose>PolicyKit configuration file</refpurpose>
+ </refnamediv>
+
+ <refsect1><title>DESCRIPTION</title>
+ <para>
+ The <filename>/etc/PolicyKit/PolicyKit.conf</filename>
+ configuration file provides a way for system administrators to
+ override policy for mechanisms that use the PolicyKit library to
+ determine whether a caller is allowed to use the mechanism.
+ </para>
+
+ <para>
+ Changes to this configuration file are immediately propagated to
+ running processes using the PolicyKit library. If the
+ configuration file is invalid, processes using this library will
+ log this fact to the system logger and the library will only
+ only return <emphasis>no</emphasis> as the answer to processes
+ using it.
+ </para>
+
+ <para>
+ The <citerefentry><refentrytitle>polkit-config-file-validate</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ tool can be used to verify that the configuration file is
+ valid.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>FILE FORMAT</title>
+ <para>
+ The configuration file is an XML document. It must have the
+ following doctype declaration:
+ </para>
+
+ <programlisting>
+ <![CDATA[
<!DOCTYPE pkconfig PUBLIC
"-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
"http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd">
]]>
- </programlisting>
-
- <para>
- The following elements may be present in the configuration file:
- </para>
-
- <refsect2>
- <title>config</title>
- <para>
- This is the root element. A single
- attribute <emphasis>version</emphasis> must be present and
- must be set to "0.1" at this point. There can only be one
- <emphasis>config</emphasis> element in the configuration file.
- </para>
- </refsect2>
-
- <refsect2>
- <title>match</title>
- <para>
- This element is for matching information related to the
- decision making process and includes values describing
- both the caller and the action. This element can be
- embedded in both <emphasis>config</emphasis> and
- other <emphasis>match</emphasis> elements (hence allowing
- for nested matching).
- </para>
- <para>
- There can only be a single attribute in
- each <emphasis>match</emphasis> element and POSIX Extended
- Regular Expression syntax are supported in the value
- part. The following attributes are supported:
- </para>
-
- <variablelist>
- <varlistentry>
- <term><emphasis>user</emphasis></term>
- <listitem>
- <para>
- This matches on the users login name.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>action</emphasis></term>
- <listitem>
- <para>
- For matching on the given action being queried for,
- for example
- <emphasis>action="org.foo.*"</emphasis> will match
- on all actions whose action identifier begins with
- the string "org.foo.".
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </refsect2>
-
- <refsect2>
- <title>return</title>
- <para>
- This element is for used to specify what result the
- PolicyKit library will return. It can only be embedded in
- <emphasis>config</emphasis> and <emphasis>match</emphasis>
- elements and can embed no elements
- itself. The <emphasis>return</emphasis> element is
- typically used deeply inside a number
- of <emphasis>match</emphasis> elements. A single attribute,
- <emphasis>result</emphasis> is supported and it can assume
- the following values:
- </para>
-
- <variablelist>
- <varlistentry>
- <term><emphasis>no</emphasis></term>
- <listitem>
- <para>
- Access denied.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>auth_self</emphasis></term>
- <listitem>
- <para>
- Access denied, but authentication of the caller as
- himself will grant access to only that caller.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>auth_self_keep_session</emphasis></term>
- <listitem>
- <para>
- Access denied, but authentication of the caller as
- himself will grant access to any caller in the
- session of the caller belongs to.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>auth_self_keep_always</emphasis></term>
- <listitem>
- <para>
- Access denied, but authentication of the caller as
- himself will grant access any caller with the given
- uid in the future.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>auth_admin</emphasis></term>
- <listitem>
- <para>
- Access denied, but authentication of the caller as
- an administrative user will grant access to only
- that caller.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>auth_admin_keep_session</emphasis></term>
- <listitem>
- <para>
- Access denied, but authentication of the caller as
- an administrative user will grant access to any caller
- in the session of the caller belongs to.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>auth_admin_keep_always</emphasis></term>
- <listitem>
- <para>
- Access denied, but authentication of the caller as
- an administrative user will grant access any caller
- with the given uid in the future.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>yes</emphasis></term>
- <listitem>
- <para>
- Access granted.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </refsect2>
-
- <refsect2>
- <title>define_admin_auth</title>
- <para>
- This element is used to specify the meaning of
- <emphasis>"authenticate as administrator"</emphasis>. It
- is normally used at the top-level but can also be used
- deep inside a number of
- <emphasis>match</emphasis> elements for conditional
- behavior.
- </para>
-
- <para>
- There can only be a single attribute in
- each <emphasis>define_admin_auth</emphasis> element. POSIX
- Extended Regular Expression syntax
- is <emphasis>not</emphasis> supported in the value part,
- however multiple values to match on can be separated with
- the bar (|) character. The following attributes are
- supported:
- </para>
-
- <variablelist>
- <varlistentry>
- <term><emphasis>user</emphasis></term>
- <listitem>
- <para>
- Administrator authentication means authenticate as
- the given user(s). If
- no <emphasis>define_admin_auth</emphasis> element is
- given, the default is to
- use <emphasis>user="root"</emphasis>
- e.g. administrator authentication mean authenticate
- as the super user.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><emphasis>group</emphasis></term>
- <listitem>
- <para>
- Administrator authentication means that any user in
- the groups matching the given value can be used to
- authenticate. Typically, on a system with the root
- account disabled one wants to use something like
- <emphasis>group="wheel"</emphasis> to e.g. enable
- all UNIX users in the UNIX group
- <emphasis>wheel</emphasis> to be able to
- authentication whenever administrator authentication
- is required.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </refsect2>
-
- </refsect1>
-
- <refsect1>
- <title>EXAMPLES</title>
- <para>
- For brevity, the standard XML and DOCTYPE headers as well as
- the top-level <emphasis>config</emphasis> are omitted in the
- following configuration file examples. The actions used may
- also be fictional,
- use <citerefentry><refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- to learn about the actions available on your system.
- </para>
-
- <refsect2>
- <title>ALLOW EVERYTHING</title>
- <para>
- The users "davidz" and "bateman" are allowed to do any
- action:
- </para>
- <programlisting>
- <![CDATA[
+ </programlisting>
+
+ <para>
+ The following elements may be present in the configuration file:
+ </para>
+
+ <refsect2>
+ <title>config</title>
+ <para>
+ This is the root element. A single
+ attribute <emphasis>version</emphasis> must be present and
+ must be set to "0.1" at this point. There can only be one
+ <emphasis>config</emphasis> element in the configuration file.
+ </para>
+ </refsect2>
+
+ <refsect2>
+ <title>match</title>
+ <para>
+ This element is for matching information related to the
+ decision making process and includes values describing both
+ the caller and the action. This element can be embedded in
+ both <emphasis>config</emphasis> and
+ other <emphasis>match</emphasis> elements (hence allowing for
+ nested matching).
+ </para>
+ <para>
+ There can only be a single attribute in
+ each <emphasis>match</emphasis> element and POSIX Extended
+ Regular Expression syntax are supported in the value part. The
+ following attributes are supported:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><emphasis>user</emphasis></term>
+ <listitem>
+ <para>
+ This matches on the users login name.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>action</emphasis></term>
+ <listitem>
+ <para>
+ For matching on the given action being queried for, for
+ example
+ <emphasis>action="org.foo.*"</emphasis> will match
+ on all actions whose action identifier begins with
+ the string "org.foo.".
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </refsect2>
+
+ <refsect2>
+ <title>return</title>
+ <para>
+ This element is for used to specify what result the PolicyKit
+ library will return. It can only be embedded in
+ <emphasis>config</emphasis> and <emphasis>match</emphasis>
+ elements and can embed no elements
+ itself. The <emphasis>return</emphasis> element is
+ typically used deeply inside a number
+ of <emphasis>match</emphasis> elements. A single attribute,
+ <emphasis>result</emphasis> is supported and it can assume
+ the following values:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><emphasis>no</emphasis></term>
+ <listitem>
+ <para>
+ Access denied.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>auth_self</emphasis></term>
+ <listitem>
+ <para>
+ Access denied, but authentication of the caller as
+ himself will grant access to only that caller.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>auth_self_keep_session</emphasis></term>
+ <listitem>
+ <para>
+ Access denied, but authentication of the caller as
+ himself will grant access to any caller in the
+ session of the caller belongs to.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>auth_self_keep_always</emphasis></term>
+ <listitem>
+ <para>
+ Access denied, but authentication of the caller as
+ himself will grant access any caller with the given
+ uid in the future.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>auth_admin</emphasis></term>
+ <listitem>
+ <para>
+ Access denied, but authentication of the caller as
+ an administrative user will grant access to only
+ that caller.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>auth_admin_keep_session</emphasis></term>
+ <listitem>
+ <para>
+ Access denied, but authentication of the caller as
+ an administrative user will grant access to any caller
+ in the session of the caller belongs to.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>auth_admin_keep_always</emphasis></term>
+ <listitem>
+ <para>
+ Access denied, but authentication of the caller as
+ an administrative user will grant access any caller
+ with the given uid in the future.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>yes</emphasis></term>
+ <listitem>
+ <para>
+ Access granted.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </refsect2>
+
+ <refsect2>
+ <title>define_admin_auth</title>
+ <para>
+ This element is used to specify the meaning of
+ <emphasis>"authenticate as administrator"</emphasis>. It
+ is normally used at the top-level but can also be used
+ deep inside a number of
+ <emphasis>match</emphasis> elements for conditional
+ behavior.
+ </para>
+
+ <para>
+ There can only be a single attribute in
+ each <emphasis>define_admin_auth</emphasis> element. POSIX
+ Extended Regular Expression syntax
+ is <emphasis>not</emphasis> supported in the value part,
+ however multiple values to match on can be separated with
+ the bar (|) character. The following attributes are
+ supported:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><emphasis>user</emphasis></term>
+ <listitem>
+ <para>
+ Administrator authentication means authenticate as
+ the given user(s). If
+ no <emphasis>define_admin_auth</emphasis> element is
+ given, the default is to
+ use <emphasis>user="root"</emphasis>
+ e.g. administrator authentication mean authenticate
+ as the super user.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><emphasis>group</emphasis></term>
+ <listitem>
+ <para>
+ Administrator authentication means that any user in
+ the groups matching the given value can be used to
+ authenticate. Typically, on a system with the root
+ account disabled one wants to use something like
+ <emphasis>group="wheel"</emphasis> to e.g. enable
+ all UNIX users in the UNIX group
+ <emphasis>wheel</emphasis> to be able to
+ authentication whenever administrator authentication
+ is required.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </refsect2>
+
+ </refsect1>
+
+ <refsect1>
+ <title>EXAMPLES</title>
+ <para>
+ For brevity, the standard XML and DOCTYPE headers as well as
+ the top-level <emphasis>config</emphasis> are omitted in the
+ following configuration file examples. The actions used may
+ also be fictional,
+ use <citerefentry><refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ to learn about the actions available on your system.
+ </para>
+
+ <refsect2>
+ <title>ALLOW EVERYTHING</title>
+ <para>
+ The users "davidz" and "bateman" are allowed to do any
+ action:
+ </para>
+ <programlisting>
+ <![CDATA[
<match user="davidz|bateman">
<return result="yes"/>
</match>
]]>
- </programlisting>
- </refsect2>
+ </programlisting>
+ </refsect2>
- <refsect2>
- <title>MOUNTING FIXED DRIVES</title>
- <para>
- Suppose the
- action <emphasis>org.freedesktop.hal.storage.mount-fixed</emphasis>
- is used to determine whether mounting internal hard drives
- are allowed. Then this configuration file
-
- </para>
- <programlisting>
- <![CDATA[
+ <refsect2>
+ <title>MOUNTING FIXED DRIVES</title>
+ <para>
+ Suppose the
+ action <emphasis>org.freedesktop.hal.storage.mount-fixed</emphasis>
+ is used to determine whether mounting internal hard drives
+ are allowed. Then this configuration file
+
+ </para>
+ <programlisting>
+ <![CDATA[
<match action="org.freedesktop.hal.storage.mount-fixed">
<match user="davidz">
<return result="yes"/>
@@ -327,54 +318,52 @@
</match>
</match>
]]>
- </programlisting>
- <para>
- specifies that user "davidz" is always allowed to do the
- action, while user "freddy" is never allowed to do the
- action. Other users will be subject to the defaults
- results specified in the <emphasis>.policy</emphasis> file
- describing the action.
- </para>
-
- </refsect2>
-
- </refsect1>
-
- <refsect1>
- <title>AUTHOR</title>
- <para>
- Written by David Zeuthen <email>david at fubar.dk</email> with
- a lot of help from many others.
- </para>
- </refsect1>
-
- <refsect1>
- <title>BUGS</title>
- <para>
- Please send bug reports to either the distribution or the
- hal mailing list,
- see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
- to subscribe.
- </para>
- </refsect1>
-
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-config-file-validate</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-grant</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- </refentry>
- </section>
-</article>
+ </programlisting>
+ <para>
+ specifies that user "davidz" is always allowed to do the
+ action, while user "freddy" is never allowed to do the
+ action. Other users will be subject to the defaults
+ results specified in the <emphasis>.policy</emphasis> file
+ describing the action.
+ </para>
+
+ </refsect2>
+
+ </refsect1>
+
+ <refsect1>
+ <title>AUTHOR</title>
+ <para>
+ Written by David Zeuthen <email>david at fubar.dk</email> with
+ a lot of help from many others.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please send bug reports to either the distribution or the
+ hal mailing list,
+ see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
+ to subscribe.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-config-file-validate</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-grant</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
diff --git a/doc/man/PolicyKit.xml b/doc/man/PolicyKit.xml
index cf30649..f70a64a 100644
--- a/doc/man/PolicyKit.xml
+++ b/doc/man/PolicyKit.xml
@@ -1,74 +1,66 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<article>
- <section>
+<refentry>
+ <refentryinfo>
<title>PolicyKit</title>
- <refentry>
- <refentryinfo>
- <title>PolicyKit</title>
- <date>August 2007</date>
- <productname>PolicyKit</productname>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>PolicyKit</refentrytitle>
- <manvolnum>8</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>PolicyKit</refname>
- <refpurpose>centralized policy management</refpurpose>
- </refnamediv>
-
- <refsect1><title>DESCRIPTION</title>
- <para>
- For more information about the big picture refer to the
- PolicyKit specification which can be normally be found
- under <filename>/usr/share/doc</filename>.
- </para>
-
- <para>
- <emphasis>TODO:</emphasis> This manual page should contain a
- simple introduction to PolicyKit for a system administrator
- audience. Remains to be written.
- </para>
- </refsect1>
-
-
- <refsect1><title>AUTHOR</title>
- <para>
- Written by David Zeuthen <email>david at fubar.dk</email> with
- a lot of help from many others.
- </para>
- </refsect1>
-
- <refsect1>
- <title>BUGS</title>
- <para>
- Please send bug reports to either the distribution or the
- hal mailing list,
- see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
- to subscribe.
- </para>
- </refsect1>
+ <date>August 2007</date>
+ <productname>PolicyKit</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>PolicyKit</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>PolicyKit</refname>
+ <refpurpose>centralized policy management</refpurpose>
+ </refnamediv>
+
+ <refsect1><title>DESCRIPTION</title>
+ <para>
+ For more information about the big picture refer to the
+ PolicyKit specification which can be normally be found
+ under <filename>/usr/share/doc</filename>.
+ </para>
+
+ <para>
+ <emphasis>TODO:</emphasis> This manual page should contain a
+ simple introduction to PolicyKit for a system administrator
+ audience. Remains to be written.
+ </para>
+ </refsect1>
+
+
+ <refsect1><title>AUTHOR</title>
+ <para>
+ Written by David Zeuthen <email>david at fubar.dk</email> with
+ a lot of help from many others.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please send bug reports to either the distribution or the
+ hal mailing list,
+ see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
+ to subscribe.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-grant</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-grant</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- </refentry>
- </section>
-</article>
diff --git a/doc/man/polkit-config-file-validate.xml b/doc/man/polkit-config-file-validate.xml
index 13dfc9d..0e5da73 100644
--- a/doc/man/polkit-config-file-validate.xml
+++ b/doc/man/polkit-config-file-validate.xml
@@ -1,105 +1,96 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<article>
- <section>
+<refentry>
+ <refentryinfo>
<title>polkit-config-file-validate</title>
- <refentry>
- <refentryinfo>
- <title>polkit-config-file-validate</title>
- <date>August 2007</date>
- <productname>PolicyKit</productname>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>polkit-config-file-validate</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>polkit-config-file-validate</refname>
- <refpurpose>manage PolicyKit privilege grants</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>polkit-config-file-validate <replaceable>[/path/to/config/file]</replaceable></command>
- <arg><option>--version</option></arg>
- <arg><option>--help</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- polkit-config-file-validate is used to verify that a given
- PolicyKit configuration file is valid. If no path to a
- config file is given, the default
- <filename>/etc/PolicyKit/PolicyKit.conf</filename> file
- will be verified.
- </para>
-
- <para>
- The typical role of this tool is to verify a configuration
- file before deploying it on one or more machines.
- </para>
-
- <para>
- This program exit with exit code 0 if the configuration file
- is valid. If not, the program exits with a non-zero exit
- code.
- </para>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>
- Show version and exit.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--help</option></term>
- <listitem>
- <para>
- Show usage information and exit.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>BUGS</title>
- <para>
- Please send bug reports to either the distribution or the
- hal mailing list,
- see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
- to subscribe.
- </para>
- </refsect1>
-
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-policy-file-validate</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- </refentry>
- </section>
-</article>
+ <date>August 2007</date>
+ <productname>PolicyKit</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>polkit-config-file-validate</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>polkit-config-file-validate</refname>
+ <refpurpose>manage PolicyKit privilege grants</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>polkit-config-file-validate <replaceable>[/path/to/config/file]</replaceable></command>
+ <arg><option>--version</option></arg>
+ <arg><option>--help</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ polkit-config-file-validate is used to verify that a given
+ PolicyKit configuration file is valid. If no path to a
+ config file is given, the default
+ <filename>/etc/PolicyKit/PolicyKit.conf</filename> file
+ will be verified.
+ </para>
+
+ <para>
+ The typical role of this tool is to verify a configuration
+ file before deploying it on one or more machines.
+ </para>
+
+ <para>
+ This program exit with exit code 0 if the configuration file
+ is valid. If not, the program exits with a non-zero exit
+ code.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>
+ Show version and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help</option></term>
+ <listitem>
+ <para>
+ Show usage information and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please send bug reports to either the distribution or the
+ hal mailing list,
+ see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
+ to subscribe.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-policy-file-validate</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
diff --git a/doc/man/polkit-grant.xml b/doc/man/polkit-grant.xml
index c593a8d..972202c 100644
--- a/doc/man/polkit-grant.xml
+++ b/doc/man/polkit-grant.xml
@@ -1,125 +1,116 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<article>
- <section>
+<refentry>
+ <refentryinfo>
<title>polkit-grant</title>
- <refentry>
- <refentryinfo>
- <title>polkit-grant</title>
- <date>August 2007</date>
- <productname>PolicyKit</productname>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>polkit-grant</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>polkit-grant</refname>
- <refpurpose>manage PolicyKit privilege grants</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>polkit-grant</command>
- <arg><option>--gain <replaceable>action</replaceable></option></arg>
- <arg><option>--list</option></arg>
- <arg><option>--delete <replaceable>user</replaceable></option></arg>
- <arg><option>--version</option></arg>
- <arg><option>--help</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- polkit-grant is used to inspect and manage the privileges
- that users obtain through authentication to enable a
- mechanism to perform a specific action on their behalf.
- </para>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term><option>--gain <replaceable>action</replaceable></option></term>
- <listitem>
- <para>
- Attempt to gain the privilege for the user to do an
- action. This starts an interactive dialog where,
- among, other things the user is authenticated.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--list</option></term>
- <listitem>
- <para>
- Lists all the privileges previously granted.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--delete <replaceable>user</replaceable></option></term>
- <listitem>
- <para>
- Delete all privileges granted to a given user. Needs
- super user privileges.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>
- Show version and exit.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--help</option></term>
- <listitem>
- <para>
- Show usage information and exit.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>BUGS</title>
- <para>
- Please send bug reports to either the distribution or the
- hal mailing list,
- see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
- to subscribe.
- </para>
- </refsect1>
-
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- </refentry>
- </section>
-</article>
+ <date>August 2007</date>
+ <productname>PolicyKit</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>polkit-grant</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>polkit-grant</refname>
+ <refpurpose>manage PolicyKit privilege grants</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>polkit-grant</command>
+ <arg><option>--gain <replaceable>action</replaceable></option></arg>
+ <arg><option>--list</option></arg>
+ <arg><option>--delete <replaceable>user</replaceable></option></arg>
+ <arg><option>--version</option></arg>
+ <arg><option>--help</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ polkit-grant is used to inspect and manage the privileges
+ that users obtain through authentication to enable a
+ mechanism to perform a specific action on their behalf.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term><option>--gain <replaceable>action</replaceable></option></term>
+ <listitem>
+ <para>
+ Attempt to gain the privilege for the user to do an
+ action. This starts an interactive dialog where,
+ among, other things the user is authenticated.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--list</option></term>
+ <listitem>
+ <para>
+ Lists all the privileges previously granted.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--delete <replaceable>user</replaceable></option></term>
+ <listitem>
+ <para>
+ Delete all privileges granted to a given user. Needs
+ super user privileges.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>
+ Show version and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help</option></term>
+ <listitem>
+ <para>
+ Show usage information and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please send bug reports to either the distribution or the
+ hal mailing list,
+ see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
+ to subscribe.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-list-actions</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
diff --git a/doc/man/polkit-list-actions.xml b/doc/man/polkit-list-actions.xml
index 583c93c..acc8b8b 100644
--- a/doc/man/polkit-list-actions.xml
+++ b/doc/man/polkit-list-actions.xml
@@ -1,101 +1,92 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<article>
- <section>
+<refentry>
+ <refentryinfo>
<title>polkit-list-actions</title>
- <refentry>
- <refentryinfo>
- <title>polkit-list-actions</title>
- <date>August 2007</date>
- <productname>PolicyKit</productname>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>polkit-list-actions</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>polkit-list-actions</refname>
- <refpurpose>manage PolicyKit privilege grants</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>polkit-list-actions</command>
- <arg><option>--action <replaceable>action</replaceable></option></arg>
- <arg><option>--version</option></arg>
- <arg><option>--help</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- polkit-list-actions is used to list the PolicyKit actions
- that are registered on the system.
- </para>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term><option>--action <replaceable>action</replaceable></option></term>
- <listitem>
- <para>
- Show detailed information about a specific action.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>
- Show version and exit.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--help</option></term>
- <listitem>
- <para>
- Show usage information and exit.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>BUGS</title>
- <para>
- Please send bug reports to either the distribution or the
- hal mailing list,
- see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
- to subscribe.
- </para>
- </refsect1>
-
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-grant</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- </refentry>
- </section>
-</article>
+ <date>August 2007</date>
+ <productname>PolicyKit</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>polkit-list-actions</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>polkit-list-actions</refname>
+ <refpurpose>manage PolicyKit privilege grants</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>polkit-list-actions</command>
+ <arg><option>--action <replaceable>action</replaceable></option></arg>
+ <arg><option>--version</option></arg>
+ <arg><option>--help</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ polkit-list-actions is used to list the PolicyKit actions
+ that are registered on the system.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term><option>--action <replaceable>action</replaceable></option></term>
+ <listitem>
+ <para>
+ Show detailed information about a specific action.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>
+ Show version and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help</option></term>
+ <listitem>
+ <para>
+ Show usage information and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please send bug reports to either the distribution or the
+ hal mailing list,
+ see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
+ to subscribe.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-grant</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
diff --git a/doc/man/polkit-policy-file-validate.xml b/doc/man/polkit-policy-file-validate.xml
index 1f38ca4..b78348c 100644
--- a/doc/man/polkit-policy-file-validate.xml
+++ b/doc/man/polkit-policy-file-validate.xml
@@ -1,104 +1,95 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<article>
- <section>
+<refentry>
+ <refentryinfo>
<title>polkit-policy-file-validate</title>
- <refentry>
- <refentryinfo>
- <title>polkit-policy-file-validate</title>
- <date>August 2007</date>
- <productname>PolicyKit</productname>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>polkit-policy-file-validate</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>polkit-policy-file-validate</refname>
- <refpurpose>manage PolicyKit privilege grants</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>polkit-policy-file-validate <replaceable>policy-files</replaceable></command>
- <arg><option>--version</option></arg>
- <arg><option>--help</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- polkit-policy-file-validate is used to verify that one or
- more PolicyKit <emphasis>.policy</emphasis> files are valid.
- </para>
-
- <para>
- Normally this tool is used in the software release process
- (typically during <emphasis>"make check"</emphasis>) and
- during software installation (e.g. in
- the <emphasis>%post</emphasis> section of a RPM spec file).
- </para>
-
- <para>
- This program exit with exit code 0 if all the files
- validate. If not, the program exits with a non-zero exit
- code.
- </para>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>
- Show version and exit.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>--help</option></term>
- <listitem>
- <para>
- Show usage information and exit.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>BUGS</title>
- <para>
- Please send bug reports to either the distribution or the
- hal mailing list,
- see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
- to subscribe.
- </para>
- </refsect1>
-
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>,
- <citerefentry>
- <refentrytitle>polkit-config-file-validate</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>
- </para>
- </refsect1>
- </refentry>
- </section>
-</article>
+ <date>August 2007</date>
+ <productname>PolicyKit</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>polkit-policy-file-validate</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>polkit-policy-file-validate</refname>
+ <refpurpose>manage PolicyKit privilege grants</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>polkit-policy-file-validate <replaceable>policy-files</replaceable></command>
+ <arg><option>--version</option></arg>
+ <arg><option>--help</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ polkit-policy-file-validate is used to verify that one or
+ more PolicyKit <emphasis>.policy</emphasis> files are valid.
+ </para>
+
+ <para>
+ Normally this tool is used in the software release process
+ (typically during <emphasis>"make check"</emphasis>) and
+ during software installation (e.g. in
+ the <emphasis>%post</emphasis> section of a RPM spec file).
+ </para>
+
+ <para>
+ This program exit with exit code 0 if all the files
+ validate. If not, the program exits with a non-zero exit
+ code.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>
+ Show version and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--help</option></term>
+ <listitem>
+ <para>
+ Show usage information and exit.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>BUGS</title>
+ <para>
+ Please send bug reports to either the distribution or the
+ hal mailing list,
+ see <ulink url="http://lists.freedesktop.org/mailman/listinfo/hal"/>.
+ to subscribe.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>PolicyKit.conf</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+ <refentrytitle>polkit-config-file-validate</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am
deleted file mode 100644
index 86e37f6..0000000
--- a/doc/spec/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-
-FIGURE_FILES =
-
-SPEC_XML_EXTRA_FILES = \
- polkit-spec-introduction.xml \
- polkit-spec-model.xml \
- polkit-spec-configuration.xml
-
-if DOCBOOK_DOCS_ENABLED
-
-htmldocdir = $(docdir)/spec
-htmldoc_DATA = polkit-spec.html $(FIGURE_FILES) docbook.css
-
-polkit-spec.html : polkit-spec.xml.in $(FIGURE_FILES) $(SPEC_XML_EXTRA_FILES)
- ${XMLLINT} --xinclude polkit-spec.xml.in > polkit-spec.xml
- $(XMLTO) html-nochunks -m config.xsl polkit-spec.xml
-
-endif # DOCBOOK_DOCS_ENABLED
-
-clean-local:
- rm -f *~
- rm -f *.html
- rm -f polkit-spec.xml
-
-EXTRA_DIST = \
- polkit-spec.xml.in \
- config.xsl \
- docbook.css \
- $(SPEC_XML_EXTRA_FILES) \
- $(FIGURE_FILES)
diff --git a/doc/spec/config.xsl b/doc/spec/config.xsl
deleted file mode 100644
index 7aa9def..0000000
--- a/doc/spec/config.xsl
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- version="1.0">
- <xsl:param name="html.stylesheet" select="'docbook.css'"/>
-</xsl:stylesheet>
diff --git a/doc/spec/docbook.css b/doc/spec/docbook.css
deleted file mode 100644
index 9a0e72a..0000000
--- a/doc/spec/docbook.css
+++ /dev/null
@@ -1,18 +0,0 @@
-body {
- font-family: luxi sans,sans-serif;
-}
-
-table {
- border: solid 1pt;
- border-collapse: collapse;
-}
-
-th {
- background: #eeeeee;
- padding: 5px;
-}
-
-td {
- border: solid 1pt;
- padding: 5px;
-}
diff --git a/doc/spec/polkit-spec.xml.in.in b/doc/spec/polkit-spec.xml.in.in
deleted file mode 100644
index 5174747..0000000
--- a/doc/spec/polkit-spec.xml.in.in
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<book id="index">
- <bookinfo>
- <title>PolicyKit @VERSION@ Specification</title>
- <releaseinfo>Version @VERSION@</releaseinfo>
- <date>March 28th, 2007</date> <!-- Update this manually -->
- <authorgroup>
- <author>
- <firstname>David</firstname>
- <surname>Zeuthen</surname>
- <affiliation>
- <address>
- <email>david at fubar.dk</email>
- </address>
- </affiliation>
- </author>
- </authorgroup>
- </bookinfo>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-spec-introduction.xml" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-spec-model.xml" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-spec-configuration.xml" />
-
-</book>
diff --git a/polkit-grant/polkit-grant-helper.c b/polkit-grant/polkit-grant-helper.c
index ffcd407..6482e5a 100644
--- a/polkit-grant/polkit-grant-helper.c
+++ b/polkit-grant/polkit-grant-helper.c
@@ -337,7 +337,7 @@ verify_with_polkit (pid_t caller_pid,
PolKitConfigAdminAuthType admin_auth_type;
const char *admin_auth_data;
- pk_config = polkit_context_get_config (pol_ctx);
+ pk_config = polkit_context_get_config (pol_ctx, NULL);
/* if the configuration file is malformed, bail out */
if (pk_config == NULL)
goto error;
diff --git a/polkit/polkit-config.c b/polkit/polkit-config.c
index 782796c..7194386 100644
--- a/polkit/polkit-config.c
+++ b/polkit/polkit-config.c
@@ -392,14 +392,15 @@ error:
/**
* polkit_config_new:
+ * @path: Path to configuration, typically /etc/PolicyKit/PolicyKit.conf is passed.
* @error: return location for error
*
- * Create a new object representing the /etc/PolicyKit/PolicyKit.conf configuration file.
+ * Load and parse a PolicyKit configuration file.
*
* Returns: the configuration file object
**/
PolKitConfig *
-polkit_config_new (PolKitError **error)
+polkit_config_new (const char *path, PolKitError **error)
{
ParserData pd;
int xml_res;
@@ -407,13 +408,10 @@ polkit_config_new (PolKitError **error)
char *buf;
gsize buflen;
GError *g_error;
- const char *path;
/* load and parse the configuration file */
pk_config = NULL;
- path = PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf";
-
g_error = NULL;
if (!g_file_get_contents (path, &buf, &buflen, &g_error)) {
polkit_error_set_error (error, POLKIT_ERROR_POLICY_FILE_INVALID,
diff --git a/polkit/polkit-config.h b/polkit/polkit-config.h
index 8a9a3a5..7ecc1cc 100644
--- a/polkit/polkit-config.h
+++ b/polkit/polkit-config.h
@@ -42,7 +42,7 @@
struct PolKitConfig;
typedef struct PolKitConfig PolKitConfig;
-PolKitConfig *polkit_config_new (PolKitError **error);
+PolKitConfig *polkit_config_new (const char *path, PolKitError **error);
PolKitConfig *polkit_config_ref (PolKitConfig *pk_config);
void polkit_config_unref (PolKitConfig *pk_config);
diff --git a/polkit/polkit-context.c b/polkit/polkit-context.c
index 87d79ac..6d5bf93 100644
--- a/polkit/polkit-context.c
+++ b/polkit/polkit-context.c
@@ -459,7 +459,7 @@ polkit_context_can_session_do_action (Po
result = POLKIT_RESULT_NO;
g_return_val_if_fail (pk_context != NULL, result);
- config = polkit_context_get_config (pk_context);
+ config = polkit_context_get_config (pk_context, NULL);
/* if the configuration file is malformed, always say no */
if (config == NULL)
goto out;
@@ -544,7 +544,7 @@ polkit_context_can_caller_do_action (Pol
g_return_val_if_fail (pk_context != NULL, result);
/* if the configuration file is malformed, always say no */
- config = polkit_context_get_config (pk_context);
+ config = polkit_context_get_config (pk_context, NULL);
if (config == NULL)
goto out;
@@ -610,6 +610,7 @@ out:
/**
* polkit_context_get_config:
* @pk_context: the PolicyKit context
+ * @error: Return location for error
*
* Returns an object that provides access to the
* /etc/PolicyKit/PolicyKit.conf configuration files. Applications
@@ -620,20 +621,28 @@ out:
* is malformed.
*/
PolKitConfig *
-polkit_context_get_config (PolKitContext *pk_context)
+polkit_context_get_config (PolKitContext *pk_context, PolKitError **error)
{
if (pk_context->config == NULL) {
- PolKitError *pk_error;
+ PolKitError **pk_error;
+ PolKitError *pk_error2;
+
+ pk_error2 = NULL;
+ if (error != NULL)
+ pk_error = error;
+ else
+ pk_error = &pk_error2;
_pk_debug ("loading configuration file");
- pk_context->config = polkit_config_new (&pk_error);
+ pk_context->config = polkit_config_new (PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf", pk_error);
/* if configuration file was bad, log it */
if (pk_context->config == NULL) {
_pk_debug ("failed to load configuration file: %s",
- polkit_error_get_error_message (pk_error));
+ polkit_error_get_error_message (*pk_error));
syslog (LOG_ALERT, "libpolkit: failed to load configuration file: %s",
- polkit_error_get_error_message (pk_error));
- polkit_error_free (pk_error);
+ polkit_error_get_error_message (*pk_error));
+ if (pk_error == &pk_error2)
+ polkit_error_free (*pk_error);
}
}
return pk_context->config;
diff --git a/polkit/polkit-context.h b/polkit/polkit-context.h
index e46d822..afefa1b 100644
--- a/polkit/polkit-context.h
+++ b/polkit/polkit-context.h
@@ -163,7 +163,7 @@ PolKitResult polkit_context_can_caller_d
PolKitAction *action,
PolKitCaller *caller);
-PolKitConfig *polkit_context_get_config (PolKitContext *pk_context);
+PolKitConfig *polkit_context_get_config (PolKitContext *pk_context, PolKitError **error);
#endif /* POLKIT_CONTEXT_H */
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f15a7f6..2290c29 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -11,13 +11,10 @@ INCLUDES = \
@GLIB_CFLAGS@ \
@DBUS_CFLAGS@
-bin_PROGRAMS = polkit-check-caller polkit-check-session polkit-policy-file-validate polkit-grant polkit-list-actions
+bin_PROGRAMS = polkit-config-file-validate polkit-policy-file-validate polkit-grant polkit-list-actions
-polkit_check_caller_SOURCES = polkit-check-caller.c
-polkit_check_caller_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la
-
-polkit_check_session_SOURCES = polkit-check-session.c
-polkit_check_session_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la
+polkit_config_file_validate_SOURCES = polkit-config-file-validate.c
+polkit_config_file_validate_LDADD = $(top_builddir)/polkit/libpolkit.la
polkit_policy_file_validate_SOURCES = polkit-policy-file-validate.c
polkit_policy_file_validate_LDADD = $(top_builddir)/polkit/libpolkit.la
diff --git a/tools/polkit-list-actions.c b/tools/polkit-list-actions.c
index 5ecca98..1342e6d 100644
--- a/tools/polkit-list-actions.c
+++ b/tools/polkit-list-actions.c
@@ -43,8 +43,7 @@ usage (int argc, char *argv[])
{
fprintf (stderr,
"\n"
- "usage : polkit-list-actions [--version] [--help]\n"
- "\n");
+ "usage : polkit-list-actions [--action <action>] [--version] [--help]\n");
fprintf (stderr,
"\n"
" --version Show version and exit\n"
More information about the hal-commit
mailing list