From nobody Mon Apr 29 12:50:50 2024 X-Original-To: dev-commits-src-branches@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 4VSjqZ3Mzfz5JFv5; Mon, 29 Apr 2024 12:50:50 +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 4VSjqZ2mb3z440f; Mon, 29 Apr 2024 12:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714395050; 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=bV0T2Xu19QU+U5XCeGOn1gVvPALBT47KDT2CmWqR048=; b=GlEQWvsimaQjf40x6Gm71p56YeppwNbXPBeSpRqFQ4tjHu/IMVHyfe/PlUQlk3Zz4R6uXs Umbgkbz/qPrjOqLifVvTCMS1IADJaG3wMlfeveHfRx7y6pgjFng7zWx4VKAb2R9tMkm2Dj hMzbx/876EtfxrziE28AO577xNC0S8hk5ulsZYk6lTzqJtRcxklCR6UayIXA/CYKt3rMcP M/Bi+dGRww5STZOA+0QuiAUEtNw61hZkJ9b0MLv3k9D9elDnLQDTDTASFIvfpz9n8m4ODd h29J6kmXMEN9le8e0/k9tfEtka9e/08ZOGh/v2oZ0SQWbmaMf2L2NnTvJspWtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714395050; a=rsa-sha256; cv=none; b=Gb1+dgvsxCpchEDXg6JNmIh3+aSD7urDayRdno7+N4ZW4dfZ5luhYqSA1haLF43rZePMsW pFf+xW05uSeV3nOPO1MB0oToRwDM2Kai4ONvB8nDoAx9PdO+Ol+enfpAUKRE4dXAgwxjSn 0up00AgVupcfO5D1iPZj3X3BLP0A89eEuJdPEQyxWnTk53EJV/Eif2mmXL9ZVbmtTLLoF0 eVLUlnw96XDfBvBHHEEHHtqh3DEQcdWbLExXLAOpbUs/hqzxf+yRTfj6EwGcYk8rX+SsYp /5hYVg/2mM8Nqr5GEudNRWhMwH8TEgOp8Col7lQVo+segMt1x4Wps5BaaFjsvw== 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=1714395050; 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=bV0T2Xu19QU+U5XCeGOn1gVvPALBT47KDT2CmWqR048=; b=wOQQ9r/kCNYqFPF5JVkIXdZZB53HZ5NzHt6ZrXJHve9qa+2orGtgksjm+2EIdGYAEhQKpV PELPF8HNMCzZ63SxQD8us/flk84ap3RkeP4IW+XuoSgjHaMh96ulzlbutqWndGVTk938ml 80R6b9lk8ZJWH+rZsRueLJrRaSZdZ28sXIZ+Kioz9QGVoP6nzEedrTpNflAuHoHI9pg2xj +vO/NPNqpiVss3bco9c3wPb4sO4VpQmQAtHWF6v5VvHf2ZNQMix6xCUDJlbpuY1i0X5INq z50CwSrFmu3GquALKj1nfgW47uEjtPrzi+LQHghDFW4JAp0abFAZY3F4q4HMqA== 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 4VSjqZ2NkJz18XY; Mon, 29 Apr 2024 12:50:50 +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 43TCoopB001131; Mon, 29 Apr 2024 12:50:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TCoojR001128; Mon, 29 Apr 2024 12:50:50 GMT (envelope-from git) Date: Mon, 29 Apr 2024 12:50:50 GMT Message-Id: <202404291250.43TCoojR001128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 8640bd657d84 - stable/14 - heimdal: Fix compiling hdb ldap as a module List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8640bd657d841d1307520eca792e959acdf2063f Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8640bd657d841d1307520eca792e959acdf2063f commit 8640bd657d841d1307520eca792e959acdf2063f Author: Cy Schubert AuthorDate: 2014-01-10 19:18:06 +0000 Commit: Cy Schubert 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];