Merge branch 'dbus-1.2'

Conflicts:
	bus/bus.c
	configure.in

diff --cc bus/bus.c
index 69203a2325158b10080e8e1201afdaebcc05583a,3e37e90a2aefd29312770b1b61a16d265275c10c..37777965b32e16c63c37deb69a58e96f3a67ecde
--- 1/bus/bus.c
--- 2/bus/bus.c
+++ b/bus/bus.c
@@@ -398,8 -403,7 +413,8 @@@ process_config_first_time_only (BusCont
    context->fork = bus_config_parser_get_fork (parser);
    context->syslog = bus_config_parser_get_syslog (parser);
    context->keep_umask = bus_config_parser_get_keep_umask (parser);
-   
 +  context->allow_anonymous = bus_config_parser_get_allow_anonymous (parser);
+ 
    _DBUS_ASSERT_ERROR_IS_CLEAR (error);
    retval = TRUE;
  

diff --cc bus/bus.h
index aade920cb65a2636305b88954d254963ba680cf6,8a04daa165f578b2f249ce0f29a705ad483068aa..14a809b17f1d24ac7abdf8005c46f0a162266830
--- 1/bus/bus.h
--- 2/bus/bus.h
+++ b/bus/bus.h
@@@ -29,7 -29,6 +29,8 @@@
  #include <dbus/dbus.h>
  #include <dbus/dbus-string.h>
  #include <dbus/dbus-mainloop.h>
 +#include <dbus/dbus-pipe.h>
++#include <dbus/dbus-sysdeps.h>
  
  typedef struct BusActivation    BusActivation;
  typedef struct BusConnections   BusConnections;

diff --cc bus/dir-watch-inotify.c
Simple merge

diff --cc bus/main.c
Simple merge

diff --cc bus/selinux.c
Simple merge

diff --cc configure.in
index c037ec39bd5c09a9f3273e8817f400794ae2e80a,f583b28e2e9c93a31195c90f2f31a20cfa7b4152..d856cf9960c6c64a3d15f62f93fc3d86d6df89bf
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -25,8 -23,8 +25,10 @@@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GE
   ## must come before we use the $USE_MAINTAINER_MODE variable later
  AM_MAINTAINER_MODE
  
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
 +AC_DEFINE_UNQUOTED(DBUS_DAEMON_NAME,"dbus-daemon",[Name of executable])
 +
  # libtool versioning - this applies to libdbus
  #
  # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details

diff --cc dbus/dbus-connection.c
Simple merge

diff --cc dbus/dbus-spawn.c
Simple merge

diff --cc dbus/dbus-sysdeps-util-unix.c
index 688ec19d180e7ec3d3e726b2c8da100c835ccfd6,93ad253e28fcaa233d54c7b9271a5abf05832fc9..eaf3270312a49a7a1dc0f828ef64ec912b96af92
--- 1/dbus/dbus-sysdeps-util-unix.c
--- 2/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@@ -385,16 -391,37 +391,37 @@@ _dbus_system_log (DBusSystemLogSeverit
  }
  
  /**
-  * Log a security-related message.  Intended for use primarily by
-  * the system bus.
+  * Log a message to the system log file (e.g. syslog on Unix).
   *
+  * @param severity a severity value
   * @param msg a printf-style format string
   * @param args arguments for the format string
+  *
+  * If the FATAL severity is given, this function will terminate the program
+  * with an error code.
   */
- void 
- _dbus_log_security (const char *msg, va_list args)
+ void
+ _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args)
  {
-   vsyslog (LOG_AUTH|LOG_NOTICE, msg, args);
+   int flags;
+   switch (severity)
+     {
+       case DBUS_SYSTEM_LOG_INFO:
+         flags =  LOG_DAEMON | LOG_NOTICE;
+         break;
+       case DBUS_SYSTEM_LOG_SECURITY:
+         flags = LOG_AUTH | LOG_NOTICE;
+         break;
+       case DBUS_SYSTEM_LOG_FATAL:
+         flags = LOG_DAEMON|LOG_CRIT;
+       default:
+         return;
+     }
+ 
+   vsyslog (flags, msg, args);
 -  
++
+   if (severity == DBUS_SYSTEM_LOG_FATAL)
+     exit (1);
  }
  
  /** Installs a UNIX signal handler

diff --cc dbus/dbus-sysdeps.h
Simple merge

diff --cc dbus/dbus-transport-socket.c
Simple merge

diff --cc doc/dbus-specification.xml
Simple merge