unit: properly update references to units which are merged

When we merge units that some kind of object points to, those pointers
might become invalidated, and needs to be updated. Introduce a UnitRef
struct which links up all the unit references, to ensure corrected
references.

At the same time, drop configured_sockets in the Service object, and
replace it by proper UNIT_TRIGGERS resp. UNIT_TRIGGERED_BY dependencies,
which allow us to simplify a lot of code.

1 files changed, 1 insertions, 2 deletions

diff --git a/src/automount.h b/src/automount.h
index 1a6cc98fd1..c6326ed3c2 100644
--- a/src/automount.h
+++ b/src/automount.h
@@ -42,14 +42,13 @@ struct Automount {
 
         char *where;
 
-        Mount *mount;
+        UnitRef mount;
 
         int pipe_fd;
         mode_t directory_mode;
         Watch pipe_watch;
         dev_t dev_id;
 
-
         Set *tokens;
 
         bool failure:1;