Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/crontab.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/crontab.c b/src/crontab.c index 7eda894..0e4c851 100644 --- a/src/crontab.c +++ b/src/crontab.c @@ -108,20 +108,26 @@ static const char *tmp_path(void); static void usage(const char *msg) { fprintf(stderr, "%s: usage error: %s\n", ProgramName, msg); - fprintf(stderr, "usage:\t%s [-u user] file\n", ProgramName); - fprintf(stderr, "\t%s [-u user] [ -e | -l | -r ]\n", ProgramName); - fprintf(stderr, "\t%s -n [ hostname ]\n", ProgramName); - fprintf(stderr, "\t%s -c\n", ProgramName); - fprintf(stderr, "\t\t(default operation is replace, per 1003.2)\n"); - fprintf(stderr, "\t-e\t(edit user's crontab)\n"); - fprintf(stderr, "\t-l\t(list user's crontab)\n"); - fprintf(stderr, "\t-r\t(delete user's crontab)\n"); - fprintf(stderr, "\t-i\t(prompt before deleting user's crontab)\n"); - fprintf(stderr, "\t-n\t(set host in cluster to run users' crontabs)\n"); - fprintf(stderr, "\t-c\t(get host in cluster to run users' crontabs)\n"); + fprintf(stderr, "Usage:\n"); + fprintf(stderr, " %s [options] file\n", ProgramName); + fprintf(stderr, " %s [options]\n", ProgramName); + fprintf(stderr, " %s -n [hostname]\n", ProgramName); + fprintf(stderr, "\n"); + fprintf(stderr, "Options:\n"); + fprintf(stderr, " -u <user> define user\n"); + fprintf(stderr, " -e edit user's crontab\n"); + fprintf(stderr, " -l list user's crontab\n"); + fprintf(stderr, " -r delete user's crontab\n"); + fprintf(stderr, " -i prompt before deleting\n"); + fprintf(stderr, " -n set host in cluster to run users' crontabs\n"); + fprintf(stderr, " -c get host in cluster to run users' crontabs\n"); #ifdef WITH_SELINUX - fprintf(stderr, "\t-s\t(selinux context)\n"); + fprintf(stderr, " -s selinux context\n"); #endif +#ifdef DEBUGGING + fprintf(stderr, " -x <mask> enable debugging\n"); +#endif + fprintf(stderr, "\nDefault operation is replace, per 1003.2\n"); exit(ERROR_EXIT); } -- 1.8.0.1

On 01/02/2013 12:18 PM, Marcela Mašláňová wrote: Hm, I'm sorry. So signed off is not only what I thought: http://gerrit.googlecode.com/svn/documentation/2.0/user-signedoffby.html Marcela

Earlier use of MAXHOSTNAMELEN is not posix compliant, though it usually results to be correct value. Using sysconf() is more correct, and avoids rather nasty gethostname() catch. If a hostname length is exactly the maximum a character buffer which has lenght of MAXHOSTNAMELEN will not be null terminated. That will leave the later string operations vulnerable to buffer overflow. Reference: http://refspecs.linuxfoundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-g... Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/crontab.c | 26 ++++++++++++++++++-------- src/database.c | 10 +++++++--- src/do_command.c | 7 +++++-- src/funcs.h | 6 ++++-- src/misc.c | 30 +++++++++++++++++++++++++++++- 5 files changed, 63 insertions(+), 16 deletions(-) diff --git a/src/crontab.c b/src/crontab.c index 0e4c851..28e75a0 100644 --- a/src/crontab.c +++ b/src/crontab.c @@ -90,7 +90,7 @@ static char *selinux_context = 0; static PID_T Pid; static char User[MAX_UNAME], RealUser[MAX_UNAME]; static char Filename[MAX_FNAME], TempFilename[MAX_FNAME]; -static char Host[MAXHOSTNAMELEN]; +static char *Host; static FILE *NewCrontab; static int CheckErrorCount; static int PromptOnDelete; @@ -325,9 +325,13 @@ static void parse_args(int argc, char *argv[]) { if (Option == opt_hostset && argv[optind] != NULL) { HostSpecified = 1; - if (strlen(argv[optind]) >= sizeof Host) + if (strlen(argv[optind]) >= get_hostname_max()) usage("hostname too long"); - (void) strcpy(Host, argv[optind]); + Host = strdup(argv[optind]); + if (Host == NULL) { + fprintf(stderr, "host argument strdup failed\n"); + exit(ERROR_EXIT); + } optind++; } @@ -453,9 +457,9 @@ static char *host_specific_filename(const char *filename, int prefix) */ static char safename[MAX_FNAME]; - char hostname[MAXHOSTNAMELEN]; + char *hostname = xgethostname(); - if (gethostname(hostname, sizeof hostname) != 0) + if (hostname == NULL) return NULL; if (prefix) { @@ -907,7 +911,7 @@ static int hostset_cmd(void) { char *safename; if (!HostSpecified) - gethostname(Host, sizeof Host); + Host = xgethostname(); safename = host_specific_filename("tmp.XXXXXXXXXX", 1); if (!safename || !glue_strings(TempFilename, sizeof TempFilename, SPOOL_DIR, @@ -965,6 +969,7 @@ static int hostset_cmd(void) { (void) unlink(TempFilename); TempFilename[0] = '\0'; } + free(Host); return (error); } @@ -972,8 +977,10 @@ static int hostget_cmd(void) { char n[MAX_FNAME]; FILE *f; + Host = xgethostname(); if (!glue_strings(n, sizeof n, SPOOL_DIR, CRON_HOSTNAME, '/')) { fprintf(stderr, "path too long\n"); + free(Host); return (-2); } @@ -982,12 +989,14 @@ static int hostget_cmd(void) { fprintf(stderr, "File %s not found\n", n); else perror(n); - return (-2); + free(Host); + return (-2); } - if (get_string(Host, sizeof Host, f, "\n") == EOF) { + if (get_string(Host, get_hostname_max(), f, "\n") == EOF) { fprintf(stderr, "Error reading from %s\n", n); fclose(f); + free(Host); return (-2); } @@ -997,6 +1006,7 @@ static int hostget_cmd(void) { fflush(stdout); log_it(RealUser, Pid, "GET HOST", Host, 0); + free(Host); return (0); } diff --git a/src/database.c b/src/database.c index 61764d7..50bfd1b 100644 --- a/src/database.c +++ b/src/database.c @@ -255,7 +255,7 @@ cluster_host_is_local(void) char filename[MAXNAMLEN+1]; int is_local; FILE *f; - char hostname[MAXHOSTNAMELEN], myhostname[MAXHOSTNAMELEN]; + char *hostname, *myhostname; if (!EnableClustering) return (1); @@ -275,14 +275,18 @@ cluster_host_is_local(void) is_local = 0; if (glue_strings(filename, sizeof filename, SPOOL_DIR, CRON_HOSTNAME, '/')) { if ((f = fopen(filename, "r"))) { + hostname = xgethostname(); + myhostname = xgethostname(); - if (EOF != get_string(hostname, MAXHOSTNAMELEN, f, "\n") && - gethostname(myhostname, MAXHOSTNAMELEN) == 0) { + if (!hostname && !myhostname && + EOF != get_string(hostname, MAXHOSTNAMELEN, f, "\n")) { is_local = (strcmp(myhostname, hostname) == 0); } else { Debug(DLOAD, ("cluster: hostname comparison error\n")); } + free(hostname); + free(myhostname); fclose(f); } else { Debug(DLOAD, ("cluster: file %s not found\n", filename)); diff --git a/src/do_command.c b/src/do_command.c index cf2b7ab..f4ed647 100644 --- a/src/do_command.c +++ b/src/do_command.c @@ -413,12 +413,14 @@ static int child_process(entry * e, char **jobenv) { && strncmp(MailCmd,"off",4) && !SyslogOutput) { char **env; char mailcmd[MAX_COMMAND]; - char hostname[MAXHOSTNAMELEN]; + char *hostname; char *content_type = env_get("CONTENT_TYPE", jobenv), *content_transfer_encoding = env_get("CONTENT_TRANSFER_ENCODING", jobenv); - gethostname(hostname, MAXHOSTNAMELEN); + do + hostname = xgethostname(); + while (hostname == NULL && usleep(1000)); if (MailCmd[0] == '\0') { if (snprintf(mailcmd, sizeof mailcmd, MAILFMT, MAILARG, mailfrom) @@ -439,6 +441,7 @@ static int child_process(entry * e, char **jobenv) { fprintf(mail, "To: %s\n", mailto); fprintf(mail, "Subject: Cron <%s@%s> %s\n", usernm, first_word(hostname, "."), e->cmd); + free(hostname); #ifdef MAIL_DATE fprintf(mail, "Date: %s\n", arpadate(&StartTime)); diff --git a/src/funcs.h b/src/funcs.h index 4d95d22..d9afd48 100644 --- a/src/funcs.h +++ b/src/funcs.h @@ -73,7 +73,8 @@ int load_database(cron_db *), allowed(const char * ,const char * ,const char *), strdtb(char *); -size_t strlens(const char *, ...); +size_t strlens(const char *, ...), + get_hostname_max(void); char *env_get(const char *, char **), *arpadate(time_t *), @@ -81,7 +82,8 @@ char *env_get(const char *, char **), *first_word(const char *, const char *), **env_init(void), **env_copy(char **), - **env_set(char **, char *); + **env_set(char **, char *), + *xgethostname(void); user *load_user(int, struct passwd *, const char *, const char *, const char *), *find_user(cron_db *, const char *, const char *); diff --git a/src/misc.c b/src/misc.c index 106f10e..e696171 100644 --- a/src/misc.c +++ b/src/misc.c @@ -391,7 +391,8 @@ int get_string(char *string, int size, FILE * file, const char *terms) { while (EOF != (ch = get_char(file)) && !strchr(terms, ch)) { if (size > 1) { - *string++ = (char) ch; + *string = (char) ch; + string++; size--; } } @@ -738,6 +739,33 @@ size_t strlens(const char *last, ...) { return (ret); } +size_t get_hostname_max(void) { + long len = sysconf(_SC_HOST_NAME_MAX); + + if (0 < len) + return len; +#ifdef MAXHOSTNAMELEN + return MAXHOSTNAMELEN; +#elif HOST_NAME_MAX + return HOST_NAME_MAX; +#endif + return 64; +} + +char *xgethostname(void) { + char *name; + size_t sz = get_hostname_max() + 1; + + name = malloc(sizeof (char) * sz); + if (!name) + return NULL; + if (gethostname(name, sz) != 0) + return NULL; + + name[sz - 1] = '\0'; + return name; +} + /* Return the offset from GMT in seconds (algorithm taken from sendmail). * * warning: -- 1.8.0.1

entry.c:396 load_entry() info: redundant null check on e->pwd calling free() entry.c:398 load_entry() info: redundant null check on e->cmd calling free() /usr/include/bits/fcntl.h:48:10: warning: preprocessor token O_NOFOLLOW redefined macros.h:136:9: this was the original definition security.c:98:44: warning: non-ANSI function declaration of function 'cron_restore_default_security_context' crontab.c:439:29: warning: non-ANSI function declaration of function 'tmp_path' Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- configure.ac | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/crontab.c | 2 +- src/entry.c | 6 ++---- src/macros.h | 2 +- src/security.c | 2 +- 5 files changed, 50 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index c514e34..4b5d600 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,51 @@ AC_CHECK_FUNCS( \ fchgrp \ ) +# Most of the gl_FCNTL_O_FLAGS is copied from gnulib. +AC_DEFUN([gl_FCNTL_O_FLAGS], [ + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #include <fcntl.h> + #ifndef O_NOFOLLOW + #define O_NOFOLLOW 0 + #endif + static int const constants[] = + { + O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND, + O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY + }; + ]], + [[ + int status = !constants; + { + static char const sym[] = "conftest.sym"; + if (symlink (".", sym) != 0 + || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0) + status |= 32; + unlink (sym); + } + return status;]])], + [gl_cv_header_working_fcntl_h=yes], + [case $? in #( + 32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( + *) gl_cv_header_working_fcntl_h='no';; + esac], + [gl_cv_header_working_fcntl_h=cross-compiling])]) + + case $gl_cv_header_working_fcntl_h in #( + *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #( + *) ac_val=1;; + esac + AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val], + [Define to 1 if O_NOFOLLOW works.]) +]) +gl_FCNTL_O_FLAGS + dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIGNAL diff --git a/src/crontab.c b/src/crontab.c index 28e75a0..5592939 100644 --- a/src/crontab.c +++ b/src/crontab.c @@ -438,7 +438,7 @@ static void check_error(const char *msg) { fprintf(stderr, "\"%s\":%d: %s\n", Filename, LineNumber - 1, msg); } -static const char *tmp_path() { +static const char *tmp_path(void) { const char *tmpdir = NULL; if ((getuid() == geteuid()) && (getgid() == getegid())) { diff --git a/src/entry.c b/src/entry.c index 0b482b9..e9142f5 100644 --- a/src/entry.c +++ b/src/entry.c @@ -392,10 +392,8 @@ entry *load_entry(FILE * file, void (*error_func) (), struct passwd *pw, eof: if (e->envp) env_free(e->envp); - if (e->pwd) - free(e->pwd); - if (e->cmd) - free(e->cmd); + free(e->pwd); + free(e->cmd); free(e); while (ch != '\n' && !feof(file)) ch = get_char(file); diff --git a/src/macros.h b/src/macros.h index b3f4010..4d1bfd8 100644 --- a/src/macros.h +++ b/src/macros.h @@ -132,7 +132,7 @@ * we will just have to live without it. In order for this to be an * issue an attacker would have to subvert group CRON_GROUP. */ -#ifndef O_NOFOLLOW +#if (HAVE_WORKING_O_NOFOLLOW == 0) #define O_NOFOLLOW 0 #endif diff --git a/src/security.c b/src/security.c index 7639891..7724b2f 100644 --- a/src/security.c +++ b/src/security.c @@ -97,7 +97,7 @@ static int cron_get_job_range(user * u, security_context_t * ucontextp, char **jobenv); #endif -void cron_restore_default_security_context() { +void cron_restore_default_security_context(void) { #ifdef WITH_SELINUX setexeccon(NULL); #endif -- 1.8.0.1

cron.c:100:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] cron.c:108:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] cron.c:125:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- src/cron.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cron.c b/src/cron.c index efa5234..879139e 100644 --- a/src/cron.c +++ b/src/cron.c @@ -95,7 +95,7 @@ const char *watchpaths[NUM_WATCHES] = {SPOOL_DIR, SYS_CROND_DIR}; # endif static void reset_watches(void) { - int i; + size_t i; for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) { wd[i] = -2; @@ -103,7 +103,7 @@ static void reset_watches(void) { } void set_cron_unwatched(int fd) { - int i; + size_t i; for (i = 0; i < sizeof (wd) / sizeof (wd[0]); ++i) { if (wd[i] > 0) { @@ -115,7 +115,7 @@ void set_cron_unwatched(int fd) { void set_cron_watched(int fd) { pid_t pid = getpid(); - int i; + size_t i; if (fd < 0) { inotify_enabled = 0; -- 1.8.0.1

Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- anacron/global.h | 5 +++-- anacron/main.c | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/anacron/global.h b/anacron/global.h index a0efd4f..7cd4c41 100644 --- a/anacron/global.h +++ b/anacron/global.h @@ -44,6 +44,7 @@ #include <signal.h> #include <time.h> #include "anacron-paths.h" +#include "cronie_common.h" /* Some declarations */ @@ -131,8 +132,8 @@ void explain(const char *fmt, ...)PRINTF_FORMAT(1,2); void explain_e(const char *fmt, ...)PRINTF_FORMAT(1,2); void complain(const char *fmt, ...)PRINTF_FORMAT(1,2); void complain_e(const char *fmt, ...)PRINTF_FORMAT(1,2); -void die(const char *fmt, ...)PRINTF_FORMAT(1,2); -void die_e(const char *fmt, ...)PRINTF_FORMAT(1,2); +void die(const char *fmt, ...)PRINTF_FORMAT(1,2) ATTRIBUTE_NORETURN; +void die_e(const char *fmt, ...)PRINTF_FORMAT(1,2) ATTRIBUTE_NORETURN; void xdebug(const char *fmt, ...)PRINTF_FORMAT(1,2); void xdebug_e(const char *fmt, ...)PRINTF_FORMAT(1,2); void xcloselog(void); diff --git a/anacron/main.c b/anacron/main.c index 61636a6..5194c5b 100644 --- a/anacron/main.c +++ b/anacron/main.c @@ -36,6 +36,7 @@ #include <locale.h> #include "global.h" #include "gregor.h" +#include "cronie_common.h" pid_t primary_pid; int day_now; @@ -230,20 +231,20 @@ go_background() } } -void -handle_sigalrm() +static void +handle_sigalrm(int unused ATTRIBUTE_UNUSED) { got_sigalrm = 1; } -void -handle_sigchld() +static void +handle_sigchld(int unused ATTRIBUTE_UNUSED) { got_sigchld = 1; } -void -handle_sigusr1() +static void +handle_sigusr1(int unused ATTRIBUTE_UNUSED) { got_sigusr1 = 1; } -- 1.8.0.1

