Date: Mon, 29 Apr 2024 12:50:50 GMT From: Cy Schubert <cy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8640bd657d84 - stable/14 - heimdal: Fix compiling hdb ldap as a module Message-ID: <202404291250.43TCoojR001128@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8640bd657d841d1307520eca792e959acdf2063f commit 8640bd657d841d1307520eca792e959acdf2063f Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2014-01-10 19:18:06 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-04-29 12:50:19 +0000 heimdal: Fix compiling hdb ldap as a module Fix build when WITH_OPENLDAP defined. PR: 278430 Obtained from: Upstream c1c7da7f79 (cherry picked from commit a0d7d68a2dd818ce84e37e1ff20c8849cda6d853) --- crypto/heimdal/lib/hdb/hdb-ldap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crypto/heimdal/lib/hdb/hdb-ldap.c b/crypto/heimdal/lib/hdb/hdb-ldap.c index 1b4024aa540a..d58ffe8e06e9 100644 --- a/crypto/heimdal/lib/hdb/hdb-ldap.c +++ b/crypto/heimdal/lib/hdb/hdb-ldap.c @@ -44,6 +44,9 @@ static krb5_error_code LDAP__connect(krb5_context context, HDB *); static krb5_error_code LDAP_close(krb5_context context, HDB *); +static krb5_error_code hdb_ldap_create(krb5_context context, HDB **, const char *); +static krb5_error_code hdb_ldapi_create(krb5_context context, HDB **, const char *); + static krb5_error_code LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg, int flags, hdb_entry_ex * ent); @@ -797,10 +800,10 @@ need_quote(unsigned char c) (c == 0x7f); } -const static char hexchar[] = "0123456789ABCDEF"; +static const char hexchar[] = "0123456789ABCDEF"; static krb5_error_code -escape_value(krb5_context context, const unsigned char *unquoted, char **quoted) +escape_value(krb5_context context, const char *unquoted, char **quoted) { size_t i, len; @@ -816,7 +819,7 @@ escape_value(krb5_context context, const unsigned char *unquoted, char **quoted) } for (i = 0; unquoted[0] ; unquoted++) { - if (need_quote((unsigned char *)unquoted[0])) { + if (need_quote((unsigned char)unquoted[0])) { (*quoted)[i++] = '\\'; (*quoted)[i++] = hexchar[(unquoted[0] >> 4) & 0xf]; (*quoted)[i++] = hexchar[(unquoted[0] ) & 0xf];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404291250.43TCoojR001128>