chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: trivial simplification
[elogind.git]
/
src
/
login
/
logind-dbus.c
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index 4b59d6e968ffe0f1d57d90048407ae66a15fa26b..598b931422d12110aaff60a2f6fb4e9b9bf9d401 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-34,7
+34,7
@@
#include "escape.h"
#include "fd-util.h"
#include "fileio-label.h"
#include "escape.h"
#include "fd-util.h"
#include "fileio-label.h"
-#include "format
s
-util.h"
+#include "format-util.h"
#include "fs-util.h"
#include "logind.h"
#include "mkdir.h"
#include "fs-util.h"
#include "logind.h"
#include "mkdir.h"
@@
-1301,8
+1301,7
@@
static int flush_devices(Manager *m) {
} else {
struct dirent *de;
} else {
struct dirent *de;
- while ((de = readdir(d))) {
-
+ FOREACH_DIRENT_ALL(de, d, break) {
if (!dirent_is_file(de))
continue;
if (!dirent_is_file(de))
continue;
@@
-2450,6
+2449,7
@@
static int method_set_wall_message(
if (r < 0)
return r;
if (r < 0)
return r;
+#if 0 /// elogind only calls this for shutdown/reboot, which already needs authorization.
r = bus_verify_polkit_async(message,
CAP_SYS_ADMIN,
"org.freedesktop.login1.set-wall-message",
r = bus_verify_polkit_async(message,
CAP_SYS_ADMIN,
"org.freedesktop.login1.set-wall-message",
@@
-2462,14
+2462,11
@@
static int method_set_wall_message(
return r;
if (r == 0)
return 1; /* Will call us back */
return r;
if (r == 0)
return 1; /* Will call us back */
+#endif // 0
- if (isempty(wall_message))
- m->wall_message = mfree(m->wall_message);
- else {
- r = free_and_strdup(&m->wall_message, wall_message);
- if (r < 0)
- return log_oom();
- }
+ r = free_and_strdup(&m->wall_message, empty_to_null(wall_message));
+ if (r < 0)
+ return log_oom();
m->enable_wall_messages = enable_wall_messages;
m->enable_wall_messages = enable_wall_messages;