Attachment #75210 for bug #108685

View | Details | Raw Unified | Return to bug 108685
Collapse All | Expand All

Lines 48-54 Link Here

(-)files/pdns.conf (-1 / +1 lines)
48	#################################	48	#################################
49	# config-dir Location of configuration directory (pdns.conf)	49	# config-dir Location of configuration directory (pdns.conf)
50	#	50	#
51	# config-dir=/usr/local/etc	51	# config-dir=/usr/local/etc/pdns
52		52
53	#################################	53	#################################
54	# config-name Name of this virtual configuration - will rename the binary image	54	# config-name Name of this virtual configuration - will rename the binary image

Lines 25-31 Link Here

(-)files/pdns.in (-1 / +1 lines)
25	# set defaults	25	# set defaults
26		26
27	pdns_enable=${pdns_enable:-"NO"}	27	pdns_enable=${pdns_enable:-"NO"}
28	pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns.conf"}	28	pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"}
29	pdns_flags=${pdns_flags:-""}	29	pdns_flags=${pdns_flags:-""}
30		30
31	load_rc_config ${name}	31	load_rc_config ${name}




--- modules/opendbxbackend/odbxbackend.hh	2006-03-15 19:29:39.000000000 +0100
+++ modules/opendbxbackend/odbxbackend.hh	2007-01-25 22:16:13.000000000 +0100
@@ -1,11 +1,10 @@
 /*
  *  PowerDNS OpenDBX Backend

 		declare( suffix, "password","Password for connecting to the DBMS","");
 
-		declare( suffix, "sql-list", "AXFR query", "SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id'" );
+		declare( suffix, "sql-list", "AXFR query", "SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"domain_id\"=:id" );
 
-		declare( suffix, "sql-lookup", "Lookup query","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE name=':name'" );
-		declare( suffix, "sql-lookupid", "Lookup query with id","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id' AND name=':name'" );
-		declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE name=':name' AND type=':type'" );
 		declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE name=':name' AND type=':type'" );
-		declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT domain_id, name, type, ttl, prio, content FROM records WHERE domain_id=':id' AND name=':name' AND type=':type'" );
+		declare( suffix, "sql-lookup", "Lookup query","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"name\"=':name'" );
+		declare( suffix, "sql-lookupid", "Lookup query with id","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"domain_id\"=:id AND \"name\"=':name'" );
+		declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"name\"=':name' AND \"type\"=':type'" );
+		declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" FROM \"records\" WHERE \"domain_id\"=:id AND \"name\"=':name' AND \"type\"=':type'" );
 
-		declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM records WHERE domain_id=':id'" );
-		declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.id, d.name, d.type, d.master, d.last_check, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.name=':name' AND r.type='SOA' ) OR ( d.name=':name' AND r.domain_id IS NULL )" );
+		declare( suffix, "sql-zonedelete","Delete all records for this zone","DELETE FROM \"records\" WHERE \"domain_id\"=:id" );
+		declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.\"id\", d.\"name\", d.\"type\", d.\"master\", d.\"last_check\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"name\"=':name' AND d.\"status\"='A'" );
 
 		declare( suffix, "sql-transactbegin", "Start transaction", "BEGIN" );
 		declare( suffix, "sql-transactend", "Finish transaction", "COMMIT" );
 		declare( suffix, "sql-transactabort", "Abort transaction", "ROLLBACK" );
 
-		declare( suffix, "sql-insert-slave","Add slave domain", "INSERT INTO domains ( name, type, master, account ) VALUES ( '%s', 'SLAVE', '%s', '%s' )" );
-		declare( suffix, "sql-insert-record","Feed record into table", "INSERT INTO records ( domain_id, name, type, ttl, prio, content ) VALUES ( '%d', '%s', '%s', '%d', '%d', '%s' )" );
+		declare( suffix, "sql-insert-slave","Add slave domain", "INSERT INTO \"domains\" ( \"name\", \"type\", \"master\", \"account\" ) VALUES ( '%s', 'SLAVE', '%s', '%s' )" );
+		declare( suffix, "sql-insert-record","Feed record into table", "INSERT INTO \"records\" ( \"domain_id\", \"name\", \"type\", \"ttl\", \"prio\", \"content\" ) VALUES ( %d, '%s', '%s', %d, %d, '%s' )" );
+
+		declare( suffix, "sql-update-serial", "Set zone to notified", "UPDATE \"domains\" SET \"notified_serial\"=%d WHERE \"id\"=%d" );
+		declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE \"domains\" SET \"last_check\"=%d WHERE \"id\"=%d" );
 
-		declare( suffix, "sql-update-serial", "Set zone to notified", "UPDATE domains SET notified_serial='%d' WHERE id='%d'" );
-		declare( suffix, "sql-update-lastcheck", "Set time of last check", "UPDATE domains SET last_check='%d' WHERE id='%d'" );
+		declare( suffix, "sql-master", "Get master record for zone", "SELECT \"master\" FROM \"domains\" WHERE \"name\"=':name' AND \"status\"='A' AND \"type\"='SLAVE'" );
+		declare( suffix, "sql-supermaster","Get supermaster info", "SELECT \"account\" FROM \"supermasters\" WHERE \"ip\"=':ip' AND \"nameserver\"=':ns'" );
 
-		declare( suffix, "sql-master", "Get master record for zone", "SELECT master FROM domains WHERE name=':name' AND type='SLAVE'" );
-		declare( suffix, "sql-supermaster","Get supermaster info", "SELECT account FROM supermasters WHERE ip=':ip' AND nameserver=':ns'" );
+		declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.\"id\", d.\"name\", d.\"master\", d.\"notified_serial\", d.\"last_check\", r.\"change_date\", r.\"content\" FROM \"domains\" d LEFT JOIN \"records\" r ON ( d.\"id\"=r.\"domain_id\" AND r.\"type\"='SOA' ) WHERE d.\"status\"='A' AND d.\"type\"='SLAVE'" );
+		declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.\"id\", d.\"name\", d.\"master\", d.\"notified_serial\", d.\"last_check\", r.\"change_date\", r.\"content\" FROM \"domains\" d JOIN \"records\" r ON d.\"id\"=r.\"domain_id\" WHERE d.\"status\"='A' AND d.\"type\"='MASTER' AND r.\"type\"='SOA'" );
 
-		declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains AS d LEFT JOIN records AS r ON d.id=r.domain_id WHERE ( d.type='SLAVE' AND r.type='SOA' ) OR ( d.type='SLAVE' AND r.domain_id IS NULL )" );
-		declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains AS d, records AS r WHERE d.type='MASTER' AND d.id=r.domain_id AND r.type='SOA'" );
+		declare( suffix, "sql-infoslaves", "Get all unfresh slaves", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains d LEFT JOIN records r ON ( d.id=r.domain_id AND r.type='SOA' ) WHERE d.status='A' AND d.type='SLAVE'" );
+		declare( suffix, "sql-infomasters", "Get all updated masters", "SELECT d.id, d.name, d.master, d.notified_serial, d.last_check, r.change_date, r.content FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.status='A' AND d.type='MASTER' AND r.type='SOA'" );
+
+		declare( suffix, "host", "depricated, use host-read and host-write instead","" );
 	}
 

 
 		setArgPrefix( "opendbx" + suffix );
-		stringtok( hosts, getArg( "host" ), ", " );
 
-		idx = odbx_host_index++ % hosts.size();
-
-		idx = odbx_host_index++ % hosts.size();
 
-		for( i = 0; i < hosts.size(); i++ )
+		if( getArg( "host" ).size() > 0 )
 		{

 
-		len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
+
+		if( len < 0 )
+		{
+			L.log( m_myname + " list: Unable to convert zone id to string - format error",  Logger::Error );
+			return false;
+		}
 
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		if( len > sizeof( m_buffer ) - 1 )
 		{
-			L.log( m_myname + " list: Unable to convert zone id to string",  Logger::Error );
-			throw( DBException( "Error: Libc error" ) );
+			L.log( m_myname + " list: Unable to convert zone id to string - insufficient buffer space",  Logger::Error );
+			return false;
 		}
 
-		stmt = strbind( ":id", string( m_buffer, len ), getArg( "sql-list" ) );
+		if( len > sizeof( m_buffer ) - 1 )
+		{
+			L.log( m_myname + " list: Unable to convert zone id to string - insufficient buffer space",  Logger::Error );
+			return false;
+		}
+
+		string stmt = getArg( "sql-list" );
+		string& stmtref = strbind( ":id", string( m_buffer, len ), stmt );
 

 	}
 
 	return true;
@@ -181,13 +201,13 @@
 
 void OdbxBackend::lookup( const QType& qtype, const string& qname, DNSPacket* dnspkt, int zoneid )
 {

+
 		m_result = NULL;
 		m_qname = qname;
 		
@@ -197,7 +217,8 @@
 		if( zoneid < 0 )
 		{
 			if( qtype.getCode() == QType::ANY )
 			{
 				stmt = getArg( "sql-lookup" );
 			} else {

+				stmt = getArg( "sql-lookuptypeid" );
+				stmtref = strbind( ":type", qtype.getName(), stmt );
 			}
  			
+
 			size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
 
-			if( len < 0 || len > sizeof( m_buffer ) - 1 )
+			if( len < 0 )
+			{
+				L.log( m_myname + " lookup: Unable to convert zone id to string - format error",  Logger::Error );
+				throw( DBException( "Error: Libc error" ) );
+			}
+
+			if( len > sizeof( m_buffer ) - 1 )
 			{
-				L.log( m_myname + " lookup: Unable to convert zone id to string",  Logger::Error );
+				L.log( m_myname + " lookup: Unable to convert zone id to string - insufficient buffer space",  Logger::Error );
 				throw( DBException( "Error: Libc error" ) );
 			}
 
-			stmt = strbind( ":id", string( m_buffer, len ), stmt );
+			if( len > sizeof( m_buffer ) - 1 )
+			{
+				L.log( m_myname + " lookup: Unable to convert zone id to string - insufficient buffer space",  Logger::Error );
+				throw( DBException( "Error: Libc error" ) );
+			}
+
+			stmtref = strbind( ":id", string( m_buffer, len ), stmtref );
 		}
 

 
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		if( len < 0 )
+		{
+			L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "' - format error",  Logger::Error );
+			throw( DBException( "Error: Libc error" ) );
+		}
+
+		if( len > sizeof( m_buffer ) - 1 )
 		{
-			L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "'",  Logger::Error );
+			L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "' - format error",  Logger::Error );
 			throw( DBException( "Error: Libc error" ) );
 		}
 
-		execStmt( m_buffer, len, false );
+		if( len > sizeof( m_buffer ) - 1 )
+		{
+			L.log( m_myname + " setFresh: Unable to insert values into statement '" + getArg( "sql-update-lastcheck" ) + "' - insufficient buffer space",  Logger::Error );
+			throw( DBException( "Error: Libc error" ) );
+		}
+
+		if( !execStmt( m_buffer, len, WRITE ) )
+		{
+			throw( DBException( "Error: DB statement failed" ) );

+			L.log( m_myname + " setFresh: Master server is unreachable",  Logger::Error );
+			throw( DBException( "Error: Server unreachable" ) );
+		}
+
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-update-serial" ).c_str(), serial, domain_id );
 
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-update-serial" ).c_str(), serial, domain_id );
+
+		if( len < 0 )
 		{
-			L.log( m_myname + " setNotified: Unable to insert values into statement '" + getArg( "sql-update-serial" ) + "'",  Logger::Error );

 			{
-				stmt = strbind( ":ip", escape( ip ), getArg( "sql-supermaster" ) );
-				stmt = strbind( ":ns", escape( i->content ), stmt );
-
-				execStmt( stmt.c_str(), stmt.size(), true );
+				string stmt = getArg( "sql-supermaster" );
+				string& stmtref = strbind( ":ip", escape( ip, READ ), stmt );
+				stmtref = strbind( ":ns", escape( i->content, READ ), stmtref );
 
-				execStmt( stmt.c_str(), stmt.size(), true );
+				if( !execStmt( stmtref.c_str(), stmtref.size(), READ ) ) { return false; }
 
-				if( !getRecord() ) { return false; }
-
-				do
+				if( getRecord( READ ) )
 				{

 					}
-				}
-				while( getRecord() );
 
-				*ddb=this;
-				return true;
+					while( getRecord( READ ) );
+
+					while( getRecord( READ ) );
 
 				*ddb=this;
 				return true;
 			}
 		}
 	}
+	}
 	catch ( exception& e )
 	{
 		L.log( m_myname + " superMasterBackend: Caught STL exception - " + e.what(),  Logger::Error );

+			L.log( m_myname + " createSlaveDomain: Master server is unreachable",  Logger::Error );
+			return false;
+		}
+
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		string tmp = domain;
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-slave" ).c_str(), escape( toLowerByRef( tmp ), WRITE ).c_str(),
+			escape( ip, WRITE ).c_str(), escape( account, WRITE ).c_str() );
 
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		if( len < 0 )
 		{
-			L.log( m_myname + " createSlaveDomain: Unable to insert values in statement '" + getArg( "sql-insert-slave" ) + "'",  Logger::Error );
-			throw( DBException( "Error: Libc error" ) );
+			L.log( m_myname + " createSlaveDomain: Unable to insert values in statement '" + getArg( "sql-insert-slave" ) + "' - format error",  Logger::Error );
+			return false;
 		}
 
-		execStmt( m_buffer, len, false );
+		if( len > sizeof( m_buffer ) - 1 )
+		{
+			L.log( m_myname + " createSlaveDomain: Unable to insert values in statement '" + getArg( "sql-insert-slave" ) + "' - insufficient buffer space",  Logger::Error );
+			return false;
+		}
+
-		execStmt( m_buffer, len, false );
+		if( !execStmt( m_buffer, len, WRITE ) ) { return false; }
 	}
 	catch ( exception& e )

+			L.log( m_myname + " feedRecord: Master server is unreachable",  Logger::Error );
+			return false;
+		}
+
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		string tmp = rr.qname;
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, getArg( "sql-insert-record" ).c_str(), rr.domain_id,
+			escape( toLowerByRef( tmp ), WRITE ).c_str(), rr.qtype.getName().c_str(), rr.ttl, rr.priority,
+			escape( rr.content, WRITE ).c_str() );
 
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		if( len < 0 )
 		{
-			L.log( m_myname + " feedRecord: Unable to insert values in statement '" + getArg( "sql-insert-record" ) + "'",  Logger::Error );

-		len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
+		string& stmtref = const_cast<string&>( getArg( "sql-transactbegin" ) );
+		if( !execStmt( stmtref.c_str(), stmtref.size(), WRITE ) ) { return false; }
+
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
 
-		if( len < 0 || len > sizeof( m_buffer ) - 1 )
+		size_t len = snprintf( m_buffer, sizeof( m_buffer ) - 1, "%d", zoneid );
+
+		if( len < 0 )
 		{
-			L.log( m_myname + " lookup: Unable to convert zone id to string",  Logger::Error );

 
 	return true;
--- modules/opendbxbackend/odbxprivate.cc	2006-03-15 19:29:39.000000000 +0100
+++ modules/opendbxbackend/odbxprivate.cc	2007-01-21 18:00:22.000000000 +0100
@@ -2,7 +2,50 @@
 
 

+
+		if( ( err = odbx_init( &(m_handle[type]), getArg( "backend" ).c_str(), hosts[h].c_str(), getArg( "port" ).c_str() ) ) == ODBX_ERR_SUCCESS )
+		{
+			if( ( err = odbx_bind( m_handle[type], getArg( "database" ).c_str(), getArg( "username" ).c_str(), getArg( "password" ).c_str(), ODBX_BIND_SIMPLE ) ) == ODBX_ERR_SUCCESS )
+			{
+				L.log( m_myname + " Database connection (" + (type ? "write" : "read") + ") to '" + hosts[h] + "' succeeded", Logger::Notice );
+				return true;

-		L.log( m_myname + " execStmt: Unable to execute query - " + string( odbx_error( m_handle, err ) ),  Logger::Error );
-		throw( AhuException( "Error: odbx_query() failed" ) );
+		L.log( m_myname + " execStmt: Unable to execute query - " + string( odbx_error( m_handle[type], err ) ),  Logger::Error );
+		if( odbx_error_type( m_handle[type], err ) < 0 ) { connectTo( m_hosts[type], type ); }
+		return false;
 	}
 

Lines 7-13 Link Here

(-)Makefile (-2 / +2 lines)
7		7
8	PORTNAME= powerdns	8	PORTNAME= powerdns
9	PORTVERSION= 2.9.20	9	PORTVERSION= 2.9.20
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= dns ipv6	11	CATEGORIES= dns ipv6
12	MASTER_SITES= http://downloads.powerdns.com/releases/ \	12	MASTER_SITES= http://downloads.powerdns.com/releases/ \
13	http://mirrors.evolva.ro/powerdns.com/releases/	13	http://mirrors.evolva.ro/powerdns.com/releases/
Lines 98-104 Link Here
98	.endif	98	.endif
99		99
100	.if defined(WITH_OPENDBX)	100	.if defined(WITH_OPENDBX)
101	LIB_DEPENDS+= opendbx.1:${PORTSDIR}/databases/opendbx	101	LIB_DEPENDS+= opendbx.[1-2]:${PORTSDIR}/databases/opendbx
102	CONFIGURE_MODULES+= "opendbx"	102	CONFIGURE_MODULES+= "opendbx"
103	PLIST_SUB+= WITHOPENDBX=""	103	PLIST_SUB+= WITHOPENDBX=""
104	CXXFLAGS+= -L${LOCALBASE}/lib	104	CXXFLAGS+= -L${LOCALBASE}/lib

Return to bug 108685