From 993d7c4a2c7b36ee014361c293689e23770b5bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@mistotebe.net>
Date: Thu, 13 Apr 2023 16:12:47 +0100
Subject: [PATCH] ITS#10037 Update argon2 README

---
 servers/slapd/pwmods/README.argon2 | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/servers/slapd/pwmods/README.argon2 b/servers/slapd/pwmods/README.argon2
index 595c50d6b4..33c562b348 100644
--- a/servers/slapd/pwmods/README.argon2
+++ b/servers/slapd/pwmods/README.argon2
@@ -15,28 +15,16 @@ Both hash the password "secret", the first using the salt "saltsalt", the second
 Building
 --------
 
-1) Customize the OPENLDAP variable in Makefile to point to the OpenLDAP
-source root.
-
-For initial testing you might also want to edit DEFS to define
-SLAPD_ARGON2_DEBUG, which enables logging to stderr (don't leave this on
-in production, as it prints passwords in cleartext).
-
-2) Run 'make' to produce argon2.so
-
-3) Copy argon2.so somewhere permanent.
-
-4) Edit your slapd.conf (eg. /etc/ldap/slapd.conf), and add:
-
-moduleload ...path/to/argon2.so
-
-5) Restart slapd.
-
+This module is now part of regular OpenLDAP build process and enabled if
+libsodium or libargon2 library and the corresponding development headers are
+present. You can also choose the library to build against if you prefer by
+passing --enable-argon2=<libsodium|libargon2> to your configure invocation.
 
 Configuring
 -----------
 
-The {ARGON2} password scheme should now be recognised.
+Load the argon2 module (e.g. with olcModuleLoad or moduleload) and the
+{ARGON2} password scheme should now be recognised.
 
 You can also tell OpenLDAP to use one of this scheme when processing LDAP
 Password Modify Extended Operations, thanks to the password-hash option in
-- 
GitLab