diff -up cronie-1.1/src/popen.c.cleanup cronie-1.1/src/popen.c --- cronie-1.1/src/popen.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/popen.c 2008-06-17 17:00:51.000000000 +0200 @@ -31,14 +31,6 @@ */ #include -#ifndef lint -#if 0 -static char rcsid[] = "Id: popen.c,v 1.5 1994/01/15 20:43:43 vixie Exp"; -static char sccsid[] = "@(#)popen.c 5.7 (Berkeley) 2/14/89"; -//#else -//__RCSID("$NetBSD: popen.c,v 1.9 2005/03/16 02:53:55 xtraeme Exp $"); -#endif -#endif /* not lint */ #include #include diff -up cronie-1.1/src/do_command.c.cleanup cronie-1.1/src/do_command.c --- cronie-1.1/src/do_command.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/do_command.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: do_command.c,v 1.9 2004/01/23 18:56:42 vixie Exp $"; -#endif - #include static void child_process(entry *, user *); diff -up cronie-1.1/src/user.c.cleanup cronie-1.1/src/user.c --- cronie-1.1/src/user.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/user.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: user.c,v 1.5 2004/01/23 18:56:43 vixie Exp $"; -#endif - /* vix 26jan87 [log is in RCS file] */ diff -up cronie-1.1/src/cron.h.cleanup cronie-1.1/src/cron.h --- cronie-1.1/src/cron.h.cleanup 2008-05-30 11:29:46.000000000 +0200 +++ cronie-1.1/src/cron.h 2008-06-17 17:00:51.000000000 +0200 @@ -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 -up cronie-1.1/src/pw_dup.c.cleanup cronie-1.1/src/pw_dup.c --- cronie-1.1/src/pw_dup.c.cleanup 2008-05-30 11:29:46.000000000 +0200 +++ cronie-1.1/src/pw_dup.c 2008-06-17 17:00:51.000000000 +0200 @@ -29,9 +29,6 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: pw_dup.c,v 1.2 2004/01/23 18:56:43 vixie Exp $"; -#endif #include #include diff -up cronie-1.1/src/cron.c.cleanup cronie-1.1/src/cron.c --- cronie-1.1/src/cron.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/cron.c 2008-06-17 17:03:04.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: cron.c,v 1.12 2004/01/23 18:56:42 vixie Exp $"; -#endif - #define MAIN_PROGRAM #include @@ -384,7 +380,7 @@ run_reboot_jobs(cron_db *db) { static void find_jobs(int vtime, cron_db *db, int doWild, int doNonWild) { - char orig_tz, *job_tz; + char *orig_tz, *job_tz; time_t virtualSecond = vtime * SECONDS_PER_MINUTE; struct tm *tm = gmtime(&virtualSecond); int minute, hour, dom, month, dow; diff -up cronie-1.1/src/job.c.cleanup cronie-1.1/src/job.c --- cronie-1.1/src/job.c.cleanup 2008-05-30 11:29:46.000000000 +0200 +++ cronie-1.1/src/job.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: job.c,v 1.6 2004/01/23 18:56:43 vixie Exp $"; -#endif - #include typedef struct _job { diff -up cronie-1.1/src/crontab.c.cleanup cronie-1.1/src/crontab.c --- cronie-1.1/src/crontab.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/crontab.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: crontab.c,v 1.12 2004/01/23 18:56:42 vixie Exp $"; -#endif - /* crontab - install and manage per-user crontab files * vix 02may87 [RCS has the rest of the log] * vix 26jan87 [original] @@ -655,7 +651,7 @@ replace_cmd(void) { */ /*fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n"); *fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now)); - *fprintf(tmp, "# (Cron version %s -- %s)\n", CRON_VERSION, rcsid); + *fprintf(tmp, "# (Cron version %s)\n", CRON_VERSION); */ #ifdef WITH_SELINUX if ( selinux_context ) diff -up cronie-1.1/src/entry.c.cleanup cronie-1.1/src/entry.c --- cronie-1.1/src/entry.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/entry.c 2008-06-17 17:00:51.000000000 +0200 @@ -20,10 +20,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: entry.c,v 1.17 2004/01/23 18:56:42 vixie Exp $"; -#endif - /* vix 26jan87 [RCS'd; rest of log is in RCS file] * vix 01jan87 [added line-level error recovery] * vix 31dec86 [added /step to the from-to range, per bob@acornrc] diff -up cronie-1.1/src/database.c.cleanup cronie-1.1/src/database.c --- cronie-1.1/src/database.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/database.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: database.c,v 1.7 2004/01/23 18:56:42 vixie Exp $"; -#endif - /* vix 26jan87 [RCS has the log] */ diff -up cronie-1.1/src/security.c.cleanup cronie-1.1/src/security.c --- cronie-1.1/src/security.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/security.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,6 +19,9 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* just a hack for now - change to proper check in configure.ac later */ +#define _GNU_SOURCE + #include #ifdef WITH_SELINUX @@ -33,6 +36,25 @@ #include #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 +162,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) diff -up cronie-1.1/src/env.c.cleanup cronie-1.1/src/env.c --- cronie-1.1/src/env.c.cleanup 2008-05-30 11:29:46.000000000 +0200 +++ cronie-1.1/src/env.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: env.c,v 1.10 2004/01/23 18:56:42 vixie Exp $"; -#endif - #include char ** diff -up cronie-1.1/src/misc.c.cleanup cronie-1.1/src/misc.c --- cronie-1.1/src/misc.c.cleanup 2008-06-17 17:00:51.000000000 +0200 +++ cronie-1.1/src/misc.c 2008-06-17 17:00:51.000000000 +0200 @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static char rcsid[] = "$Id: misc.c,v 1.16 2004/01/23 18:56:43 vixie Exp $"; -#endif - /* vix 26jan87 [RCS has the rest of the log] * vix 30dec86 [written] */