From bdc619de0104cffaaa8600e6a4dcb26f152807af Mon Sep 17 00:00:00 2001 From: losinshi Date: Fri, 29 Sep 2006 01:21:33 +0000 Subject: [PATCH] fixing some problems with the getlogin() - function an cron git-svn-id: file:///home/jan/tmp/wetterstation/trunk@183 dd492736-c11a-0410-ad51-8c26713eaf7f --- cronjob/checksensor/definitions.h | 2 +- cronjob/checksensor/mailer.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cronjob/checksensor/definitions.h b/cronjob/checksensor/definitions.h index 69335a3..923d3c9 100644 --- a/cronjob/checksensor/definitions.h +++ b/cronjob/checksensor/definitions.h @@ -29,7 +29,7 @@ #define DEFAULT_CONFIG_FILE "/etc/weatherstation/checksensor.conf" /* Standart-Configdatei */ #define DEFAULT_CHECK_INTERVAL "24" /* Standart-Interval, indem der Sensor das letzte mal hätte senden sollen (in h) */ #define DEFAULT_MIN_SENDINGS "24" /* Standart-Wert, wieviele Daten der Sensor in den letzten x stunden hätte senden sollen */ - +#define DEFAULT_MAIL_USER "weatherstation" /*Alle möglichen Definitionen, die in allen code-schnipseln benötigt werden*/ diff --git a/cronjob/checksensor/mailer.c b/cronjob/checksensor/mailer.c index 1ad9322..4378e35 100644 --- a/cronjob/checksensor/mailer.c +++ b/cronjob/checksensor/mailer.c @@ -37,6 +37,10 @@ #define BUFFSIZE 2048 +#ifndef DEFAULT_MAIL_USER + #define DEFAULT_MAIL_USER "mailer.c" +#endif + #define TO_LINE "To: " #define CC_LINE "Cc: " #define BCC_LINE "Bcc: " @@ -218,6 +222,9 @@ static char * gen_from_mailbox(){ host = malloc(sizeof(char)*MAXHOSTNAMELEN); /* Speicher fuer den Hostnamen holen */ user = getlogin(); /* den Usernamen holen */ + if(user == NULL) + user = DEFAULT_MAIL_USER; + gethostname(host, MAXHOSTNAMELEN); /* den Hostnamen holen */ new_from = malloc(sizeof(char)*(MAXHOSTNAMELEN + strlen(user) + 10)); /* Speicher fuer die gesammtaddresse belegen */