Import Upstream version 0.69.0

[hcoop/debian/courier-authlib.git] / userdb / userdbpw.c

diff --git a/userdb/userdbpw.c b/userdb/userdbpw.c
index 23620df..ad12fb5 100644 (file)
--- a/userdb/userdbpw.c
+++ b/userdb/userdbpw.c
@@ -33,6 +33,9 @@
 #include       "libhmac/hmac.h"
 #endif
 
+#if    HAVE_BCRYPT
+#include       <pwd.h>
+#endif
 #include       <string.h>
 #include       <stdio.h>
 #include       <signal.h>
@@ -102,6 +105,9 @@ int n=1;
 int    md5=0;
 char   buf[BUFSIZ];
 char   salt[9];
+#if HAVE_BCRYPT
+char   *cryptsalt;
+#endif
 #if    HAVE_HMAC
 struct hmac_hashinfo   *hmac=0;
 #endif
@@ -243,7 +249,11 @@ struct hmac_hashinfo       *hmac=0;
        }
 #endif
 
-#if    HAVE_CRYPT
+#if    HAVE_BCRYPT
+       cryptsalt=bcrypt_gensalt(8);
+       printf("%s\n", crypt(buf, cryptsalt));
+       fflush(stdout);
+#elif  HAVE_CRYPT
        printf("%s\n", crypt(buf, salt));
        fflush(stdout);
 #endif