user auth patches

[Ralf Habacker]

Havoc Pennington schrieb:
> Hi,
>
> I checked in this fix for now.
Thanks, this helps.


Unfortunally your patch breaks compiling of main.c because you have 
removed the part
#ifdef DBUS_WIN
#include <dbus/dbus-sysdeps-win.h>
#endif

in main.


@@ -23,15 +23,14 @@
 #include "bus.h"
 #include "driver.h"
 #include <dbus/dbus-internals.h>
-#include <dbus/dbus-watch.h>
-#ifdef DBUS_WIN
-#include <dbus/dbus-sysdeps-win.h>
-#endif
+#include <dbus/dbus-watch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include "selinux.h"
 
 static BusContext *context;


This include is required later

#ifdef DBUS_WIN
          if (!_dbus_get_config_file_name (&config_file,"session.conf"))
            exit (1);
          /* don't know how to map DBUS_SESSION_CONFIG_FILE to the 
function above */
#else
          if (!_dbus_string_append (&config_file, DBUS_SESSION_CONFIG_FILE))
            exit (1);
#endif

_dbus_get_config_file_name() is required on windows because the config 
file name has to be computed on runtime.

Maybe on unix a similar _dbus_get_config_file_name() function could be 
defined to avoid the ifdef

BTW: The same apply to the system config file.

Ralf