chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #19 from elogind/dev_v231
[elogind.git]
/
src
/
libelogind
/
sd-login
/
test-login.c
diff --git
a/src/libelogind/sd-login/test-login.c
b/src/libelogind/sd-login/test-login.c
index 70b03458489840f357e2d28f57a72d9ee778e530..e0a838d3fef011e8b5b7b43aad84c1a34f03d58f 100644
(file)
--- a/
src/libelogind/sd-login/test-login.c
+++ b/
src/libelogind/sd-login/test-login.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-22,18
+20,24
@@
#include <poll.h>
#include <string.h>
#include <poll.h>
#include <string.h>
-#include "s
ystemd/s
d-login.h"
+#include "sd-login.h"
-#include "util.h"
-#include "
strv
.h"
+#include "
alloc-
util.h"
+#include "
fd-util
.h"
#include "formats-util.h"
#include "formats-util.h"
+#include "string-util.h"
+#include "strv.h"
+#include "util.h"
+
+/// Additional includes needed by elogind
+#include "musl_missing.h"
static void test_login(void) {
_cleanup_close_pair_ int pair[2] = { -1, -1 };
_cleanup_free_ char *pp = NULL, *qq = NULL;
int r, k;
uid_t u, u2;
static void test_login(void) {
_cleanup_close_pair_ int pair[2] = { -1, -1 };
_cleanup_free_ char *pp = NULL, *qq = NULL;
int r, k;
uid_t u, u2;
- char *seat, *type, *class, *display, *remote_user, *remote_host, *display_session;
+ char *seat, *type, *class, *display, *remote_user, *remote_host, *display_session
, *cgroup
;
char *session;
char *state;
char *session2;
char *session;
char *state;
char *session2;
@@
-50,6
+54,10
@@
static void test_login(void) {
assert_se(sd_pid_get_owner_uid(0, &u2) == 0);
printf("user = "UID_FMT"\n", u2);
assert_se(sd_pid_get_owner_uid(0, &u2) == 0);
printf("user = "UID_FMT"\n", u2);
+ assert_se(sd_pid_get_cgroup(0, &cgroup) == 0);
+ printf("cgroup = %s\n", cgroup);
+ free(cgroup);
+
display_session = NULL;
r = sd_uid_get_display(u2, &display_session);
assert_se(r >= 0 || r == -ENODATA);
display_session = NULL;
r = sd_uid_get_display(u2, &display_session);
assert_se(r >= 0 || r == -ENODATA);
@@
-250,6
+258,7
@@
static void test_login(void) {
}
int main(int argc, char* argv[]) {
}
int main(int argc, char* argv[]) {
+ elogind_set_program_name(argv[0]);
log_parse_environment();
log_open();
log_parse_environment();
log_open();