Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / contrib / slapd-modules / passwd / sha2 / README

diff --git a/contrib/slapd-modules/passwd/sha2/README b/contrib/slapd-modules/passwd/sha2/README
index f63ddc60dd641bd3663fadd5898e5980777781d0..11bbe1e38e9ee0a6256f39ccab43fb14b4716a33 100644 (file)
--- a/contrib/slapd-modules/passwd/sha2/README
+++ b/contrib/slapd-modules/passwd/sha2/README
@@ -24,7 +24,7 @@ Building
 1) Customize the OPENLDAP variable in Makefile to point to the OpenLDAP
 source root.
 
 1) Customize the OPENLDAP variable in Makefile to point to the OpenLDAP
 source root.
 

-For initial testing you might also want to edit CCFLAGS to define
+For initial testing you might also want to edit DEFS to define

 SLAPD_SHA2_DEBUG, which enables logging to stderr (don't leave this on
 in production, as it prints passwords in cleartext).
 
 SLAPD_SHA2_DEBUG, which enables logging to stderr (don't leave this on
 in production, as it prints passwords in cleartext).
 


@@ -99,7 +99,7 @@ Debugging (SHA-512, SHA-384 and SHA-256 only)
 ---------------------------------------------
 
 To see what's going on, recompile with SLAPD_SHA2_DEBUG (use the
 ---------------------------------------------
 
 To see what's going on, recompile with SLAPD_SHA2_DEBUG (use the

-commented-out CCFLAGS in Makefile), and then run slapd from the console
+commented-out DEFS in Makefile), and then run slapd from the console

 to see stderr:
 
 $ sudo /etc/init.d/slapd stop
 to see stderr:
 
 $ sudo /etc/init.d/slapd stop


@@ -124,7 +124,7 @@ conn=0 fd=12 closed (connection lost)
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 

-Copyright 2009-2012 The OpenLDAP Foundation.
+Copyright 2009-2014 The OpenLDAP Foundation.

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


@@ -139,6 +139,6 @@ top-level directory of the distribution or, alternatively, at
 
 ACKNOWLEDGEMENT:
 This work was initially developed by Jeff Turner for inclusion in
 
 ACKNOWLEDGEMENT:
 This work was initially developed by Jeff Turner for inclusion in

-OpenLDAP Software, based upon the SHA2 implementation independently
+OpenLDAP Software, based upon the SHA-2 implementation independently

 developed by Aaron Gifford.
 
 developed by Aaron Gifford.