summaryrefslogtreecommitdiff
path: root/src/login/logind-user.h
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2017-04-06 14:56:03 +0200
committerSven Eden <yamakuzure@gmx.net>2017-04-26 12:59:13 +0200
commitda4b83e77bc603745cf4a365d7f013301ef7fa89 (patch)
tree293d9508eeb1f841c71b0b0517287fd398aded82 /src/login/logind-user.h
parenteaca07ccfdf5d7dabc50afc7e539c2413dd69d3e (diff)
Prep v228: Add remaining updates from upstream (3/3)
Apply remaining fixes and the performed move of utility functions into their own foo-util.[hc] files on the rest of elogind.
Diffstat (limited to 'src/login/logind-user.h')
-rw-r--r--src/login/logind-user.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index b30e7d60c..a59b11b2a 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -39,19 +39,17 @@ typedef enum UserState {
struct User {
Manager *manager;
-
uid_t uid;
gid_t gid;
char *name;
-
char *state_file;
char *runtime_path;
/* These are always NULL, and here just for logind-user-dbus.c
to easily provide a NULL value for the user's service and
slice properties. */
- char *service;
char *slice;
+ char *service;
/// UNNEEDED (and unsupported) by elogind
#if 0
@@ -71,8 +69,11 @@ struct User {
LIST_FIELDS(User, gc_queue);
};
-User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name);
-void user_free(User *u);
+int user_new(User **out, Manager *m, uid_t uid, gid_t gid, const char *name);
+User *user_free(User *u);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(User *, user_free);
+
bool user_check_gc(User *u, bool drop_not_started);
void user_add_to_gc_queue(User *u);
int user_start(User *u);