From c42ba50c90fa1e01e50ab150ba4cf00c7480d9dd Mon Sep 17 00:00:00 2001
From: Thomas Liske <thomas@fiasko-nw.net>
Date: Fri, 10 Jul 2015 19:54:15 +0200
Subject: [PATCH] Ad AD_MAINTAINER env variable and make legacy MAINTAINER env
 variable working.

---
 README.hooks | 1 +
 src/env.c    | 7 ++++++-
 src/ui.c     | 4 ----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.hooks b/README.hooks
index ba654ad..660b0a7 100644
--- a/README.hooks
+++ b/README.hooks
@@ -57,6 +57,7 @@ apt-dater configuration:
  AD_HOOK_PRE_REFRESH
  AD_HOOK_PRE_UPDATE
  AD_HOSTSFILE
+ AD_MAINTAINER
  AD_SCREENRCFILE
  AD_SFTP_CMD
  AD_SSH_CMD
diff --git a/src/env.c b/src/env.c
index 51864a5..4edbe09 100644
--- a/src/env.c
+++ b/src/env.c
@@ -23,6 +23,7 @@
  */
 
 #include "env.h"
+#include "ui.h"
 
 GSList *base_env = NULL;
 
@@ -68,7 +69,7 @@ env_init(gchar **envp) {
 
 gchar **
 env_build(HostNode *n, const gchar *action, const gchar *param, const HistoryEntry *he) {
-    gchar **new_env = (gchar **) g_new0(gchar**, g_slist_length(base_env) + 22
+    gchar **new_env = (gchar **) g_new0(gchar**, g_slist_length(base_env) + 24
 #ifdef FEAT_CLUSTERS
     + g_list_length(n->clusters)
 #endif
@@ -150,5 +151,9 @@ env_build(HostNode *n, const gchar *action, const gchar *param, const HistoryEnt
     else
      ADD_HENV("PARAM"           , "");
 
+    ADD_HENV("MAINTAINER", maintainer);
+    /* add legacy MAINTAINER env variable */
+    new_env[i++] = g_strdup_printf("MAINTAINER=%s", maintainer);
+
     return new_env;
 }
diff --git a/src/ui.c b/src/ui.c
index 7e4fd3a..edf92e2 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1858,8 +1858,6 @@ void doUI (GList *hosts)
      strncpy(maintainer, pw->pw_name, sizeof(maintainer));
    else
      maintainer[0] = 0;
-
-   setenv("MAINTAINER", maintainer, TRUE);
  }
 
  if ((cfg->query_maintainer == 1) ||
@@ -1886,8 +1884,6 @@ void doUI (GList *hosts)
 
    delwin(w);
    refreshDraw();
-
-   setenv("MAINTAINER", maintainer, TRUE);
  }
 }