From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 29 Jan 2010 22:57:07 +0000 (+0100)
Subject: _dbus_change_to_daemon_user() is platform related  and commit 0a3905d7f3b2ff43b094798... 
X-Git-Tag: dbus-1.3.1~120^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2016b83dece7f220269033e7957fb02140334294;p=platform%2Fupstream%2Fdbus.git

_dbus_change_to_daemon_user() is platform related  and commit 0a3905d7f3b2ff43b09479863775939f9c8acad4 broke windows builds
---

diff --git a/bus/selinux.c b/bus/selinux.c
index 456723a..614fa31 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -22,7 +22,9 @@
  */
 #include <dbus/dbus-internals.h>
 #include <dbus/dbus-string.h>
+#ifndef DBUS_WIN
 #include <dbus/dbus-userdb.h>
+#endif
 #include "selinux.h"
 #include "services.h"
 #include "policy.h"
@@ -1017,6 +1019,7 @@ bus_selinux_shutdown (void)
 #endif /* HAVE_SELINUX */
 }
 
+#ifndef DBUS_WIN
 /**
  * Changes the user and group the bus is running as.
  *
@@ -1118,3 +1121,5 @@ _dbus_change_to_daemon_user  (const char    *user,
  return TRUE;
 }
 
+#endif
+
diff --git a/bus/selinux.h b/bus/selinux.h
index f208fbe..3bab36d 100644
--- a/bus/selinux.h
+++ b/bus/selinux.h
@@ -68,7 +68,5 @@ BusSELinuxID* bus_selinux_init_connection_id (DBusConnection *connection,
 
 
 void bus_selinux_audit_init(void);
-dbus_bool_t _dbus_change_to_daemon_user (const char *user,
-                                         DBusError  *error);
 
 #endif /* BUS_SELINUX_H */
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 75d5cc2..50998f0 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -408,6 +408,8 @@ dbus_bool_t _dbus_become_daemon   (const DBusString *pidfile,
                                    dbus_bool_t       keep_umask);
 
 dbus_bool_t _dbus_verify_daemon_user    (const char *user);
+dbus_bool_t _dbus_change_to_daemon_user (const char *user,
+                                         DBusError  *error);
 
 dbus_bool_t _dbus_write_pid_to_file_and_pipe (const DBusString *pidfile,
                                               DBusPipe         *print_pid_pipe,