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, 1 deletions

diff --git a/src/timer.h b/src/timer.h
index 6295605510..ad55cf7c87 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -63,7 +63,7 @@ struct Timer {
         usec_t next_elapse;
 
         TimerState state, deserialized_state;
-        Unit *unit;
+        UnitRef unit;
 
         Watch timer_watch;