diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/include/bartlby.h bartlby-core/include/bartlby.h
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/include/bartlby.h	2007-02-15 21:46:37.000000000 +0100
+++ bartlby-core/include/bartlby.h	2008-01-03 18:50:30.000000000 +0100
@@ -1,8 +1,8 @@
 
 #define PROGNAME "bartlby"
-#define REL_NAME "neuron"
-#define VERSION  "1.2.8"
-#define EXPECTCORE 1102051 //Module V Check's
+#define REL_NAME "zero-eight"
+#define VERSION  "1.3.0"
+#define EXPECTCORE 1103051 //Module V Check's
 
 #define MAX_CCACHE 1024
 
@@ -101,10 +101,10 @@
 
 
 struct shm_counter {
-	int worker;
-	int services;
-	int downtimes;
-	int servers;	
+	long worker;
+	long services;
+	long downtimes;
+	long servers;	
 };
 
 struct perf_statistic {
@@ -117,9 +117,9 @@
 	char community[512];
 	int version;
 	char objid[1024];
-	int warn;
-	int crit;
-	int type;
+	long warn;
+	long crit;
+	long type;
 };
 struct sprocess {
 	int start_time;
@@ -137,17 +137,17 @@
 
 
 struct shm_header {
-	int size_of_structs;
-	int thrdcount;
-	int svccount;
-	int wrkcount;
-	int srvcount;
-	int current_running;
+	long size_of_structs;
+	long thrdcount;
+	long svccount;
+	long wrkcount;
+	long srvcount;
+	long current_running;
 	char  version[50];
 	int do_reload;
 	int last_replication;
 	int startup_time;
-	int dtcount;
+	long dtcount;
 	int sirene_mode;
 	struct perf_statistic pstat;
 	int cur_event_index;
@@ -156,7 +156,7 @@
 };
 
 struct server {
-	int server_id;
+	long server_id;
 	char  client_ip[2048];
 	char  server_name[2048];
 	char server_icon[1024];
@@ -164,7 +164,7 @@
 	int client_port;
 	int server_dead;
 	int server_notify;
-	int server_flap_seconds;
+	long server_flap_seconds;
 	int flap_count;
 	int last_notify_send;
 	struct service * dead_marker;
@@ -174,8 +174,8 @@
 
 
 struct service {
-	int service_id;
-	int server_id;
+	long service_id;
+	long server_id;
 	int last_state;
 	int current_state;
 	
@@ -184,8 +184,8 @@
 	
 	char  plugin[2048];
 	char  plugin_arguments[2048];
-	int check_interval;
-	int check_interval_original;
+	long check_interval;
+	long check_interval_original;
 	int last_check;
 	struct timeval lcheck;
 	
@@ -196,24 +196,24 @@
 	/*Notify things*/
 	int notify_enabled;
 	int last_notify_send;
-	int flap_count;
+	long flap_count;
 	
 	int service_active;
 	
 	char  service_var[2048];
 	int service_type;
-	int service_passive_timeout;
+	long service_passive_timeout;
 	
 	int notify_last_state;
 	int notify_last_time;
-	int service_check_timeout;
+	long service_check_timeout;
 	
 	
 	
 	int service_ack;
 	
-	int service_retain;
-	int service_retain_current;
+	long service_retain;
+	long service_retain_current;
 	
 	
 	
@@ -228,10 +228,10 @@
 	
 	struct sprocess process;
 	
-	int flap_seconds;
+	long flap_seconds;
 	
 	struct server * srv;
-	int srv_place;
+	long srv_place;
 	
 	int is_server_dead;
 	
@@ -248,7 +248,7 @@
 	char  icq[2048];
 	char  services[2048];
 	
-	int worker_id;
+	long worker_id;
 	int active;
 	char notify_plan[2048];
 	char password[2048];
@@ -258,14 +258,14 @@
 	char notify_levels[20];
 	char enabled_triggers[2048];
 	char t[500];
-	int escalation_limit;
-	int escalation_minutes;
+	long escalation_limit;
+	long escalation_minutes;
 
 }sa;
 
 
 struct downtime {
-	int downtime_id;
+	long downtime_id;
 	int downtime_type;
 	int downtime_from;
 	int downtime_to;
@@ -275,7 +275,7 @@
 }sb;
 
 struct btl_event {
-	int evnt_id;
+	long evnt_id;
 	char evnt_message[1024];
 	int evnt_time;
 		
@@ -362,11 +362,12 @@
 
 void bartlby_perf_track(struct service * svc,char * return_buffer, int return_bytes, char * cfgfile);
 int bartlby_core_perf_track(struct shm_header * hdr, struct service * svc, int type, int time);
-int bartlby_milli_timediff(struct timeval end, struct timeval start);
+long bartlby_milli_timediff(struct timeval end, struct timeval start);
 
 void bartlby_trigger(struct service * svc, char * cfgfile, void * shm_addr, int do_check);
 //Global :-)
 int _log(char * str,  ...);
+
 void bartlby_decode(char * msg, int length);
 void bartlby_encode(char * msg, int length);
 char * bartlby_beauty_state(int status);
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/bartlby.c bartlby-core/src/bartlby.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/bartlby.c	2007-02-15 21:46:38.000000000 +0100
+++ bartlby-core/src/bartlby.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: bartlby.c,v 1.42 2007/02/15 20:46:38 hjanuschka Exp $ */
+/* $Id: bartlby.c,v 1.43 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.42 $
+$Revision: 1.43 $
 $Source: /cvsroot/bartlby/bartlby-core/src/bartlby.c,v $
 
 
 $Log: bartlby.c,v $
+Revision 1.43  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.42  2007/02/15 20:46:38  hjanuschka
 auto commit
 
@@ -239,6 +242,8 @@
 
 
 void dispHelp(void) {
+	
+	
 	printf("\n");
 	printf("	Bartlby\n");
 	printf("          %s Version %s (%s) started. compiled %s/%s\n", PROGNAME, VERSION,REL_NAME, __DATE__, __TIME__);
@@ -335,7 +340,7 @@
     	gGetNameStr=gGetName();
     	
     	if(gExpectVersion() > EXPECTCORE || EXPECTCORE < gExpectVersion() || EXPECTCORE != gExpectVersion()) {
-    		_log("*****Version check failed Module is compiled for version '%d' of %s", gExpectVersion(), PROGNAME);	
+    		_log("*****Version check failed Module is compiled for version '%ld' of %s", gExpectVersion(), PROGNAME);	
     		_log("*****The Module is compiled under '%d' Version of %s", EXPECTCORE, PROGNAME);
     		exit(1);
     	} 
@@ -431,7 +436,7 @@
 			exit(1);	
 		}
 		_log("SHM requires: %d KB ", suggested_minimum/1024);
-		_log("Size: S=%d, W=%d, D=%d, H=%d, E=%d", sizeof(struct service), sizeof(struct worker), sizeof(struct downtime), sizeof(struct shm_header), sizeof(struct btl_event));
+		_log("Size: S=%ld, W=%ld, D=%ld, H=%ld, E=%ld", sizeof(struct service), sizeof(struct worker), sizeof(struct downtime), sizeof(struct shm_header), sizeof(struct btl_event));
 		free(shmc);
 		
 
@@ -479,9 +484,9 @@
 			bartlby_ext_init(gBartlby_address, gSOHandle, cfgfile);
 				
 			
-			_log("Workers: %d", gshm_hdr->wrkcount);
-			_log("Downtimes: %d", gshm_hdr->dtcount);
-			_log("Servers: %d", gshm_hdr->srvcount);
+			_log("Workers: %ld", gshm_hdr->wrkcount);
+			_log("Downtimes: %ld", gshm_hdr->dtcount);
+			_log("Servers: %ld", gshm_hdr->srvcount);
 			gshm_hdr->current_running=0;
 			sprintf(gshm_hdr->version, "%s-%s (%s)", PROGNAME, VERSION, REL_NAME);
 						
@@ -502,7 +507,7 @@
 			
 			
 			if(gshm_hdr->wrkcount <= 0) {
-				_log("Found workers are below zero (%d) maybe your datalib config isnt OK or you havent completed the setup", gshm_hdr->wrkcount);
+				_log("Found workers are below zero (%ld) maybe your datalib config isnt OK or you havent completed the setup", gshm_hdr->wrkcount);
 				shmdt(gBartlby_address);
 				gshm_id = shmget(ftok(gShmtok, 32), 0, 0600);
 				shmctl(gshm_id, IPC_RMID, &gshm_desc);
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/check.c bartlby-core/src/check.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/check.c	2007-02-15 17:25:32.000000000 +0100
+++ bartlby-core/src/check.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: check.c,v 1.68 2007/02/15 16:25:32 hjanuschka Exp $ */
+/* $Id: check.c,v 1.69 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.68 $
+$Revision: 1.69 $
 $Source: /cvsroot/bartlby/bartlby-core/src/check.c,v $
 
 
 $Log: check.c,v $
+Revision 1.69  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.68  2007/02/15 16:25:32  hjanuschka
 auto commit
 
@@ -348,7 +351,7 @@
 		svc->service_retain_current=0;
 		svc->last_state=svc->current_state;
 		
-		_log("@LOG@%d|%d|%s:%d/%s|%s", svc->service_id, svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->new_server_text);
+		_log("@LOG@%ld|%d|%s:%d/%s|%s", svc->service_id, svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->new_server_text);
 		bartlby_push_event(EVENT_STATUS_CHANGED, "Service-Changed;%d;%s:%d/%s;%d;%s", svc->service_id, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->current_state, svc->new_server_text);
 		bartlby_callback(EXTENSION_CALLBACK_STATE_CHANGED, svc);
 	}	
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/check_group.c bartlby-core/src/check_group.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/check_group.c	2007-02-15 17:25:32.000000000 +0100
+++ bartlby-core/src/check_group.c	2008-01-24 15:10:16.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: check_group.c,v 1.2 2007/02/15 16:25:32 hjanuschka Exp $ */
+/* $Id: check_group.c,v 1.3 2008/01/24 14:10:16 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.2 $
+$Revision: 1.3 $
 $Source: /cvsroot/bartlby/bartlby-core/src/check_group.c,v $
 
 
 $Log: check_group.c,v $
+Revision 1.3  2008/01/24 14:10:16  hjanuschka
+auto commit
+
 Revision 1.2  2007/02/15 16:25:32  hjanuschka
 auto commit
 
@@ -89,7 +92,7 @@
 				return;
 			}
 			
-			if(svg->current_state == state) {
+			if(bartlby_is_in_downtime(shm_addr, svg) > 0 && svg->current_state == state) {
 				//_log("Service: is not %d\n", svg->current_state );
 				sprintf(svc->new_server_text, "%s %s:%d/%s - %d", GROUP_CRITICAL, svg->srv->server_name, svg->srv->client_port, svg->service_name, state);
 				svc->current_state=STATE_CRITICAL;
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/global.c bartlby-core/src/global.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/global.c	2007-02-22 13:51:06.000000000 +0100
+++ bartlby-core/src/global.c	2007-04-01 18:06:32.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: global.c,v 1.26 2007/02/22 12:51:06 hjanuschka Exp $ */
+/* $Id: global.c,v 1.28 2007/04/01 16:06:32 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,17 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.26 $
+$Revision: 1.28 $
 $Source: /cvsroot/bartlby/bartlby-core/src/global.c,v $
 
 
 $Log: global.c,v $
+Revision 1.28  2007/04/01 16:06:32  hjanuschka
+auto commit
+
+Revision 1.27  2007/03/23 10:22:13  hjanuschka
+auto commit
+
 Revision 1.26  2007/02/22 12:51:06  hjanuschka
 *** empty log message ***
 
@@ -150,6 +156,7 @@
 	struct tm *tmnow;
 	struct tm fromcheck, tocheck;       
 	int fromts, tots;
+	char in_or_out;
 	
 	int min,hour, min1,hour1;
 	int cur_ts;
@@ -161,6 +168,8 @@
 		return 1; //if no plan?! always check ;)
 	}
 	
+	
+	
 	cur_ts = time(&tnow);
 	tmnow = localtime(&tnow);
 	
@@ -169,6 +178,14 @@
 	while(token != NULL) {
 		sprintf(idx, "%c", *token);
 		if(atoi(idx) == tmnow->tm_wday) {
+			ttok = token+1;
+			in_or_out = *ttok;
+			if(in_or_out == '!') {
+				rt=1;
+			} else {
+				rt=-1;	
+			}
+				
 			ttok = token+2;
 			//now check threw the timeranges
 			tmp1 = strdup(ttok);
@@ -196,9 +213,16 @@
 					
 					
 					if(cur_ts >= fromts && cur_ts <= tots) {
-						rt = 1;
-						break;	
+						if(in_or_out == '=') {
+							rt = 1;
+						} else {
+							
+							rt = -1;
+						}
+	
 					}
+					
+					
 						
 				
 				
@@ -213,10 +237,12 @@
 			
 			
 		}
+		/*
 		if(rt > 0) {
 			//Someone found;)
 			break;	
 		}
+		*/
 		
 		token = strtok(NULL, "|");
 		
@@ -225,7 +251,6 @@
 	free(tmp);	
 	
 	
-	
 	return rt;	
 }
 
@@ -373,6 +398,7 @@
 
 void bartlby_replace_svc_in_str(char * str, struct service * svc, int max) {
 	char * human_state, * human_state_last;
+	char * srv;
 	
 	
 	human_state=bartlby_beauty_state(svc->current_state);
@@ -393,6 +419,12 @@
 	str_replace(str,"$SERVICE", svc->service_name, max); 
 	setenv("MESSAGE",  svc->new_server_text, 1);
 	str_replace(str,"$MESSAGE", svc->new_server_text, max); 
+
+	srv=getenv("BARTLBY_CURR_HOST");
+	if(srv != NULL) {
+		 setenv("SERVER",  srv, 1);
+		 str_replace(str,"$SERVER", srv, max);
+	}
 	
 		
 	
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/libs/mysql.c bartlby-core/src/libs/mysql.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/libs/mysql.c	2007-02-15 21:46:38.000000000 +0100
+++ bartlby-core/src/libs/mysql.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: mysql.c,v 1.61 2007/02/15 20:46:38 hjanuschka Exp $ */
+/* $Id: mysql.c,v 1.62 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.61 $
+$Revision: 1.62 $
 $Source: /cvsroot/bartlby/bartlby-core/src/libs/mysql.c,v $
 
 
 $Log: mysql.c,v $
+Revision 1.62  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.61  2007/02/15 20:46:38  hjanuschka
 auto commit
 
@@ -283,39 +286,39 @@
 
 #define SELECTOR "select svc.service_id, svc.service_name, svc.service_state, srv.server_name, srv.server_id, srv.server_port, srv.server_ip, svc.service_plugin, svc.service_args, UNIX_TIMESTAMP(svc.service_last_check), svc.service_interval, svc.service_text, 'a', 'a', 'a','a', svc.service_notify, svc.service_type, svc.service_var, svc.service_passive_timeout,service_active, svc.service_check_timeout, srv.server_ico, svc.service_ack, svc.service_retain, svc.service_snmp_community, svc.service_snmp_objid, svc.service_snmp_version, svc.service_snmp_warning, svc.service_snmp_critical, svc.service_snmp_type, svc.flap_seconds, svc.service_exec_plan  from services svc, servers srv where svc.server_id=srv.server_id ORDER BY RAND()"
 #define WORKER_SELECTOR "select worker_mail, worker_icq, 'removed' ,notify_levels, worker_active, worker_name, worker_id, password, enabled_triggers, escalation_limit, escalation_minutes, notify_plan from workers"
-#define SERVICE_UPDATE_TEXT "update services set service_last_check=FROM_UNIXTIME(%d), service_text='%s', service_state=%d where service_id=%d"
+#define SERVICE_UPDATE_TEXT "update services set service_last_check=FROM_UNIXTIME(%d), service_text='%s', service_state=%d where service_id=%ld"
 
 
 
-#define ADD_SERVER "insert into servers (server_name,server_ip,server_port, server_ico, server_enabled, server_notify, server_flap_seconds, server_dead) VALUES('%s','%s', '%d', '%s', '%d', '%d', '%d', '%d')"
+#define ADD_SERVER "insert into servers (server_name,server_ip,server_port, server_ico, server_enabled, server_notify, server_flap_seconds, server_dead) VALUES('%s','%s', '%d', '%s', '%d', '%d', '%ld', '%d')"
 #define DELETE_SERVER "delete from servers where server_id=%d"
-#define UPDATE_SERVER "update servers set server_name='%s',server_ip='%s',server_port=%d, server_ico='%s', server_enabled='%d', server_notify='%d', server_flap_seconds='%d', server_dead='%d' where server_id=%d"
+#define UPDATE_SERVER "update servers set server_name='%s',server_ip='%s',server_port=%d, server_ico='%s', server_enabled='%d', server_notify='%d', server_flap_seconds='%ld', server_dead='%d' where server_id=%ld"
 #define SERVER_SELECTOR "select server_name, server_ip, server_port, server_ico, server_enabled, server_notify, server_flap_seconds, server_dead from servers where server_id=%d"
 #define SERVER_CHANGE_ID "update servers set server_id=%d where server_id=%d"
 #define SERVER_CHANGE_SERVICES "update services set server_id=%d where server_id=%d"
 
-#define SERVER_UPDATE_TEXT "update servers set server_enabled='%d', server_notify='%d' where server_id=%d"
+#define SERVER_UPDATE_TEXT "update servers set server_enabled='%d', server_notify='%d' where server_id=%ld"
 
 #define DELETE_SERVICE_BY_SERVER "delete from services where server_id=%d"
 
-#define ADD_SERVICE "insert into services(server_id, service_plugin, service_name, service_state,service_text, service_args,service_notify, service_active, service_interval, service_type,service_var,service_passive_timeout,service_check_timeout, service_ack, service_retain, service_snmp_community, service_snmp_objid, service_snmp_version, service_snmp_warning, service_snmp_critical, service_snmp_type, flap_seconds, service_exec_plan) values(%d,'%s','%s',4, 'Newly created', '%s',%d,%d,%d,%d,'%s',%d, %d, %d, %d, '%s', '%s', %d, %d, %d, %d, %d, '%s')"
+#define ADD_SERVICE "insert into services(server_id, service_plugin, service_name, service_state,service_text, service_args,service_notify, service_active, service_interval, service_type,service_var,service_passive_timeout,service_check_timeout, service_ack, service_retain, service_snmp_community, service_snmp_objid, service_snmp_version, service_snmp_warning, service_snmp_critical, service_snmp_type, flap_seconds, service_exec_plan) values(%ld,'%s','%s',4, 'Newly created', '%s',%d,%d,%ld,%d,'%s',%ld, %ld, %d, %ld, '%s', '%s', %d, %ld, %ld, %ld, %ld, '%s')"
 #define DELETE_SERVICE "delete from services where service_id=%d"
 #define SERVICE_CHANGE_ID "update services set service_id=%d where service_id=%d"
 
-#define UPDATE_SERVICE "update services set service_type=%d,service_name='%s',server_id=%d,service_interval = %d, service_plugin='%s',service_args='%s',service_passive_timeout=%d, service_var='%s',service_check_timeout=%d, service_ack='%d', service_retain='%d', service_snmp_community='%s', service_snmp_objid='%s', service_snmp_version='%d', service_snmp_warning='%d', service_snmp_critical='%d', service_snmp_type='%d', service_notify='%d', service_active='%d', flap_seconds='%d', service_exec_plan='%s'  where service_id=%d"
+#define UPDATE_SERVICE "update services set service_type=%d,service_name='%s',server_id=%ld,service_interval = %ld, service_plugin='%s',service_args='%s',service_passive_timeout=%ld, service_var='%s',service_check_timeout=%ld, service_ack='%d', service_retain='%ld', service_snmp_community='%s', service_snmp_objid='%s', service_snmp_version='%d', service_snmp_warning='%ld', service_snmp_critical='%ld', service_snmp_type='%ld', service_notify='%d', service_active='%d', flap_seconds='%ld', service_exec_plan='%s'  where service_id=%ld"
 #define SERVICE_SELECTOR "select svc.service_id, svc.service_name, svc.service_state, srv.server_name, srv.server_id, srv.server_port, srv.server_ip, svc.service_plugin, svc.service_args, UNIX_TIMESTAMP(svc.service_last_check), svc.service_interval, svc.service_text, 'a', 'a','a', 'a', svc.service_notify, svc.service_type, svc.service_var, svc.service_passive_timeout, svc.service_active,svc.service_check_timeout, svc.service_ack, svc.service_retain, svc.service_snmp_community, svc.service_snmp_objid, svc.service_snmp_version, svc.service_snmp_warning, svc.service_snmp_critical, svc.service_snmp_type, srv.server_ico, svc.flap_seconds, svc.service_exec_plan from services svc, servers srv where svc.server_id=srv.server_id and svc.service_id=%d"
 
 
 
 
-#define ADD_WORKER    "INSERT INTO workers(worker_mail, worker_icq, notify_levels, worker_active, worker_name, password,enabled_triggers, escalation_limit, escalation_minutes, notify_plan) VALUES('%s', '%s', '%s', %d, '%s', '%s', '%s', '%d', '%d', '%s')"
+#define ADD_WORKER    "INSERT INTO workers(worker_mail, worker_icq, notify_levels, worker_active, worker_name, password,enabled_triggers, escalation_limit, escalation_minutes, notify_plan) VALUES('%s', '%s', '%s', %d, '%s', '%s', '%s', '%ld', '%ld', '%s')"
 #define DELETE_WORKER "delete from workers where worker_id=%d"
-#define UPDATE_WORKER "update workers set worker_mail='%s', worker_icq='%s', notify_levels='%s', worker_active=%d, worker_name='%s', password='%s', enabled_triggers='%s', escalation_limit='%d', escalation_minutes='%d', notify_plan='%s' WHERE worker_id=%d"
+#define UPDATE_WORKER "update workers set worker_mail='%s', worker_icq='%s', notify_levels='%s', worker_active=%d, worker_name='%s', password='%s', enabled_triggers='%s', escalation_limit='%ld', escalation_minutes='%ld', notify_plan='%s' WHERE worker_id=%ld"
 #define WORKER_SEL "select worker_mail, worker_icq, enabled_services,notify_levels, worker_active, worker_name, worker_id, password, enabled_triggers, escalation_limit, escalation_minutes, notify_plan from workers where worker_id=%d"
 #define WORKER_CHANGE_ID "update workers set worker_id=%d where worker_id=%d"
 
 
-#define UPDATE_DOWNTIME "update downtime set downtime_notice='%s', downtime_from=%d,downtime_to=%d, service_id=%d, downtime_type=%d where downtime_id=%d"
+#define UPDATE_DOWNTIME "update downtime set downtime_notice='%s', downtime_from=%d,downtime_to=%d, service_id=%d, downtime_type=%d where downtime_id=%ld"
 #define DEL_DOWNTIME "delete from downtime where downtime_id=%d"
 #define ADD_DOWNTIME "INSERT INTO downtime(downtime_type, downtime_from,downtime_to,service_id, downtime_notice) VALUES(%d,%d,%d,%d, '%s')"
 #define DOWNTIME_SEL "select downtime_id, downtime_type, downtime_from, downtime_to, downtime_notice, service_id from downtime"
@@ -966,7 +969,7 @@
       			sprintf(svc->notify_plan, " ");	
       		}
       		tmprc=0;
-      		printf("limit: %d, minutes: %d", svc->escalation_limit, svc->escalation_minutes);
+      		printf("limit: %ld, minutes: %ld", svc->escalation_limit, svc->escalation_minutes);
       	} else {
 			tmprc=-1;
 	}
@@ -1244,9 +1247,9 @@
       		svc->lcheck.tv_sec=atoi(row[9]);
       		svc->last_check=atoi(row[9]);
       		
-      		svc->check_interval=atoi(row[10]);
+      		svc->check_interval=atol(row[10]);
       		
-      		svc->check_interval_original=atoi(row[10])*1000;
+      		svc->check_interval_original=atol(row[10])*1000;
       		      		
       		
       		//svc->hour_from=atoi(row[12]);
@@ -2124,8 +2127,8 @@
       			svcs[i].lcheck.tv_sec=atoi(row[9]);                      
 			svcs[i].last_check=atoi(row[9]);    				                            
       				                                 
-      			svcs[i].check_interval=atoi(row[10]);
-      			svcs[i].check_interval_original=atoi(row[10])*1000;
+      			svcs[i].check_interval=atol(row[10]);
+      			svcs[i].check_interval_original=atol(row[10])*1000;
       			
       			/*if(i > POS2_QUEUER_THREADS*POS2_QUEUER_THREADS*POS2_QUEUER_THREADS) {
       				ht += 10;
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/perf.c bartlby-core/src/perf.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/perf.c	2006-12-05 04:47:12.000000000 +0100
+++ bartlby-core/src/perf.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: perf.c,v 1.10 2006/12/05 03:47:12 hjanuschka Exp $ */
+/* $Id: perf.c,v 1.11 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.10 $
+$Revision: 1.11 $
 $Source: /cvsroot/bartlby/bartlby-core/src/perf.c,v $
 
 
 $Log: perf.c,v $
+Revision 1.11  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.10  2006/12/05 03:47:12  hjanuschka
 auto commit
 
@@ -82,8 +85,12 @@
 
 #include <bartlby.h>
 
-int bartlby_milli_timediff(struct timeval end, struct timeval start) {
-	return ((end.tv_sec - start.tv_sec) * 1000) +  (((1000000 + end.tv_usec - start.tv_usec) / 1000) - 1000);	
+long bartlby_milli_timediff(struct timeval end, struct timeval start) {
+	long r;
+	
+	r=((end.tv_sec - start.tv_sec) * 1000) +  (((1000000 + end.tv_usec - start.tv_usec) / 1000) - 1000);	
+	
+	return r;
 }
 
 int bartlby_core_perf_track(struct shm_header * hdr, struct service * svc, int type, int time) {
@@ -127,7 +134,7 @@
 	
 	
 	//signal(SIGCHLD, SIG_IGN);
-	sprintf(my_own_handler, "perfhandler_enabled_%d", svc->service_id);
+	sprintf(my_own_handler, "perfhandler_enabled_%ld", svc->service_id);
 	
 	
 	perf_enabled=getConfigValue("perfhandler_enabled", cfgfile);
@@ -159,7 +166,7 @@
 			_log("Performance Trigger: %s not found", perf_trigger);	
 		} else {
 			
-			sprintf(perf_trigger, "%s/%s %d %s 2>&1 > /dev/null", cfg_perf_dir, svc->plugin, svc->service_id, return_buffer);
+			sprintf(perf_trigger, "%s/%s %ld %s 2>&1 > /dev/null", cfg_perf_dir, svc->plugin, svc->service_id, return_buffer);
 			signal(SIGPIPE,SIG_DFL);
 			signal(SIGCHLD,SIG_DFL);
 			gettimeofday(&stat_start,NULL);
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/sched.c bartlby-core/src/sched.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/sched.c	2007-02-16 22:50:00.000000000 +0100
+++ bartlby-core/src/sched.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: sched.c,v 1.78 2007/02/16 21:50:00 hjanuschka Exp $ */
+/* $Id: sched.c,v 1.79 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.78 $
+$Revision: 1.79 $
 $Source: /cvsroot/bartlby/bartlby-core/src/sched.c,v $
 
 
 $Log: sched.c,v $
+Revision 1.79  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.78  2007/02/16 21:50:00  hjanuschka
 auto commit
 
@@ -303,7 +306,7 @@
 
 
 int g_micros_before_after_check=700;
-int shortest_intervall;
+long shortest_intervall;
 
 
 
@@ -426,7 +429,7 @@
 	} else {
 		
 		//_log("@KILL@Killing runaaway process: %s:%d/%s %d (done)",svc->process.pid); 	
-		_log("@KILL@%d|%d|%s:%d/%s|Killing process with pid: %d", svc->service_id, svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->process.pid);
+		_log("@KILL@%ld|%d|%s:%d/%s|Killing process with pid: %d", svc->service_id, svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->process.pid);
 	}
 		
 	sprintf(svc->new_server_text, "%s", "in-core time out");
@@ -491,7 +494,7 @@
 
 int sched_check_waiting(void * shm_addr, struct service * svc, char * cfg, void * SOHandle, int sched_pause) {
 	int cur_time;
-	int my_diff;
+	long my_diff;
 	int kill_diff;
 	
 	struct timeval cur_tv;
@@ -519,7 +522,7 @@
 		if(svc->do_force == 1) {
 			svc->do_force=0; //dont force again
 			//_log("Force: %s:%d/%s", svc->srv->server_name, svc->srv->client_port, svc->service_name);
-			_log("@FORCE@%d|%d|%d|||%s:%d/%s|Force check", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name);
+			_log("@FORCE@%ld|%d|%d|||%s:%d/%s|Force check", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name);
 			return 1;	
 		}
 	}
@@ -779,7 +782,7 @@
 	ssort  = malloc(sizeof(struct service_sort)*gshm_hdr->svccount);
 	
 	
-	_log("Scheduler working on %d Services", gshm_hdr->svccount);
+	_log("Scheduler working on %ld Services", gshm_hdr->svccount);
 	
 	cfg_mps=getConfigValue("max_concurent_checks", cfgfile);
 	if(cfg_mps == NULL) {
@@ -933,7 +936,7 @@
 		
 		
 		if(time(NULL)-round_start > sched_pause*3 && sched_pause > 0) {
-			_log("Done %d Services in %d Seconds", round_visitors, time(NULL)-round_start);				
+			_log("Done %d Services in %ld Seconds", round_visitors, time(NULL)-round_start);				
 		}
 		
 		//Log Round End
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/shm.c bartlby-core/src/shm.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/shm.c	2007-02-15 21:46:38.000000000 +0100
+++ bartlby-core/src/shm.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: shm.c,v 1.10 2007/02/15 20:46:38 hjanuschka Exp $ */
+/* $Id: shm.c,v 1.11 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.10 $
+$Revision: 1.11 $
 $Source: /cvsroot/bartlby/bartlby-core/src/shm.c,v $
 
 
 $Log: shm.c,v $
+Revision 1.11  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.10  2007/02/15 20:46:38  hjanuschka
 auto commit
 
@@ -47,7 +50,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-
+#include <stdio.h>
 
 
 #include <bartlby.h>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/tools/portier.c bartlby-core/src/tools/portier.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/tools/portier.c	2007-02-16 21:40:26.000000000 +0100
+++ bartlby-core/src/tools/portier.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: portier.c,v 1.13 2007/02/16 20:40:26 hjanuschka Exp $ */
+/* $Id: portier.c,v 1.16 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,20 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.13 $
+$Revision: 1.16 $
 $Source: /cvsroot/bartlby/bartlby-core/src/tools/portier.c,v $
 
 
 $Log: portier.c,v $
+Revision 1.16  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
+Revision 1.15  2007/03/23 17:26:43  hjanuschka
+*** empty log message ***
+
+Revision 1.14  2007/03/22 01:09:21  hjanuschka
+auto commit
+
 Revision 1.13  2007/02/16 20:40:26  hjanuschka
 auto commit
 
@@ -252,7 +261,7 @@
 		svcmap=bartlby_SHM_ServiceMap(bartlby_address);
 		srvmap=bartlby_SHM_ServerMap(bartlby_address);
 		
-		printf("+SVCC: %d WRKC: %d V: %s\n", shm_hdr->svccount, shm_hdr->wrkcount, shm_hdr->version);
+		printf("+SVCC: %ld WRKC: %ld V: %s\n", shm_hdr->svccount, shm_hdr->wrkcount, shm_hdr->version);
 		fflush(stdout);
 		
 	} else {
@@ -432,7 +441,7 @@
 								
 								
 								passive_beauty=bartlby_beauty_state(svcmap[x].current_state);
-								sprintf(svc_out, "+PASSIVOK (%d) %d : %s (%s)\n", x, svcmap[x].service_id, passive_beauty, svcmap[x].new_server_text);
+								sprintf(svc_out, "+PASSIVOK (%d) %ld : %s (%s)\n", x, svcmap[x].service_id, passive_beauty, svcmap[x].new_server_text);
 								free(passive_beauty);
 							} else {
 								sprintf(svc_out, "-3 Service is not of type 'PASSIVE'");	
@@ -458,7 +467,7 @@
 					
 					for(x=0; x<shm_hdr->svccount; x++) {
 						if(strcmp(srvmap[svcmap[x].srv_place].server_name, in_server_name) == 0) {
-							printf("%d", svcmap[x].server_id);
+							printf("%ld", svcmap[x].server_id);
 								
 						}
 					}
@@ -474,9 +483,9 @@
 					passive_serverid=atoi(token);
 					sprintf(svc_out, " ");
 					for(x=0; x<shm_hdr->svccount; x++) {
-						if(svcmap[x].server_id == passive_serverid && svcmap[x].service_type == SVC_TYPE_PASSIVE) {
+						if(svcmap[x].server_id == passive_serverid && svcmap[x].service_type == SVC_TYPE_PASSIVE && svcmap[x].service_passive_timeout > 0) {
 							if(service_is_in_time(svcmap[x].service_exec_plan)) {
-								printf("%d", svcmap[x].service_id);
+								printf("%ld", svcmap[x].service_id);
 								printf(" ");	
 							}
 						}
@@ -492,7 +501,7 @@
 				exit(1);				
 		}
 		
-		printf(svc_out);
+		printf("%s", svc_out);
 			
 	}
 	shmdt(bartlby_address);
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/tools/shmt.c bartlby-core/src/tools/shmt.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/tools/shmt.c	2006-02-19 16:04:13.000000000 +0100
+++ bartlby-core/src/tools/shmt.c	2008-03-03 13:01:27.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: shmt.c,v 1.5 2006/02/19 15:04:13 hjanuschka Exp $ */
+/* $Id: shmt.c,v 1.7 2008/03/03 12:01:27 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,17 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.5 $
+$Revision: 1.7 $
 $Source: /cvsroot/bartlby/bartlby-core/src/tools/shmt.c,v $
 
 
 $Log: shmt.c,v $
+Revision 1.7  2008/03/03 12:01:27  hjanuschka
+list all services
+
+Revision 1.6  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.5  2006/02/19 15:04:13  hjanuschka
 *** empty log message ***
 
@@ -54,7 +60,9 @@
 	//int * shm_elements;
 	void * bartlby_address;
 	struct shm_header * shm_hdr;
-	
+	struct service * svcmap;
+	struct server * srvmap;
+	int x;
 	
 	
 	
@@ -94,12 +102,22 @@
 			bartlby_address=shmat(shm_id,NULL,0);
 			shm_hdr=bartlby_SHM_GetHDR(bartlby_address);
 			
-			printf("%d\t%d\t%d\t%d\t%d\n", shm_id, shm_hdr->svccount, shm_hdr->wrkcount, shm_hdr->dtcount, shm_hdr->current_running);
+			printf("%d\t%ld\t%ld\t%ld\t%ld\n", shm_id, shm_hdr->svccount, shm_hdr->wrkcount, shm_hdr->dtcount, shm_hdr->current_running);
 			
 			shmdt(bartlby_address); 
 			exit(1);
+		} else if ( strcmp(argv[2], "list") == 0 ) {
+			bartlby_address=shmat(shm_id,NULL,0);
+			svcmap=bartlby_SHM_ServiceMap(bartlby_address);
+			shm_hdr=bartlby_SHM_GetHDR(bartlby_address);
+			srvmap=bartlby_SHM_ServerMap(bartlby_address);
+			
+			for(x=0; x<shm_hdr->svccount; x++) {
+				printf("%ld;%s;%d;%s;%d;\n", svcmap[x].service_id, srvmap[svcmap[x].srv_place].server_name, srvmap[svcmap[x].srv_place].client_port, svcmap[x].service_name, svcmap[x].current_state);
+			}
+			exit(1);
 		}
-		printf("Unknown option: status|remove");
+		printf("Unknown option: status|remove|list");
 		
 		
 	} else {
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/trigger.c bartlby-core/src/trigger.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/src/trigger.c	2007-02-15 17:25:32.000000000 +0100
+++ bartlby-core/src/trigger.c	2007-07-28 00:54:04.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: trigger.c,v 1.29 2007/02/15 16:25:32 hjanuschka Exp $ */
+/* $Id: trigger.c,v 1.30 2007/07/27 22:54:04 hjanuschka Exp $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005 Helmut Januschka - All Rights Reserved
@@ -11,11 +11,14 @@
  *
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 1.29 $
+$Revision: 1.30 $
 $Source: /cvsroot/bartlby/bartlby-core/src/trigger.c,v $
 
 
 $Log: trigger.c,v $
+Revision 1.30  2007/07/27 22:54:04  hjanuschka
+int to long changing
+
 Revision 1.29  2007/02/15 16:25:32  hjanuschka
 auto commit
 
@@ -212,7 +215,7 @@
 		return TR;	
 	} else {
 		if(w->escalation_count > w->escalation_limit) {
-			_log("@NOT-EXT@%d|%d|%d|%s||%s:%d/%s|'(escalation %d/%d)'", svc->service_id, svc->last_state ,svc->current_state,w->name, svc->srv->server_name, svc->srv->client_port, svc->service_name,w->escalation_count, w->escalation_limit);
+			_log("@NOT-EXT@%ld|%d|%d|%s||%s:%d/%s|'(escalation %d/%ld)'", svc->service_id, svc->last_state ,svc->current_state,w->name, svc->srv->server_name, svc->srv->client_port, svc->service_name,w->escalation_count, w->escalation_limit);
 			return FL;
 		} else {
 			w->escalation_count++;
@@ -224,19 +227,19 @@
 int bartlby_trigger_chk(struct service *svc) {
 	
 	if(svc->srv->server_notify == 0) {
-		_log("@NOT-EXT@%d|%d|%d|||%s:%d/%s|'(Notifications disabled on this server)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name);
+		_log("@NOT-EXT@%ld|%d|%d|||%s:%d/%s|'(Notifications disabled on this server)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name);
 		return FL;
 	}
 	if(svc->notify_enabled == 0) {
 		//_log("Suppressed notify: Notifications disabled %s:%d/%s",svc->client_ip, svc->srv->client_port, svc->service_name);
-		_log("@NOT-EXT@%d|%d|%d|||%s:%d/%s|'(Notifications disabled)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name);
+		_log("@NOT-EXT@%ld|%d|%d|||%s:%d/%s|'(Notifications disabled)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name);
 		return FL;
 	} else {
 		if((time(NULL) - svc->srv->last_notify_send) > svc->srv->server_flap_seconds) {
 			svc->srv->flap_count=0;	
 		} else {
 			if(svc->srv->flap_count > 2) {
-				_log("@NOT-EXT@%d|%d|%d|||%s:%d/%s|'(Server lazy %d)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->flap_count);
+				_log("@NOT-EXT@%ld|%d|%d|||%s:%d/%s|'(Server lazy %ld)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->flap_count);
 				return FL;
 			} else {
 				svc->srv->flap_count++;	
@@ -249,7 +252,7 @@
 		} else {
 			
 			if(svc->flap_count > 2) {
-				_log("@NOT-EXT@%d|%d|%d|||%s:%d/%s|'(Service flapping %d)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->flap_count);
+				_log("@NOT-EXT@%ld|%d|%d|||%s:%d/%s|'(Service flapping %ld)'", svc->service_id, svc->last_state ,svc->current_state, svc->srv->server_name, svc->srv->client_port, svc->service_name, svc->flap_count);
 				return FL;
 			} else {
 				//Log("trigger", "Service %s:%d/%s Sent", svc->client_ip, svc->srv->client_port, svc->service_name);	
@@ -290,7 +293,7 @@
 	}
 	user_dat = malloc(sizeof(char) * (strlen(uir) + 20 + strlen(".dat") + 2));
 	
-	sprintf(user_dat, "%s/%d.dat", uir, w->worker_id);
+	sprintf(user_dat, "%s/%ld.dat", uir, w->worker_id);
 	free(uir);
 	
 	//_log("user_right_file: %s", user_dat);
@@ -321,8 +324,8 @@
 	find_server=malloc(sizeof(char)*20);
 	find_service=malloc(sizeof(char)*20);
 	
-	sprintf(find_server, ",%d,", svc->server_id);
-	sprintf(find_service, ",%d,", svc->service_id);
+	sprintf(find_server, ",%ld,", svc->server_id);
+	sprintf(find_service, ",%ld,", svc->service_id);
 	
 	
 	
@@ -450,7 +453,7 @@
 	find_str=malloc(10+2);
 	find_trigger=malloc(100+200);
 	
-	sprintf(find_str, "|%d|", svc->service_id);
+	sprintf(find_str, "|%ld|", svc->service_id);
 	cfg_trigger_msg=getConfigValue("trigger_msg", cfgfile);
 	if(cfg_trigger_msg == NULL) {
 		cfg_trigger_msg=strdup(DEFAULT_NOTIFY_MSG);	
@@ -505,7 +508,7 @@
 							bartlby_callback(EXTENSION_CALLBACK_TRIGGER_FIRED, &en);
 							
 							//_log("EXEC trigger: %s", full_path);
-							_log("@NOT@%d|%d|%d|%s|%s|%s:%d/%s", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name);
+							_log("@NOT@%ld|%d|%d|%s|%s|%s:%d/%s", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name);
 							
 							svc->last_notify_send=time(NULL);
 							svc->srv->last_notify_send=time(NULL);
@@ -518,14 +521,14 @@
 								alarm(CONN_TIMEOUT);
 								if(fgets(trigger_return, 1024, ptrigger) != NULL) {
 									trigger_return[strlen(trigger_return)-1]='\0';
-									_log("@NOT-EXT@%d|%d|%d|%s|%s|%s:%d/%s|'%s'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name, trigger_return);
+									_log("@NOT-EXT@%ld|%d|%d|%s|%s|%s:%d/%s|'%s'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name, trigger_return);
 									
       								} else {
-      									_log("@NOT-EXT@%d|%d|%d|%s|%s|%s:%d/%s|'(empty output)'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name);
+      									_log("@NOT-EXT@%ld|%d|%d|%s|%s|%s:%d/%s|'(empty output)'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name);
       								}
       								
       								if(connection_timed_out == 1) {
-      									_log("@NOT-EXT@%d|%d|%d|%s|%s|%s:%d/%s|'(timed out)'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name);
+      									_log("@NOT-EXT@%ld|%d|%d|%s|%s|%s:%d/%s|'(timed out)'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name);
       								}
       								connection_timed_out=0;
 								alarm(0);
@@ -533,7 +536,7 @@
       									pclose(ptrigger);
       								}
       							} else {
-      								_log("@NOT-EXT@%d|%d|%d|%s|%s|%s:%d/%s|'(failed %s)'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name, full_path);	
+      								_log("@NOT-EXT@%ld|%d|%d|%s|%s|%s:%d/%s|'(failed %s)'", svc->service_id, svc->last_state ,svc->current_state,entry->d_name,wrkmap[x].name, svc->srv->server_name, svc->srv->client_port, svc->service_name, full_path);	
       							}
 							free(exec_str);
 						} else {
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/trigger/mail.sh bartlby-core/trigger/mail.sh
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full//bartlby-core/trigger/mail.sh	2006-11-07 15:46:59.000000000 +0100
+++ bartlby-core/trigger/mail.sh	2007-03-22 02:09:22.000000000 +0100
@@ -28,5 +28,5 @@
 SUBJ="bartlby notify: ${BARTLBY_CURR_HOST} / ${BARTLBY_CURR_SERVICE} : ${READABLE_STATE} ";
 MSG=$(echo -e $4);
 
-echo -e $MSG|mail -s "$SUBJ" $1
+echo -e ${BARTLBY_CURR_HOST} $MSG|mail -s "$SUBJ" $1
 echo "Mail sent to $1";