From nobody Wed Apr 24 05:55:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPSr73vdGz5Js3p; Wed, 24 Apr 2024 05:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPSr73Fc6z4bjM; Wed, 24 Apr 2024 05:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgP0gX2MQ8ADTYCbkzBih3co4JNuGD7VQFDobPzEYag=; b=yOldZ3VLwa9AljJ8xrrCMzfia5lw0ESzxzmCSWIOIFDN53drtNVNqjonjm2dSPe8BPLG9C w6ld09h6FUtohQprLibRVQjZXVCaZVQUkYhWVe132Khgm3HY3Sn8o/Oxv8aZSgwP3aEmtC IovtxR/GRAE2Pm/E0FapyK9QKA0Dli0Zjw0GbDHEtqrRSpUUkrHP9r3RNbp0KNI5suYxHN JGIF1F3Gk/lmMSVWgoHfo4wjxA62QbnWpHVYFO13nP28xkA8oQh7/v8ouWqWm9ekI3T8KO KqvqatRhr5K/kpNI5tDSBQV/1rZOf2P0MswONtC2G3BMZHAohBvQoY+te5TQhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713938103; a=rsa-sha256; cv=none; b=fSTMjZUKMJiZRyi8Ghtf5gEqRq4Ea9Tv5oLh96tpm2GIu1Aib+LksMWUgnmhLx0o1E85ql QEhOg5AksquW/HgxR8IMVwAMi24vsFyB0I2ER7h1Qdno/06Sm7p1d9xhEpP1ZzhkHwBEkK EvLo87wQAuhRxpsXQrEqjl8gVU4ZNSZRffbAQd8wvlp/fwt8midWOgJ2V6kgPQUtuhT03F 9mA04RlslJJdx28QtUfXDhgKkfpetvIxPMq8Xibx34cgE2BmF1gOlEJliEYALJMMXcrNUI J2wdx+kDSz4CuNOHEgD342cXQTDFEsruaYYJMbGpMn1WXe8A454w2kGrStDVtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgP0gX2MQ8ADTYCbkzBih3co4JNuGD7VQFDobPzEYag=; b=h7z0SWTV4YnoBtaOSXdUIAD3DZYEiAoXXSiQ7E7eMU/0L6T9BHNMF319q61plCvclGxZFo 9GbWAr1H3Zp+cFPNc7tUeVbmP2oJXJQOEwsUmomhy5XqH6TP4jQEv3aszQOFHpJR9639Ux j9izWbd3zGXDbk3ycsLamtDpNE94ttYTuQKRQhAJ6H1HkdeKdSFj6HB4WrnnK24FkopwNu UtL9QVP0Y1UWk71jwszrEmDVOzraTH1SMCfg/WSFK/RvrE3CCvkRpyahYUElFbdzdG3F5E SX0OiLgfc8s+P1br8lzUxpdwc6ArlSSOCiWwsHh1MSTwUVBbIwRZWom/qdVyYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPSr72s1nz13CH; Wed, 24 Apr 2024 05:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O5t35h008698; Wed, 24 Apr 2024 05:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5t3Of008695; Wed, 24 Apr 2024 05:55:03 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:55:03 GMT Message-Id: <202404240555.43O5t3Of008695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: a0d7d68a2dd8 - main - heimdal: Fix compiling hdb ldap as a module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0d7d68a2dd818ce84e37e1ff20c8849cda6d853 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a0d7d68a2dd818ce84e37e1ff20c8849cda6d853 commit a0d7d68a2dd818ce84e37e1ff20c8849cda6d853 Author: Cy Schubert AuthorDate: 2014-01-10 19:18:06 +0000 Commit: Cy Schubert CommitDate: 2024-04-24 05:54:20 +0000 heimdal: Fix compiling hdb ldap as a module Fix build when WITH_OPENLDAP defined. PR: 278430 Obtained from: Upstream c1c7da7f79 --- 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];