* On Sun, 2012-12-02 at 00:29 +0000, Sami Kerola wrote: This is incorrect. You need to cast at least i or RAND_MAX to double. -- Tomas Mraz No matter how far down the wrong road you've gone, turn back. Turkish proverb

Inform in usage which options will need arguments, and add reference to manual page. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- anacron/main.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/anacron/main.c b/anacron/main.c index 5194c5b..2c55716 100644 --- a/anacron/main.c +++ b/anacron/main.c @@ -79,25 +79,22 @@ print_version() static void print_usage() { - printf("Usage: anacron [-s] [-f] [-n] [-d] [-q] [-t anacrontab] [-S spooldir] [job] ...\n" - " anacron [-S spooldir] -u [job] ...\n" - " anacron [-V|-h]\n" - " anacron -T [-t anacrontab]\n" - "\n" - " -s Serialize execution of jobs\n" - " -f Force execution of jobs, even before their time\n" - " -n Run jobs with no delay, implies -s\n" - " -d Don't fork to the background\n" - " -q Suppress stderr messages, only applicable with -d\n" - " -u Update the timestamps without actually running anything\n" - " -t Use this anacrontab\n" - " -V Print version information\n" - " -h Print this message\n" - " -T Test an anacrontab\n" - " -S Select a different spool directory\n" - "\n" - "See the manpage for more details.\n" - "\n"); + printf("Usage:\n"); + printf(" %s [options] [job] ...\n", program_name); + printf(" %s -T [-t anacrontab-file]\n", program_name); + printf("\nOptions:\n"); + printf(" -s Serialize execution of jobs\n"); + printf(" -f Force execution of jobs, even before their time\n"); + printf(" -n Run jobs with no delay, implies -s\n"); + printf(" -d Don't fork to the background\n"); + printf(" -q Suppress stderr messages, only applicable with -d\n"); + printf(" -u Update the timestamps without actually running anything\n"); + printf(" -V Print version information\n"); + printf(" -h Print this message\n"); + printf(" -t <file> Use alternative anacrontab\n"); + printf(" -T Test an anacrontab\n"); + printf(" -S <dir> Select a different spool directory\n"); + printf("\nSee the anacron(8) manpage for more details.\n"); } static void -- 1.8.0.1

