Merge pull request #15703 from poettering/homed-tweak-default-storage

homed: avoid double encryption

diff --combined meson.build
index 97ee0856a0441bd3f0987b74209dc91f04054d17,1ba304770cf3a4db5eee72d1a118ac0c64ffba3a..4c997ab6f7ed0bc9f5dc34a3077fcd07ddd04ff8
--- 1/meson.build
--- 2/meson.build
+++ b/meson.build
@@@ -1492,6 -1492,7 +1492,7 @@@ meson_apply_m4 = find_program('tools/me
  
  includes = include_directories('src/basic',
                                 'src/boot',
+                                'src/home',
                                 'src/shared',
                                 'src/systemd',
                                 'src/journal',
@@@ -2891,8 -2892,6 +2892,8 @@@ if conf.get('ENABLE_TMPFILES') == 
          exe = executable(
                  'systemd-tmpfiles',
                  'src/tmpfiles/tmpfiles.c',
 +                'src/tmpfiles/offline-passwd.c',
 +                'src/tmpfiles/offline-passwd.h',
                  include_directories : includes,
                  link_with : [libshared],
                  dependencies : [libacl],

diff --combined src/home/homed-manager.c
index 70673fc84d6e1fcd39a97809e2879ff4b038abfc,eb5034692c94491f64b9d2c833620e5652825fbe..df0ed2f4f36f550b6a7d6fc3e2f53f43fde8a155
--- 1/src/home/homed-manager.c
--- 2/src/home/homed-manager.c
+++ b/src/home/homed-manager.c
@@@ -24,6 -24,7 +24,7 @@@
  #include "fs-util.h"
  #include "gpt.h"
  #include "home-util.h"
+ #include "homed-conf.h"
  #include "homed-home-bus.h"
  #include "homed-home.h"
  #include "homed-manager-bus.h"
@@@ -184,10 -185,18 +185,18 @@@ int manager_new(Manager **ret) 
  
          assert(ret);
  
-         m = new0(Manager, 1);
+         m = new(Manager, 1);
          if (!m)
                  return -ENOMEM;
  
+         *m = (Manager) {
+                 .default_storage = _USER_STORAGE_INVALID,
+         };
+ 
+         r = manager_parse_config_file(m);
+         if (r < 0)
+                 return r;
+ 
          r = sd_event_default(&m->event);
          if (r < 0)
                  return r;
@@@ -251,6 -260,8 +260,8 @@@ Manager* manager_free(Manager *m) 
  
          varlink_server_unref(m->varlink_server);
  
+         free(m->default_file_system_type);
+ 
          return mfree(m);
  }
  
@@@ -946,7 -957,10 +957,7 @@@ static ssize_t read_datagram(int fd, st
                  return -ENOMEM;
  
          if (ret_sender) {
 -                union {
 -                        struct cmsghdr cmsghdr;
 -                        uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
 -                } control;
 +                CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred))) control;
                  bool found_ucred = false;
                  struct cmsghdr *cmsg;
                  struct msghdr mh;