Service: Ensure to restore original ipsec.secrets file in all cases (!)

src/nm-l2tp-service.c

@@ -647,10 +647,6 @@ l2tpd_watch_cb (GPid pid, gint status, gpointer user_data)
 	unlink(filename);
 	g_free(filename);
 
-	filename = g_strdup_printf ("/var/run/nm-ipsec-l2tp.%d/ipsec.secrets", my_pid);
-	unlink(filename);
-	g_free(filename);
-
 	filename = g_strdup_printf ("/var/run/nm-ipsec-l2tp.%d", my_pid);
 	rmdir(filename);
 	g_free(filename);
@@ -972,13 +968,16 @@ nm_l2tp_start_ipsec(NML2tpPlugin *plugin,
 				rc = TRUE;
 				g_message(_("ipsec ready for action"));
 			} else {
-				nm_l2tp_ipsec_error(error, "Could not establish IPsec tunnel.");
+				rename(tmp_secrets, "/etc/ipsec.secrets");
+				return nm_l2tp_ipsec_error(error, "Could not establish IPsec tunnel.");
 			}
 		} else {
-			nm_l2tp_ipsec_error(error, "Could not configure IPsec tunnel.");
+			rename(tmp_secrets, "/etc/ipsec.secrets");
+			return nm_l2tp_ipsec_error(error, "Could not configure IPsec tunnel.");
 		}
 	} else {
-		nm_l2tp_ipsec_error(error, "Could not load new IPsec secret.");
+		rename(tmp_secrets, "/etc/ipsec.secrets");
+		return nm_l2tp_ipsec_error(error, "Could not load new IPsec secret.");
 	}
 
 	if (rename(tmp_secrets, "/etc/ipsec.secrets") ||