=== modified file 'hipd/init.c'
--- hipd/init.c 2011-05-04 16:20:00 +0000
+++ hipd/init.c 2011-06-01 11:30:02 +0000
@@ -1031,6 +1031,8 @@
      * @todo: should append, not overwrite  */
     setenv("PATH", HIP_DEFAULT_EXEC_PATH, 1);
 
+    hip_xfrm_set_nl_ipsec(&hip_nl_ipsec);
+
     /* Open daemon lock file and read pid from it. */
     HIP_IFEL(hip_create_lock_file(HIP_DAEMON_LOCK_FILE, killold), -1,
              "locking failed\n");
@@ -1090,8 +1092,6 @@
         goto out_err;
     }
 
-    hip_xfrm_set_nl_ipsec(&hip_nl_ipsec);
-
     hip_raw_sock_output_v6 = hip_init_raw_sock_v6(IPPROTO_HIP);
     HIP_IFEL(hip_raw_sock_output_v6 < 0, -1, "raw sock output v6\n");