X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind-user.c;h=56c7de4400aa90bbfe67a3eeed81bd9ef4534a21;hb=ad293f5a94d8124ece7d1cb860952a87b1c8d98f;hp=3c245c09272ec57563b53b0246d540aad37c9e0f;hpb=034a2a52ac0ec83e0229941d635d310b23eb04df;p=elogind.git

diff --git a/src/logind-user.c b/src/logind-user.c
index 3c245c092..56c7de440 100644
--- a/src/logind-user.c
+++ b/src/logind-user.c
@@ -142,7 +142,7 @@ int user_save(User *u) {
                         fprintf(f,
                                 "%s%c",
                                 i->id,
-                                i->sessions_by_seat_next ? ' ' : '\n');
+                                i->sessions_by_user_next ? ' ' : '\n');
                 }
 
                 fputs("SEATS=", f);
@@ -151,7 +151,7 @@ int user_save(User *u) {
                                 fprintf(f,
                                         "%s%c",
                                         i->seat->id,
-                                        i->sessions_by_seat_next ? ' ' : '\n');
+                                        i->sessions_by_user_next ? ' ' : '\n');
                 }
 
                 fputs("ACTIVE_SESSIONS=", f);
@@ -160,7 +160,7 @@ int user_save(User *u) {
                                 fprintf(f,
                                         "%lu%c",
                                         (unsigned long) i->user->uid,
-                                        i->sessions_by_seat_next ? ' ' : '\n');
+                                        i->sessions_by_user_next ? ' ' : '\n');
 
                 fputs("ACTIVE_SEATS=", f);
                 LIST_FOREACH(sessions_by_user, i, u->sessions) {
@@ -168,7 +168,7 @@ int user_save(User *u) {
                                 fprintf(f,
                                         "%s%c",
                                         i->seat->id,
-                                        i->sessions_by_seat_next ? ' ' : '\n');
+                                        i->sessions_by_user_next ? ' ' : '\n');
                 }
         }
 
@@ -409,7 +409,7 @@ static int user_remove_runtime_path(User *u) {
         if (!u->runtime_path)
                 return 0;
 
-        r = rm_rf(u->runtime_path, false, true);
+        r = rm_rf(u->runtime_path, false, true, false);
         if (r < 0)
                 log_error("Failed to remove runtime directory %s: %s", u->runtime_path, strerror(-r));