From 7454331ea32731abcd24d33cacaf99c9ac26bebe Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Thu, 29 Aug 2013 09:11:06 +0400
Subject: [PATCH] cyrusauth: Fix user creation

---
 modules/cyrusauth.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/cyrusauth.cpp b/modules/cyrusauth.cpp
index 4d25cdca..5e7830a0 100644
--- a/modules/cyrusauth.cpp
+++ b/modules/cyrusauth.cpp
@@ -128,21 +128,22 @@ public:
 					}
 
 					if (pUser && !pUser->Clone(*pBaseUser, sErr)) {
-						DEBUG("saslauth: Clone User [" << CloneUser() << "] " << sErr);
+						DEBUG("saslauth: Clone User [" << CloneUser() << "] failed: " << sErr);
 						delete pUser;
 						pUser = NULL;
 					}
 				}
 
+				if (pUser) {
+					// "::" is an invalid MD5 hash, so user won't be able to login by usual method
+					pUser->SetPass("::", CUser::HASH_MD5, "::");
+				}
+
 				if (pUser && !CZNC::Get().AddUser(pUser, sErr)) {
 					DEBUG("saslauth: Add user [" << sUsername << "] failed: " << sErr);
 					delete pUser;
 					pUser = NULL;
 				}
-
-				if (pUser) {
-					pUser->SetPass("::", CUser::HASH_MD5, "::");
-				}
 			}
 
 			if (pUser) {