The function is needed by both cron and anacron. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- anacron/runjob.c | 10 ++++++---- cronie_common.h | 29 +++++++++++++++++++++++++++++ src/database.c | 1 + src/do_command.c | 1 + src/funcs.h | 6 ++---- src/misc.c | 27 --------------------------- 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/anacron/runjob.c b/anacron/runjob.c index 9656254..b2dd93b 100644 --- a/anacron/runjob.c +++ b/anacron/runjob.c @@ -36,6 +36,7 @@ #include "global.h" #include <langinfo.h> +#include "cronie_common.h" static int temp_file(job_rec *jr) @@ -236,13 +237,13 @@ launch_job(job_rec *jr) { pid_t pid; int fd; - char hostname[512]; + char *hostname; char *mailto; /* get hostname */ - if (gethostname(hostname, 512)) { - strcpy (hostname,"unknown machine"); - } + do + hostname = xgethostname(); + while (hostname == NULL && usleep(1000)); setup_env(jr); @@ -276,6 +277,7 @@ launch_job(job_rec *jr) xwrite(fd, "' on "); xwrite(fd, hostname); xwrite(fd, "\n\n"); + free(hostname); jr->mail_header_size = file_size(fd); diff --git a/cronie_common.h b/cronie_common.h index 4ce172e..13c8be7 100644 --- a/cronie_common.h +++ b/cronie_common.h @@ -20,6 +20,8 @@ #ifndef CRONIE_COMMON_H #define CRONIE_COMMON_H +#include <stdlib.h> + #ifndef __attribute__ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) # define __attribute__(x) /* empty */ @@ -34,4 +36,31 @@ # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) #endif +static inline size_t get_hostname_max(void) { + long len = sysconf(_SC_HOST_NAME_MAX); + + if (0 < len) + return len; +#ifdef MAXHOSTNAMELEN + return MAXHOSTNAMELEN; +#elif HOST_NAME_MAX + return HOST_NAME_MAX; +#endif + return 64; +} + +static inline char *xgethostname(void) { + char *name; + size_t sz = get_hostname_max() + 1; + + name = malloc(sizeof (char) * sz); + if (!name) + return NULL; + if (gethostname(name, sz) != 0) + return NULL; + + name[sz - 1] = '\0'; + return name; +} + #endif /* CRONIE_COMMON_H */ diff --git a/src/database.c b/src/database.c index 50bfd1b..3aa3f15 100644 --- a/src/database.c +++ b/src/database.c @@ -43,6 +43,7 @@ # include <sys/inotify.h> #endif +#include "cronie_common.h" #include "funcs.h" #include "globals.h" #include "pathnames.h" diff --git a/src/do_command.c b/src/do_command.c index f4ed647..12ccc23 100644 --- a/src/do_command.c +++ b/src/do_command.c @@ -31,6 +31,7 @@ #include <sys/wait.h> #include <unistd.h> +#include "cronie_common.h" #include "externs.h" #include "funcs.h" #include "globals.h" diff --git a/src/funcs.h b/src/funcs.h index d9afd48..4d95d22 100644 --- a/src/funcs.h +++ b/src/funcs.h @@ -73,8 +73,7 @@ int load_database(cron_db *), allowed(const char * ,const char * ,const char *), strdtb(char *); -size_t strlens(const char *, ...), - get_hostname_max(void); +size_t strlens(const char *, ...); char *env_get(const char *, char **), *arpadate(time_t *), @@ -82,8 +81,7 @@ char *env_get(const char *, char **), *first_word(const char *, const char *), **env_init(void), **env_copy(char **), - **env_set(char **, char *), - *xgethostname(void); + **env_set(char **, char *); user *load_user(int, struct passwd *, const char *, const char *, const char *), *find_user(cron_db *, const char *, const char *); diff --git a/src/misc.c b/src/misc.c index e696171..b0f97be 100644 --- a/src/misc.c +++ b/src/misc.c @@ -739,33 +739,6 @@ size_t strlens(const char *last, ...) { return (ret); } -size_t get_hostname_max(void) { - long len = sysconf(_SC_HOST_NAME_MAX); - - if (0 < len) - return len; -#ifdef MAXHOSTNAMELEN - return MAXHOSTNAMELEN; -#elif HOST_NAME_MAX - return HOST_NAME_MAX; -#endif - return 64; -} - -char *xgethostname(void) { - char *name; - size_t sz = get_hostname_max() + 1; - - name = malloc(sizeof (char) * sz); - if (!name) - return NULL; - if (gethostname(name, sz) != 0) - return NULL; - - name[sz - 1] = '\0'; - return name; -} - /* Return the offset from GMT in seconds (algorithm taken from sendmail). * * warning: -- 1.8.0.1

