security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

dirmngr,w32: Silence compiler warnings for the LDAP API.

Browse Source 
--
This commit is contained in:
Werner Koch 2022-06-03 15:36:58 +02:00
parent dfc01118ce
commit cc1d475f98
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dirmngr/dirmngr_ldap.c
View File

@ -747,7 +747,7 @@ print_ldap_entries (LDAP *ld, LDAPMessage *msg, char *want_attr)
/* Fetch data from the server at LD using FILTER. */ /* Fetch data from the server at LD using FILTER. */
static int static int
fetch_ldap (LDAP *ld, const char *base, int scope, const char *filter) fetch_ldap (LDAP *ld, char *base, int scope, char *filter)
{ {
gpg_error_t err; gpg_error_t err;
int lerr; int lerr;

7
dirmngr/ks-engine-ldap.c
View File

@ -544,8 +544,13 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
} }
else if (bindname) else if (bindname)
{ {
npth_unprotect (); npth_unprotect ();
lerr = ldap_simple_bind_s (ldap_conn, bindname, password); /* Older Windows header dont have the const for the last two args.
* Thus we need to cast to avoid warnings. */
lerr = ldap_simple_bind_s (ldap_conn,
(char * const)bindname,
(char * const)password);
npth_protect (); npth_protect ();
if (lerr != LDAP_SUCCESS) if (lerr != LDAP_SUCCESS)
{ {

19
dirmngr/ldap-url.c
View File

@ -100,6 +100,25 @@ void ldap_pvt_hex_unescape( char *s );
# define LDAP_SCOPE_DEFAULT -1 # define LDAP_SCOPE_DEFAULT -1
#endif #endif
#if __GNUC__
# define MY_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#else
# define MY_GCC_VERSION 0
#endif
/* Avoid warnings about strncpy usage. */
#if MY_GCC_VERSION >= 80000
# pragma GCC diagnostic ignored "-Wstringop-truncation"
# pragma GCC diagnostic ignored "-Wstringop-overflow"
#elif defined __clang__
# pragma clang diagnostic ignored "-Wstringop-truncation"
# pragma clang diagnostic ignored "-Wstringop-overflow"
#endif
/* $OpenLDAP: pkg/ldap/libraries/libldap/charray.c,v 1.9.2.2 2003/03/03 17:10:04 kurt Exp $ */ /* $OpenLDAP: pkg/ldap/libraries/libldap/charray.c,v 1.9.2.2 2003/03/03 17:10:04 kurt Exp $ */