diff options
| author | Mathieu Parent <math.parent@gmail.com> | 2018-08-24 06:51:04 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-04-03 01:40:22 +0000 |
| commit | 4ae2fb2e7403191296f7c74f3098fbe121f0796a (patch) | |
| tree | 32dd274d20e725f1651057b41459b8e1719b59a2 /source4 | |
| parent | ea3b4d6abc60863bff14fe676611569e1f6f8baa (diff) | |
| download | samba-4ae2fb2e7403191296f7c74f3098fbe121f0796a.tar.gz | |
Relax GPGME version check
The current method require at least the same version as during the build. This is not needed.
Used symbols indicate the minimum is 1.2.0
Bug-Debian: http://bugs.debian.org/886333
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13880
Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index a010d4b9026..e740de8fb4e 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -52,6 +52,14 @@ #ifdef ENABLE_GPGME #undef class #include <gpgme.h> + +/* + * 1.2.0 is what dpkg-shlibdeps generates, based on used symbols and + * libgpgme11.symbols + * https://salsa.debian.org/debian/gpgme/blob/debian/master/debian/libgpgme11.symbols + */ + +#define MINIMUM_GPGME_VERSION "1.2.0" #endif /* If we have decided there is a reason to work on this request, then @@ -4817,13 +4825,13 @@ int ldb_password_hash_module_init(const char *version) * if none is active already. See: * https://www.gnupg.org/documentation/manuals/gpgme/Signal-Handling.html#Signal-Handling */ - gversion = gpgme_check_version(GPGME_VERSION); + gversion = gpgme_check_version(MINIMUM_GPGME_VERSION); if (gversion == NULL) { fprintf(stderr, "%s() in %s version[%s]: " "gpgme_check_version(%s) not available, " "gpgme_check_version(NULL) => '%s'\n", __func__, __FILE__, version, - GPGME_VERSION, gpgme_check_version(NULL)); + MINIMUM_GPGME_VERSION, gpgme_check_version(NULL)); return LDB_ERR_UNAVAILABLE; } #endif /* ENABLE_GPGME */ |