summaryrefslogtreecommitdiff
path: root/dbus/dbus-sysdeps-win.h
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-06-14 17:37:27 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-06-14 17:37:27 +0000
commit7020303391731ebfdc80da9edaff5b6c2732f024 (patch)
treed350fc2ad6b972458c14a1f5f95d75665b112ce3 /dbus/dbus-sysdeps-win.h
parent9bdc8322ff774dd537a1342f45fc6420c507b748 (diff)
downloaddbus-7020303391731ebfdc80da9edaff5b6c2732f024.tar.gz
* dbus/dbus-sysdeps-win.c: disabled DBusUserInfo related code
(_dbus_append_desired_identity,_dbus_windows_user_is_process_owner): new win32 functions as counterpart of unix related (_dbus_send_credentials_socket,_dbus_read_credentials_socket): renamed from ..._unix_socket (_dbus_send_credentials_unix_socket): removed obsolate function * dbus/dbus-sysdeps-win-util.c: disabled DBusGroupInfo related code (_dbus_verify_daemon_user,_dbus_change_to_daemon_user): new win32 functions as counterpart of unix related
Diffstat (limited to 'dbus/dbus-sysdeps-win.h')
-rw-r--r--dbus/dbus-sysdeps-win.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
index 29d5b0df..2dd25eed 100644
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -78,7 +78,7 @@ void _dbus_win_warn_win_error (const char *message,
int code);
extern const char* _dbus_lm_strerror (int error_number);
-
+#ifdef ENABLE_DBUSUSERINFO
dbus_bool_t
fill_win_user_info_from_uid (dbus_uid_t uid,
DBusUserInfo *info,
@@ -88,6 +88,13 @@ fill_win_user_info_from_name (wchar_t *wname,
DBusUserInfo *info,
DBusError *error);
+dbus_bool_t
+fill_user_info (DBusUserInfo *info,
+ dbus_uid_t uid,
+ const DBusString *username,
+ DBusError *error);
+#endif
+
dbus_bool_t _dbus_win_account_to_sid (const wchar_t *waccount,
void **ppsid,
DBusError *error);
@@ -154,13 +161,7 @@ struct DBusFile
void _dbus_handle_to_socket (int handle,
DBusSocket **socket);
int _dbus_socket_to_handle (DBusSocket *socket);
-
-dbus_bool_t
-fill_user_info (DBusUserInfo *info,
- dbus_uid_t uid,
- const DBusString *username,
- DBusError *error);
-
+#if 0
// replace with a windows version
dbus_bool_t _dbus_open_unix_socket (int *fd,
DBusError *error);
@@ -171,6 +172,7 @@ int _dbus_listen_unix_socket (const char *path,
dbus_bool_t abstract,
DBusError *error);
+#endif
dbus_bool_t _dbus_get_config_file_name(DBusString *config_file,
char *s);