Signed-off-by: Sami Kerola <kerolasa(a)iki.fi&gt; --- anacron/log.c | 4 ++-- anacron/main.c | 24 ++++++++++++------------ anacron/readtab.c | 4 ++-- anacron/runjob.c | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/anacron/log.c b/anacron/log.c index c3fc9c7..e78501b 100644 --- a/anacron/log.c +++ b/anacron/log.c @@ -54,7 +54,7 @@ static int log_open = 0; int complaints = 0; static void -xopenlog() +xopenlog(void) { if (!log_open) { @@ -64,7 +64,7 @@ xopenlog() } void -xcloselog() +xcloselog(void) { if (log_open) closelog(); log_open = 0; diff --git a/anacron/main.c b/anacron/main.c index 66928cc..7583bd0 100644 --- a/anacron/main.c +++ b/anacron/main.c @@ -65,7 +65,7 @@ int range_stop = -1; int preferred_hour = -1; static void -print_version() +print_version(void) { printf("Anacron \n" "Copyright (C) 1998 Itai Tzur <itzur(a)actcom.co.il&gt;\n&quot; @@ -77,7 +77,7 @@ print_version() } static void -print_usage() +print_usage(void) { printf("Usage:\n"); printf(" %s [options] [job] ...\n", program_name); @@ -164,7 +164,7 @@ parse_opts(int argc, char *argv[]) } pid_t -xfork() +xfork(void) /* Like fork(), only never returns on failure */ { pid_t pid; @@ -200,7 +200,7 @@ xclose(int fd) } static void -go_background() +go_background(void) /* Become a daemon. The foreground process exits successfully. */ { pid_t pid; @@ -247,7 +247,7 @@ handle_sigusr1(int unused ATTRIBUTE_UNUSED) } static void -set_signal_handling() +set_signal_handling(void) /* We only use SIGALRM, SIGCHLD and SIGUSR1, and we unblock them only * in wait_signal(). */ @@ -284,7 +284,7 @@ set_signal_handling() } static void -wait_signal() +wait_signal(void) /* Return after a signal is caught */ { sigset_t ss; @@ -297,7 +297,7 @@ wait_signal() } static void -wait_children() +wait_children(void) /* Wait until we have no more children (of any kind) */ { while (running_jobs > 0 || running_mailers > 0) @@ -311,7 +311,7 @@ wait_children() } static void -orderly_termination() +orderly_termination(void) /* Execution is diverted here, when we get SIGUSR1 */ { explain("Received SIGUSR1"); @@ -341,7 +341,7 @@ xsleep(unsigned int n) } static void -wait_jobs() +wait_jobs(void) /* Wait until there are no running jobs, * servicing SIGCHLDs and SIGUSR1s in the meantime. */ @@ -356,7 +356,7 @@ wait_jobs() } static void -record_start_time() +record_start_time(void) { struct tm *tm_now; @@ -394,7 +394,7 @@ time_till(job_rec *jr) } static void -fake_jobs() +fake_jobs(void) { int j; @@ -409,7 +409,7 @@ fake_jobs() } static void -explain_intentions() +explain_intentions(void) { int j; diff --git a/anacron/readtab.c b/anacron/readtab.c index 2f03723..fad381b 100644 --- a/anacron/readtab.c +++ b/anacron/readtab.c @@ -81,7 +81,7 @@ conv2int(const char *s) } static char * -read_tab_line () +read_tab_line (void) /* Read one line and return a pointer to it. Return NULL if no more lines. */ @@ -380,7 +380,7 @@ execution_order(const job_rec **job1, const job_rec **job2) } void -arrange_jobs() +arrange_jobs(void) /* Make an array of pointers to jobs that are going to be executed, * and arrange them in the order of execution. * Also lock these jobs. diff --git a/anacron/runjob.c b/anacron/runjob.c index b2dd93b..5835524 100644 --- a/anacron/runjob.c +++ b/anacron/runjob.c @@ -86,7 +86,7 @@ file_size(int fd) } static char * -username() +username(void) { struct passwd *ps; @@ -327,7 +327,7 @@ tend_job(job_rec *jr, int status) } void -tend_children() +tend_children(void) /* This is called whenever we get a SIGCHLD. * Takes care of zombie children. */ -- 1.8.0.1