Move macros and static declarations where they are needed.

diff --git a/src/cron.h b/src/cron.h
index 6ed3de16af411c8b7ca2d9725f391597a18bd4d1..dff8fc1a0587773c975985aa92152830a1b46bfa 100644 (file)
--- a/src/cron.h
+++ b/src/cron.h
@@ -49,20 +49,3 @@
 #include "funcs.h"
 #include "globals.h"
 
-#ifdef WITH_PAM
-static pam_handle_t *pamh = NULL;
-static int pam_session_opened = 0;  //global for open session
-static const struct pam_conv conv = {
-    NULL
-};
-
-#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
-    fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \
-    if (pamh != NULL) { \
-        if (pam_session_opened != 0) \
-            pam_close_session(pamh, PAM_SILENT); \
-        pam_end(pamh, retcode); \
-    } \
-        return(retcode);    }
-#endif
-

diff --git a/src/security.c b/src/security.c
index 03336304cc70c15dd68ac73933771a5afd3e826d..eb4c9c137c3ff0fa82d7e56232c71750f3cf7af7 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -33,6 +33,25 @@
 #include <libaudit.h>
 #endif
 
+#ifdef WITH_PAM
+static pam_handle_t *pamh = NULL;
+static int pam_session_opened = 0;  //global for open session
+static const struct pam_conv conv = {
+    NULL
+};
+
+static int cron_open_pam_session(struct passwd *pw);
+
+#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
+    fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \
+    if (pamh != NULL) { \
+        if (pam_session_opened != 0) \
+            pam_close_session(pamh, PAM_SILENT); \
+        pam_end(pamh, retcode); \
+    } \
+        return(retcode);    }
+#endif
+
 static char ** build_env(char **cronenv);
 
 #ifdef WITH_SELINUX
@@ -140,7 +159,7 @@ int cron_start_pam(struct passwd *pw) {
     return retcode;
 }
 
-int cron_open_pam_session(struct passwd *pw) {
+static int cron_open_pam_session(struct passwd *pw) {
     int        retcode = 0;
 
 #if defined(WITH_PAM)