Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misctrip: Add configure check for thread-safe crypt_r #724

Merged
merged 2 commits into from May 15, 2021

Conversation

ma8ma
Copy link
Collaborator

@ma8ma ma8ma commented May 15, 2021

crypt関数のスレッドセーフなバージョンが使える環境ではcrypt_rを使うように変更します。

参考文献

`crypt`関数のスレッドセーフなバージョンが使える環境では`crypt_r`を
使うように変更します。
@ma8ma ma8ma added the feature 機能の追加と削除 label May 15, 2021
@ma8ma ma8ma added this to In progress in State of JDim-v0.5.0+ via automation May 15, 2021
@@ -147,7 +147,13 @@ std::string create_trip_newtype( const std::string& key )
salt.append( ".." );

// crypt (key は先頭8文字しか使われない)
const char *crypted = crypt( key_binary, salt.c_str() );
#ifdef HAVE_CRYPT_R
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minefieldブランチでは_GNU_SOURCEマクロで条件コンパイルを設けてますがFreeBSDでも利用できる関数なのでconfigureチェックで確認します。

@ma8ma
Copy link
Collaborator Author

ma8ma commented May 15, 2021

https://github.com/JDimproved/JDim/pull/724/checks?check_run_id=2589486392

1/1 gtest tests                             FAIL     0.27 s (killed by signal 6 SIGABRT)

masterブランチでテスト成功するか確認します

2021-05-15のPull RequestでUbuntu 20.04で行うclang-9を使ったテストが
SIGABRTで失敗しました。[*] そのためclang-9のテストをUbuntu 18.04で行う
ようにCI設定を変更します。

[*]: https://github.com/JDimproved/JDim/pull/724/checks?check_run_id=2589486392
@ma8ma
Copy link
Collaborator Author

ma8ma commented May 15, 2021

https://github.com/JDimproved/JDim/runs/2589523269?check_suite_focus=true

1/1 gtest tests                             FAIL     0.32 s (killed by signal 6 SIGABRT)

masterブランチの再テストでも同じくSIGABRTで失敗したためclang-9のテストを実行するディストロをUbuntu 18.04に変えて試してみます。

@ma8ma ma8ma merged commit aa39100 into JDimproved:master May 15, 2021
State of JDim-v0.5.0+ automation moved this from In progress to Done May 15, 2021
@ma8ma ma8ma deleted the add-configure-check-for-crypt_r branch May 15, 2021 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature 機能の追加と削除
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

1 participant