Changeset 1181

Timestamp:

05/30/08 11:58:41 (6 months ago)

Author:

ahu

Message:

Updates from Norbert: The patch attached improves the compatibility of the
SQL statements and fixes a bug in the getSOA() method (ttl was a random
value). Credits go to Matti Hiljanen.

Files:

• trunk/pdns/modules/opendbxbackend/odbxbackend.cc (modified) (1 diff)
• trunk/pdns/modules/opendbxbackend/odbxbackend.hh (modified) (2 diffs)

trunk/pdns/modules/opendbxbackend/odbxbackend.cc

@@ -185 +185 @@
-                {
-                        sd.serial = 0;
+                        sd.ttl = m_default_ttl;
+
+                        if( ( tmp = odbx_field_value( m_result, 3 ) ) != NULL )
+                        {
+                                fillSOAData( string( tmp, odbx_field_length( m_result, 3 ) ), sd );
+                        }
-
-                        if( ( tmp = odbx_field_value( m_result, 2 ) ) != NULL )
-                        {
-fillSOAData( string( tmp, odbx_field_length( m_result, 2 ) ), sd
-
+sd.ttl = strtoul( tmp, NULL, 10
+ 
-
-                        if( sd.serial == 0 && ( tmp = odbx_field_value( m_result, 1 ) ) != NULL )

trunk/pdns/modules/opendbxbackend/odbxbackend.hh

@@ -124 +124 @@
-                declare( suffix, "sql-lookuptype", "Lookup query with type","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"name\"=':name' AND r.\"type\"=':type'" );
-                declare( suffix, "sql-lookuptypeid", "Lookup query with type and id","SELECT r.\"domain_id\", r.\"name\", r.\"type\", r.\"ttl\", r.\"prio\", r.\"content\" FROM \"records\" r WHERE r.\"domain_id\"=:id AND r.\"name\"=':name' AND r.\"type\"=':type'" );
-
+ttl\", r.\"
-
-r WHERE r.
+WHERE 
-                declare( suffix, "sql-zoneinfo","Get domain info","SELECT d.\"id\", d.\"name\", d.\"type\", d.\"master\", d.\"last_check\", d.\"auto_serial\", 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'" );
-
@@ -136 +136 @@
-                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' )" );
-
-d SET d.\"notified_serial\"=%d WHERE d.
-d SET d.\"last_check\"=%d WHERE d.
+SET \"notified_serial\"=%d WHERE 
+SET \"last_check\"=%d WHERE 
-
-                declare( suffix, "sql-master", "Get master record for zone", "SELECT d.\"master\" FROM \"domains\" d WHERE d.\"name\"=':name' AND d.\"status\"='A' AND d.\"type\"='SLAVE'" );