diff options
| author |  Karl Ramm <kcr@mit.edu> | 2007-07-20 05:07:19 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2007-07-20 05:07:19 +0000 |
| commit | 15cf157d47aafe49fd59b7acc23fe172f8a23566 (patch) | |
| tree | 747829bb544497cad68906bb21b2fd9fbb2cc1f3 /lib | |
| parent | 82ea504def6eb144c2b13b315890b297e29345c5 (diff) | |
debian patch applied and reconciled, version unfinalized
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.in | 6 | ||||
| -rw-r--r-- | lib/ZVariables.c | 2 | ||||
| -rw-r--r-- | lib/Zinternal.c | 14 |
3 files changed, 16 insertions, 6 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index cdaecc8..5415797 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -9,8 +9,9 @@ lsbindir=@lsbindir@ top_builddir=.. includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib +LIBS=@LIBS@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ @@ -21,8 +22,9 @@ CC=@CC@ INSTALL=@INSTALL@ RANLIB=@RANLIB@ +DEBUG=-O CPPFLAGS=@CPPFLAGS@ -CFLAGS=@CFLAGS@ +CFLAGS=@CFLAGS@ ${DEBUG} ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ -I${BUILDTOP}/h ${CPPFLAGS} LDFLAGS=@LDFLAGS@ diff --git a/lib/ZVariables.c b/lib/ZVariables.c index 1d9cd06..7352860 100644 --- a/lib/ZVariables.c +++ b/lib/ZVariables.c @@ -36,7 +36,7 @@ char *ZGetVariable(var) if ((ret = get_varval(varfile, var)) != ZERR_NONE) return (ret); - sprintf(varfile, "%s/zephyr.vars", SYSCONFDIR); + sprintf(varfile, "%s/zephyr/zephyr.vars", SYSCONFDIR); return (get_varval(varfile, var)); } diff --git a/lib/Zinternal.c b/lib/Zinternal.c index 1a3fcec..0efcc56 100644 --- a/lib/Zinternal.c +++ b/lib/Zinternal.c @@ -580,6 +580,14 @@ Code_t Z_AddNoticeToEntry(qptr, notice, part) return (ZERR_NONE); } +void Z_gettimeofday(struct _ZTimeval *ztv, struct timezone *tz) +{ + struct timeval tv; + (void) gettimeofday(&tv, tz); /* yeah, yeah, I know */ + ztv->tv_sec=tv.tv_sec; + ztv->tv_usec=tv.tv_usec; +} + Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine) ZNotice_t *notice; char *buffer; @@ -609,7 +617,7 @@ Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine) notice->z_multinotice = ""; - (void) gettimeofday(¬ice->z_uid.tv, (struct timezone *)0); + (void) Z_gettimeofday(¬ice->z_uid.tv, (struct timezone *)0); notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec); notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec); @@ -878,8 +886,8 @@ Code_t Z_SendFragmentedNotice(notice, len, cert_func, send_func) (void) sprintf(multi, "%d/%d", offset, notice->z_message_len); partnotice.z_multinotice = multi; if (offset > 0) { - (void) gettimeofday(&partnotice.z_uid.tv, - (struct timezone *)0); + (void) Z_gettimeofday(&partnotice.z_uid.tv, + (struct timezone *)0); partnotice.z_uid.tv.tv_sec = htonl((u_long) partnotice.z_uid.tv.tv_sec); partnotice.z_uid.tv.tv_usec = |