New upstream version 242

[systemd.git] / src / shared / main-func.h

diff --git a/src/shared/main-func.h b/src/shared/main-func.h
index 3c182e802b985c5ce25150690055cb242e4b0b5b..1b77316d82ee9d6012fdcf027ff33b0bcc555c32 100644 (file)
--- a/src/shared/main-func.h
+++ b/src/shared/main-func.h
@@ -8,17 +8,19 @@
 #include "spawn-ask-password-agent.h"
 #include "spawn-polkit-agent.h"
 #include "static-destruct.h"
+#include "util.h"
 
 #define _DEFINE_MAIN_FUNCTION(intro, impl, ret)                         \
         int main(int argc, char *argv[]) {                              \
                 int r;                                                  \
+                save_argc_argv(argc, argv);                             \
                 intro;                                                  \
                 r = impl;                                               \
-                static_destruct();                                      \
                 ask_password_agent_close();                             \
                 polkit_agent_close();                                   \
-                mac_selinux_finish();                                   \
                 pager_close();                                          \
+                mac_selinux_finish();                                   \
+                static_destruct();                                      \
                 return ret;                                             \
         }