+2007-06-21 Ralf Habacker <ralf.habacker@freenet.de>
+
+ * dbus/dbus-sysdeps-win.c, dbus/dbus-sysdeps-util-win.c,
+ dbus/dbus-sysdeps-win.h: disabled uid/sid conversation stuff
+ implementation by Peter Kuemmel
+
2007-06-21 Ralf Habacker <ralf.habacker@freenet.de>
* dbus/dbus-watch.c (dbus_watch_get_fd): this function is
_DBUS_DEFINE_GLOBAL_LOCK (win_fds);
#endif
+#ifdef ENABLE_UID_TO_SID
_DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
+#endif
#ifdef ENABLE_DBUSUSERINFO
typedef struct {
#ifdef _DBUS_WIN_USE_RANDOMIZER
static int win_encap_randomizer;
#endif
-static DBusHashTable *sid_atom_cache = NULL;
+#ifdef ENABLE_UID_TO_SID
+static DBusHashTable *sid_atom_cache = NULL;
+#endif
static DBusString dbusdir;
static int working_dir_init = 0;
return retval;
}
+#ifdef ENABLE_UID_TO_SID
static void
_sid_atom_cache_shutdown (void *unused)
{
_dbus_verbose("%s converted %s into sid \n",__FUNCTION__, string);
return TRUE;
}
-
+#endif
/** @} end of sysdeps-win */
dbus_uid_t
_dbus_getuid(void)
{
+#ifndef ENABLE_UID_TO_SID
+ return DBUS_UID_UNSET;
+#else
dbus_uid_t retval = DBUS_UID_UNSET;
HANDLE process_token = NULL;
TOKEN_USER *token_user = NULL;
_dbus_verbose("_dbus_getuid() returns %d\n",retval);
return retval;
+#endif
}
/**
dbus_gid_t
_dbus_getgid (void)
{
+#ifndef ENABLE_UID_TO_SID
+ return DBUS_GID_UNSET;
+#else
dbus_gid_t retval = DBUS_GID_UNSET;
HANDLE process_token = NULL;
TOKEN_PRIMARY_GROUP *token_primary_group = NULL;
CloseHandle (process_token);
return retval;
+#endif
}
#if 0
void _dbus_win_set_error_from_win_error (DBusError *error, int code);
+#ifdef ENABLE_UID_TO_SID
dbus_uid_t _dbus_win_sid_to_uid_t (void *psid);
dbus_bool_t _dbus_uid_t_to_win_sid (dbus_uid_t uid,
void **ppsid);
_dbus_account_to_win_sid (const wchar_t *waccount,
void **ppsid,
DBusError *error);
+#endif
+
dbus_bool_t
_dbus_win_sid_to_name_and_domain (dbus_uid_t uid,
wchar_t **wname,