diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-04 16:22:09 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-04 16:25:24 +0200 |
| commit | 249968612f16a71df909d6e73785c18a9ff36a65 (patch) | |
| tree | 858e6d966f4da7ef38c011fb1e1c4acd477219a8 /src/login | |
| parent | ef392da6c56cdfff35265403192f051af257b3f8 (diff) | |
bus: always explicitly close bus from main programs
Since b5eca3a2059f9399d1dc52cbcf9698674c4b1cf0 we don't attempt to GC
busses anymore when unsent messages remain that keep their reference,
when they otherwise are not referenced anymore. This means that if we
explicitly want connections to go away, we need to close them.
With this change we will no do so explicitly wherver we connect to the
bus from a main program (and thus know when the bus connection should go
away), or when we create a private bus connection, that really should go
away after our use.
This fixes connection leaks in the NSS and PAM modules.
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/inhibit.c | 2 | ||||
| -rw-r--r-- | src/login/loginctl.c | 2 | ||||
| -rw-r--r-- | src/login/pam_systemd.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 02b6b25751..d5ea1d913c 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -218,7 +218,7 @@ static int parse_argv(int argc, char *argv[]) { int main(int argc, char *argv[]) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; log_parse_environment(); diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 1773276b95..fcdf6275e9 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -1295,7 +1295,7 @@ static int loginctl_main(sd_bus *bus, int argc, char *argv[]) { } int main(int argc, char *argv[]) { - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; setlocale(LC_ALL, ""); diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index f522d6ec4f..0c71177deb 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -213,7 +213,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( *seat = NULL, *type = NULL, *class = NULL, *class_pam = NULL, *type_pam = NULL, *cvtnr = NULL, *desktop = NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int session_fd = -1, existing, r; bool debug = false, remote; struct passwd *pw; @@ -496,7 +496,7 @@ _public_ PAM_EXTERN int pam_sm_close_session( int argc, const char **argv) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; const void *existing = NULL; const char *id; int r; |