1 files changed, 5 insertions, 11 deletions

diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index d9bc5b212..23af3960d 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -162,7 +162,7 @@ database_setup (struct Plugin *plugin)
                             " ORDER BY uid ASC"
                             " LIMIT ?",
                             &plugin->iterate_all_zones),
-    GNUNET_SQ_make_prepare ("SELECT uid,record_count,record_data,label,zone_private_key"
+    GNUNET_SQ_make_prepare ("SELECT uid,record_count,record_data,label"
                             " FROM ns098records"
                             " WHERE zone_private_key=? AND label=?",
                             &plugin->lookup_label),
@@ -501,16 +501,10 @@ get_records_and_call_iterator (struct Plugin *plugin,
         GNUNET_SQ_result_spec_end
       };
 
-      if (NULL == zone_key)
-      {
-        ret = GNUNET_SQ_extract_result (stmt,
-                                        rsx);
-      }
-      else
-      {
-        ret = GNUNET_SQ_extract_result (stmt,
-                                        rs);
-      }
+      ret = GNUNET_SQ_extract_result (stmt,
+                                      (NULL == zone_key)
+                                      ? rsx
+                                      : rs);
       if ( (GNUNET_OK != ret) ||
            (record_count > 64 * 1024) )
       {