Thanks - This should be in CVS now. BTW, this is the right place to
send Nagios patches.
On 3 Jan 2003 at 18:05, Kain wrote:
> This allows nagios-cvs to run successfully with postgresql 7.3.
>
> I just fixed the timestamp conversions. This should be backward-compatible down to at least postgresql 7.0, maybe even 6.5.
>
> Is this the proper place to pipe patches?
>
> Index: xcddb.c
> ===================================================================
> RCS file: /cvsroot/nagios/nagios/xdata/xcddb.c,v
> retrieving revision 1.3
> diff -u -r1.3 xcddb.c
> --- xcddb.c 2 Dec 2002 04:30:12 -0000 1.3
> +++ xcddb.c 4 Jan 2003 00:02:37 -0000
> @@ -711,7 +711,7 @@
> snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,persistent,entry_time,author_name,comment_data) VALUES ('%s','%d',FROM_UNIXTIME(%lu),'%s','%s')",XCDDB_HOSTCOMMENTS_TABLE,escaped_host_name,persistent,entry_time,escaped_author_name,escaped_comment_data);
> #endif
> #ifdef USE_XCDPGSQL
> - snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,persistent,entry_time,author_name,comment_data) VALUES ('%s','%d',abstime(%lu),'%s','%s')",XCDDB_HOSTCOMMENTS_TABLE,escaped_host_name,persistent,entry_time,escaped_author_name,escaped_comment_data);
> + snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,persistent,entry_time,author_name,comment_data) VALUES ('%s','%d',%lu::abstime::timestamp,'%s','%s')",XCDDB_HOSTCOMMENTS_TABLE,escaped_host_name,persistent,entry_time,escaped_author_name,escaped_comment_data);
> #endif
> sql_statement[sizeof(sql_statement)-1]='\x0';
>
> @@ -809,7 +809,7 @@
> snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,service_description,persistent,entry_time,author_name,comment_data) VALUES
('%s','%s','%d',FROM_UNIXTIME(%lu),'%s','%s')",XCDDB_SERVICECOMMENTS_TABLE,escaped_host_name,escaped_svc_description,persistent,entry_time,escaped_author_name,escaped_comment_data);
> #endif
> #ifdef USE_XCDPGSQL
> - snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,service_description,persistent,entry_time,author_name,comment_data) VALUES
('%s','%s','%d',abstime(%lu),'%s','%s')",XCDDB_SERVICECOMMENTS_TABLE,escaped_host_name,escaped_svc_description,persistent,entry_time,escaped_author_name,escaped_comment_data);
> + snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,service_description,persistent,entry_time,author_name,comment_data) VALUES
('%s','%s','%d',%lu::abstime::timestamp,'%s','%s')",XCDDB_SERVICECOMMENTS_TABLE,escaped_host_name,escaped_svc_description,persistent,entry_time,escaped_author_name,escaped_comment_data);
> #endif
> sql_statement[sizeof(sql_statement)-1]='\x0';
>
> Index: xdddb.c
> ===================================================================
> RCS file: /cvsroot/nagios/nagios/xdata/xdddb.c,v
> retrieving revision 1.3
> diff -u -r1.3 xdddb.c
> --- xdddb.c 2 Dec 2002 04:30:12 -0000 1.3
> +++ xdddb.c 4 Jan 2003 00:02:41 -0000
> @@ -751,7 +751,7 @@
> snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,entry_time,author_name,comment_data,start_time,end_time,fixed,duration) VALUES
('%s',FROM_UNIXTIME(%lu),'%s','%s',FROM_UNIXTIME(%lu),FROM_UNIXTIME(%lu),'%d','%lu')",XDDDB_HOSTDOWNTIME_TABLE,escaped_host_name,entry_time,escaped_author_name,escaped_comment_data,start_time,end_time,fixed,duration);
> #endif
> #ifdef USE_XDDPGSQL
> - snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,entry_time,author_name,comment_data,start_time,end_time,fixed,duration) VALUES
('%s',abstime(%lu),'%s','%s',abstime(%lu),abstime(%lu),'%d','%lu')",XDDDB_HOSTDOWNTIME_TABLE,escaped_host_name,entry_time,escaped_author_name,escaped_comment_data,start_time,end_time,fixed,duration);
> + snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,entry_time,author_name,comment_data,start_time,end_time,fixed,duration) VALUES
('%s',%lu::abstime::timestamp,'%s','%s',%lu::abstime::timestamp,%lu::abstime::timestamp,'%d','%lu')",XDDDB_HOSTDOWNTIME_TABLE,escaped_host_name,entry_t
...[email truncated]...
This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]