Merge branch 'master' of github.com:evilnet/x3

diff --git a/src/nickserv.c b/src/nickserv.c
index 8181cd063afe14410c8c4e72714e5e02aba00d24..8ef28b058f3de4b73c48ab775d0dacf90232e309 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -5799,10 +5799,18 @@ sasl_packet(struct SASLSession *session)
             }
             else
             {
-                if (*authzid && irccasecmp(authzid, authcid) && HANDLE_FLAGGED(hi, IMPERSONATE))
+                if (*authzid && irccasecmp(authzid, authcid))
                 {
-                    hii = hi;
-                    hi = get_handle_info(authzid);
+                    if (HANDLE_FLAGGED(hi, IMPERSONATE))
+                    {
+                        hii = hi;
+                        hi = get_handle_info(authzid);
+                    }
+                    else
+                    {
+                        log_module(NS_LOG, LOG_DEBUG, "SASL: Impersonation unauthorized");
+                        hi = NULL;
+                    }
                 }
                 if (hi)
                 {