--- innwebd/base_passive.cpp	2004/07/04 22:49:03	1.6
+++ innwebd/base_passive.cpp	2008/04/11 17:14:49	1.10
@@ -1,14 +1,10 @@
 /*******************************************************/
 /*                                                     */
 /*  LeafOK Innbbsd                                     */
-/*  Copyright (C) LeafOK.com, 2003-2004                */
 /*                                                     */
-/*  Programmed by Leaf                                 */
-/*  E-mail:leaflet@leafok.com  QQ:6049044              */
+/*  Copyright (C) LeafOK.com, 2003-2008                */
 /*                                                     */
-/*  http://bbs.leafok.com                              */
-/*  http://bbs.leafok.net                              */
-/*  http://bbs.fenglin.info                            */
+/*  http://www.leafok.com                              */
 /*                                                     */
 /*******************************************************/
 
@@ -144,8 +140,7 @@ int base_passive::work()
 				break;
 			}
 
-			this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),tread_pool::S_WORKING);
-
+			this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WORKING);
 
 			strcpy(p->hostaddr,inet_ntoa(sin.sin_addr));
 			p->port = sin.sin_port;
@@ -160,7 +155,7 @@ int base_passive::work()
 				continue;
 			}
 
-			if (!p->access.get)
+			if (!p->check_priv())
 			{
 				p->s_send("502 You are not in my access file.\r\n");
 				delete(p);
@@ -209,6 +204,9 @@ DWORD base_passive::AcceptThread(LPVOID
 
 		p->ulMainThreadId = GetCurrentThreadId();
 
+		syslog << logfile::log_head << "Accept connection from " << p->hostaddr 
+			<< ":" << p->port << endl;
+
 		if (p->GetParentThread()->GetThreadPool()->AddThread(GetCurrentThreadId(), CLOCKS_PER_SEC * 30) != 0)
 		{
 			syslog << logfile::log_head << "Register thread ... Failed" << endl;
@@ -235,7 +233,9 @@ DWORD base_passive::AcceptThread(LPVOID
 	}
 	catch(CException* e)
 	{
-		syslog << logfile::log_head << "Error in AcceptThread()" << endl;
+		char strErrMsg[1024];
+		e->GetErrorMessage(strErrMsg,1024);
+		syslog << logfile::log_head << "Error in AcceptThread() [" << strErrMsg << "]" << endl;
 		e->Delete();
 		return -1;
 	}
@@ -250,7 +250,7 @@ int base_passive::get_priv(base_passive*
 		//Default value
 		strcpy(p->access.ip,p->hostaddr);
 		p->access.control = false;
-		p->access.get = true;
+		p->access.get = false;
 		p->access.post = false;
 		p->access.ihave = false;
 
@@ -266,7 +266,9 @@ int base_passive::get_priv(base_passive*
 	}
 	catch(CException* e)
 	{
-		syslog << logfile::log_head << "Error in get_priv()" << endl;
+		char strErrMsg[1024];
+		e->GetErrorMessage(strErrMsg,1024);
+		syslog << logfile::log_head << "Error in get_priv() [" << strErrMsg << "]" << endl;
 		e->Delete();
 		return -1;
 	}
@@ -318,7 +320,9 @@ int base_passive::load_priv(void)
 	}
 	catch(CException* e)
 	{
-		syslog << logfile::log_head << "Error in load_priv()" << endl;
+		char strErrMsg[1024];
+		e->GetErrorMessage(strErrMsg,1024);
+		syslog << logfile::log_head << "Error in load_priv() [" << strErrMsg << "]" << endl;
 		e->Delete();
 		return -1;
 	}
@@ -341,7 +345,9 @@ int base_passive::unload_priv(void)
 	}
 	catch(CException* e)
 	{
-		syslog << logfile::log_head << "Error in unload_priv()" << endl;
+		char strErrMsg[1024];
+		e->GetErrorMessage(strErrMsg,1024);
+		syslog << logfile::log_head << "Error in unload_priv() [" << strErrMsg << "]" << endl;
 		e->Delete();
 		return -1;
 	}
@@ -354,3 +360,8 @@ int base_passive::w_call(void)
 	this->work();
 	return 0;
 }
+
+bool base_passive::check_priv(void)
+{
+	return this->access.get;
+}