Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit070bf5c

Browse files
committed
Adjust kerberos and ldap tests for Homebrew on ARM
The Homebrew package manager changed its default installation prefixfor the new architecture, so a couple of tests need tweaks to findbinaries.This is a partial backpatch ofdc513bc.
1 parentb7ec667 commit070bf5c

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

‎src/test/kerberos/t/001_auth.pl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,15 @@
3232

3333
my ($krb5_bin_dir,$krb5_sbin_dir);
3434

35-
if ($^Oeq'darwin')
35+
if ($^Oeq'darwin' &&-d"/opt/homebrew")
3636
{
37+
# typical paths for Homebrew on ARM
38+
$krb5_bin_dir ='/opt/homebrew/opt/krb5/bin';
39+
$krb5_sbin_dir ='/opt/homebrew/opt/krb5/sbin';
40+
}
41+
elsif ($^Oeq'darwin')
42+
{
43+
# typical paths for Homebrew on Intel
3744
$krb5_bin_dir ='/usr/local/opt/krb5/bin';
3845
$krb5_sbin_dir ='/usr/local/opt/krb5/sbin';
3946
}

‎src/test/ldap/t/001_auth.pl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@
2020

2121
$ldap_bin_dir =undef;# usually in PATH
2222

23-
if ($^Oeq'darwin' &&-d'/usr/local/opt/openldap')
23+
if ($^Oeq'darwin' &&-d'/opt/homebrew/opt/openldap')
2424
{
25-
# typical paths for Homebrew
25+
# typical paths for Homebrew on ARM
26+
$slapd ='/opt/homebrew/opt/openldap/libexec/slapd';
27+
$ldap_schema_dir ='/opt/homebrew/etc/openldap/schema';
28+
}
29+
elsif ($^Oeq'darwin' &&-d'/usr/local/opt/openldap')
30+
{
31+
# typical paths for Homebrew on Intel
2632
$slapd ='/usr/local/opt/openldap/libexec/slapd';
2733
$ldap_schema_dir ='/usr/local/etc/openldap/schema';
2834
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp