Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 1 | From 266f0acf7f5e029afbb3e263437039e50cd6c262 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sam James <sam@gentoo.org> |
| 3 | Date: Wed, 23 Feb 2022 00:45:15 +0000 |
| 4 | Subject: [PATCH] Fix <time.h> check |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | We're conditionally including based on HAVE_TIME_H in a bunch of places, |
| 10 | but we're not actually checking for time.h, so that's never going to be defined. |
| 11 | |
| 12 | While at it, add in a missing include in the cram plugin. |
| 13 | |
| 14 | This fixes a bunch of implicit declaration warnings: |
| 15 | ``` |
| 16 | * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] |
| 17 | * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration] |
| 18 | * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] |
| 19 | * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] |
| 20 | * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration] |
| 21 | * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] |
| 22 | ``` |
| 23 | |
| 24 | Upstream-Status: Backport [https://github.com/cyrusimap/cyrus-sasl/commit/266f0acf7f5e029afbb3e263437039e50cd6c262] |
| 25 | Signed-off-by: Sam James <sam@gentoo.org> |
| 26 | --- |
| 27 | configure.ac | 2 +- |
| 28 | plugins/cram.c | 4 ++++ |
| 29 | 2 files changed, 5 insertions(+), 1 deletion(-) |
| 30 | |
| 31 | diff --git a/configure.ac b/configure.ac |
| 32 | index e1bf53b6..ad781830 100644 |
| 33 | --- a/configure.ac |
| 34 | +++ b/configure.ac |
| 35 | @@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) |
| 36 | |
| 37 | AC_HEADER_DIRENT |
| 38 | AC_HEADER_SYS_WAIT |
| 39 | -AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h) |
| 40 | +AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h) |
| 41 | |
| 42 | IPv6_CHECK_SS_FAMILY() |
| 43 | IPv6_CHECK_SA_LEN() |
| 44 | diff --git a/plugins/cram.c b/plugins/cram.c |
| 45 | index d02e9baa..695aaa91 100644 |
| 46 | --- a/plugins/cram.c |
| 47 | +++ b/plugins/cram.c |
| 48 | @@ -53,6 +53,10 @@ |
| 49 | #endif |
| 50 | #include <fcntl.h> |
| 51 | |
| 52 | +#ifdef HAVE_TIME_H |
| 53 | +#include <time.h> |
| 54 | +#endif |
| 55 | + |
| 56 | #include <sasl.h> |
| 57 | #include <saslplug.h> |
| 58 | #include <saslutil.h> |
| 59 | -- |
| 60 | 2.37.3 |
| 61 | |