diff options
| author | Simon McVittie <smcv@debian.org> | 2015-03-31 08:38:52 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-03-31 08:53:52 -0400 |
| commit | 2291767a014f5a04a92ca6f0eb472794f212ca67 (patch) | |
| tree | df95c18bd0b6e4a65f12108f3d5b984a0f0a0aeb /src | |
| parent | f4d71e0de885010494b8b0b8d62ca910011d7544 (diff) | |
| download | polkit-2291767a014f5a04a92ca6f0eb472794f212ca67.tar.gz | |
Use libsystemd instead of older libsystemd-login if possible
The command-line option is still --enable-libsystemd-login for now.
Bug-Debian: https://bugs.debian.org/779756
Diffstat (limited to 'src')
| -rw-r--r-- | src/polkit/Makefile.am | 6 | ||||
| -rw-r--r-- | src/polkitbackend/Makefile.am | 6 | ||||
| -rw-r--r-- | src/polkitbackend/polkitbackendjsauthority.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am index d648d29..5f08bb2 100644 --- a/src/polkit/Makefile.am +++ b/src/polkit/Makefile.am @@ -81,7 +81,7 @@ libpolkit_gobject_1_la_SOURCES = \ polkitpermission.c polkitpermission.h \ $(NULL) -if HAVE_LIBSYSTEMD_LOGIN +if HAVE_LIBSYSTEMD libpolkit_gobject_1_la_SOURCES += \ polkitunixsession-systemd.c polkitunixsession.h else @@ -92,12 +92,12 @@ endif libpolkit_gobject_1_la_CFLAGS = \ -D_POLKIT_COMPILATION \ $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_LOGIN_CFLAGS) \ + $(LIBSYSTEMD_CFLAGS) \ $(NULL) libpolkit_gobject_1_la_LIBADD = \ $(GLIB_LIBS) \ - $(LIBSYSTEMD_LOGIN_LIBS) \ + $(LIBSYSTEMD_LIBS) \ $(NULL) libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am index 9f430d0..5120e82 100644 --- a/src/polkitbackend/Makefile.am +++ b/src/polkitbackend/Makefile.am @@ -38,7 +38,7 @@ libpolkit_backend_1_la_SOURCES = \ polkitbackendactionlookup.h polkitbackendactionlookup.c \ $(NULL) -if HAVE_LIBSYSTEMD_LOGIN +if HAVE_LIBSYSTEMD libpolkit_backend_1_la_SOURCES += \ polkitbackendsessionmonitor.h polkitbackendsessionmonitor-systemd.c else @@ -50,13 +50,13 @@ libpolkit_backend_1_la_CFLAGS = \ -D_POLKIT_COMPILATION \ -D_POLKIT_BACKEND_COMPILATION \ $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_LOGIN_CFLAGS) \ + $(LIBSYSTEMD_CFLAGS) \ $(LIBJS_CFLAGS) \ $(NULL) libpolkit_backend_1_la_LIBADD = \ $(GLIB_LIBS) \ - $(LIBSYSTEMD_LOGIN_LIBS) \ + $(LIBSYSTEMD_LIBS) \ $(top_builddir)/src/polkit/libpolkit-gobject-1.la \ $(EXPAT_LIBS) \ $(LIBJS_LIBS) \ diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c index c507595..d18b5b1 100644 --- a/src/polkitbackend/polkitbackendjsauthority.c +++ b/src/polkitbackend/polkitbackendjsauthority.c @@ -35,9 +35,9 @@ #include <polkit/polkitprivate.h> -#ifdef HAVE_LIBSYSTEMD_LOGIN +#ifdef HAVE_LIBSYSTEMD #include <systemd/sd-login.h> -#endif /* HAVE_LIBSYSTEMD_LOGIN */ +#endif /* HAVE_LIBSYSTEMD */ #include <jsapi.h> @@ -764,7 +764,7 @@ subject_to_jsval (PolkitBackendJsAuthority *authority, g_assert_not_reached (); } -#ifdef HAVE_LIBSYSTEMD_LOGIN +#ifdef HAVE_LIBSYSTEMD if (sd_pid_get_session (pid, &session_str) == 0) { if (sd_session_get_seat (session_str, &seat_str) == 0) @@ -772,7 +772,7 @@ subject_to_jsval (PolkitBackendJsAuthority *authority, /* do nothing */ } } -#endif /* HAVE_LIBSYSTEMD_LOGIN */ +#endif /* HAVE_LIBSYSTEMD */ g_assert (POLKIT_IS_UNIX_USER (user_for_subject)); uid = polkit_unix_user_get_uid (POLKIT_UNIX_USER (user_for_subject)); |