From a1049689fc6ed5d9c232278176fcddf2db3000da Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 4 Apr 2011 16:32:13 +0300 Subject: [PATCH 1/1] Exclude DEL_USER_NOTIFIER from AUTH_IA (possible freandship fix) --- .../authorization/inetaccess/inetaccess.h | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h index 68c9e87a..e28aad8f 100644 --- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h +++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h @@ -185,6 +185,18 @@ private: FREEMB freeMbShowType; }; //----------------------------------------------------------------------------- +class AUTH_IA; +//----------------------------------------------------------------------------- +class DEL_USER_NOTIFIER: public NOTIFIER_BASE { +public: + DEL_USER_NOTIFIER(AUTH_IA & a) : auth(a) {} + virtual ~DEL_USER_NOTIFIER() {} + + void Notify(const USER_PTR & user); +private: + AUTH_IA & auth; +}; +//----------------------------------------------------------------------------- class AUTH_IA :public AUTH { friend class DEL_USER_NOTIFIER; public: @@ -316,19 +328,7 @@ private: uint32_t enabledDirs; - class DEL_USER_NOTIFIER: public NOTIFIER_BASE { - public: - DEL_USER_NOTIFIER(AUTH_IA & a) : auth(a) {} - virtual ~DEL_USER_NOTIFIER() {} - - void Notify(const USER_PTR & user) - { - auth.DelUser(user); - } - - private: - AUTH_IA & auth; - } onDelUserNotifier; + DEL_USER_NOTIFIER onDelUserNotifier; class UnauthorizeUser : std::unary_function &, void> { public: @@ -343,5 +343,10 @@ private: }; //----------------------------------------------------------------------------- +inline +void DEL_USER_NOTIFIER::Notify(const USER_PTR & user) +{ + auth.DelUser(user); +} #endif -- 2.44.2