diff options
| -rw-r--r-- | lib/checksum.c | 2 | ||||
| -rw-r--r-- | lib/thread.c | 2 | ||||
| -rw-r--r-- | redhat/quagga.spec.in | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/checksum.c b/lib/checksum.c index f6d74d31..3ddde815 100644 --- a/lib/checksum.c +++ b/lib/checksum.c @@ -91,7 +91,7 @@ fletcher_checksum(u_char * buffer, const size_t len, const uint16_t offset) } /* The cast is important, to ensure the mod is taken as a signed value. */ - x = ((int)(len - offset - 1) * c0 - c1) % 255; + x = (int)((len - offset - 1) * c0 - c1) % 255; if (x <= 0) x += 255; diff --git a/lib/thread.c b/lib/thread.c index 260e8c8e..948bc210 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -659,7 +659,7 @@ funcname_thread_add_timer_timeval (struct thread_master *m, thread = thread_get (m, type, func, arg, funcname); /* Do we need jitter here? */ - quagga_gettimeofday (&recent_time); + quagga_get_relative (NULL); alarm_time.tv_sec = relative_time.tv_sec + time_relative->tv_sec; alarm_time.tv_usec = relative_time.tv_usec + time_relative->tv_usec; thread->u.sands = timeval_adjust(alarm_time); diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in index 0b2659fb..a8c7fbf3 100644 --- a/redhat/quagga.spec.in +++ b/redhat/quagga.spec.in @@ -48,16 +48,16 @@ %define quagga_buildreqs %{quagga_buildreqs} patch libcap-devel # FC4 and 5 split texi2html out of tetex package. -%if "%dist" == "fc4" || "%dist" == "fc5" +%if "%dist" != "fc2" || "%dist" != "fc3" %define quagga_buildreqs %{quagga_buildreqs} texi2html %endif # pam_stack is deprecated in FC5 # default to pam_stack, default should be changed later. -%if "%dist" == "fc5" -%define quagga_pam_source quagga.pam -%else +%if "%dist" == "fc4" || "%dist" == "fc3" %define quagga_pam_source quagga.pam.stack +%else +%define quagga_pam_source quagga.pam %endif ############################################################################ |