On 08/27/16 01:07, stanley lieber wrote:
> Both binary package and compiled from ports. Tested (amd64 only) on 5.9
> and two recent snapshots. Trace output here:
> http://okturing.com/src/3768/body
> sl
>
this fixes it for me (patch applies to -current).
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 27 May 2016 16:18:28 -0000 1.56
+++ Makefile 27 Aug 2016 14:04:34 -0000
@@ -12,7 +12,7 @@ PKGNAME-ldap= ${DISTNAME:S/lib-/lib-lda
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
-REVISION= 1
+REVISION= 2
SHARED_LIBS += courierauth 1.0 # .0.0
SHARED_LIBS += courierauthsasl 1.0 # .0.0
Index: patches/patch-userdb_userdbpw_c
===================================================================
RCS file: patches/patch-userdb_userdbpw_c
diff -N patches/patch-userdb_userdbpw_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-userdb_userdbpw_c 27 Aug 2016 15:58:44 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- userdb/userdbpw.c.orig Sat Aug 27 16:11:25 2016
++++ userdb/userdbpw.c Sat Aug 27 17:55:57 2016
+@@ -33,6 +33,7 @@
+ #include "libhmac/hmac.h"
+ #endif
+
++#include <pwd.h>
+ #include <string.h>
+ #include <stdio.h>
+ #include <signal.h>
+@@ -102,6 +103,7 @@ int n=1;
+ int md5=0;
+ char buf[BUFSIZ];
+ char salt[9];
++char *cryptsalt;
+ #if HAVE_HMAC
+ struct hmac_hashinfo *hmac=0;
+ #endif
+@@ -244,7 +246,8 @@ struct hmac_hashinfo *hmac=0;
+ #endif
+
+ #if HAVE_CRYPT
+- printf("%s\n", crypt(buf, salt));
++ cryptsalt=bcrypt_gensalt(8);
++ printf("%s\n", crypt(buf, cryptsalt));
+ fflush(stdout);
+ #endif
+ return (0);
