diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-03-21 16:12:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-03-21 16:12:46 +0000 |
commit | b99555d0cf6abbf74b4adab736658ed44ea2f3bd (patch) | |
tree | 15b00ae7a8d3b9ba8ac9f20aa68274102579a95e /src | |
parent | 2a690a3fc6c88aa0988d4cef645f7b9acf72adbc (diff) | |
download | gnunet-b99555d0cf6abbf74b4adab736658ed44ea2f3bd.tar.gz gnunet-b99555d0cf6abbf74b4adab736658ed44ea2f3bd.zip |
-allow deletion without specifying expiration
Diffstat (limited to 'src')
-rw-r--r-- | src/namestore/gnunet-namestore.c | 10 | ||||
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index eb77913cc..674644676 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c | |||
@@ -355,11 +355,11 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
355 | GNUNET_SCHEDULER_shutdown (); | 355 | GNUNET_SCHEDULER_shutdown (); |
356 | return; | 356 | return; |
357 | } | 357 | } |
358 | } else if (add | del) | 358 | } else if (add) |
359 | { | 359 | { |
360 | fprintf (stderr, | 360 | fprintf (stderr, |
361 | _("Missing option `%s' for operation `%s'\n"), | 361 | _("Missing option `%s' for operation `%s'\n"), |
362 | "-e", _("add/del")); | 362 | "-e", _("add")); |
363 | GNUNET_SCHEDULER_shutdown (); | 363 | GNUNET_SCHEDULER_shutdown (); |
364 | return; | 364 | return; |
365 | } | 365 | } |
@@ -377,7 +377,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
377 | rd.data_size = data_size; | 377 | rd.data_size = data_size; |
378 | rd.record_type = type; | 378 | rd.record_type = type; |
379 | rd.expiration = GNUNET_TIME_relative_to_absolute (etime); | 379 | rd.expiration = GNUNET_TIME_relative_to_absolute (etime); |
380 | rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always... | 380 | rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; |
381 | add_qe = GNUNET_NAMESTORE_record_create (ns, | 381 | add_qe = GNUNET_NAMESTORE_record_create (ns, |
382 | zone_pkey, | 382 | zone_pkey, |
383 | name, | 383 | name, |
@@ -398,8 +398,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
398 | rd.data = data; | 398 | rd.data = data; |
399 | rd.data_size = data_size; | 399 | rd.data_size = data_size; |
400 | rd.record_type = type; | 400 | rd.record_type = type; |
401 | rd.expiration = GNUNET_TIME_relative_to_absolute (etime); | 401 | rd.expiration.abs_value = 0; |
402 | rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always... | 402 | rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; |
403 | del_qe = GNUNET_NAMESTORE_record_remove (ns, | 403 | del_qe = GNUNET_NAMESTORE_record_remove (ns, |
404 | zone_pkey, | 404 | zone_pkey, |
405 | name, | 405 | name, |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 3852a1406..5647dd311 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -1016,8 +1016,6 @@ handle_record_remove_it (void *cls, | |||
1016 | found = GNUNET_SYSERR; | 1016 | found = GNUNET_SYSERR; |
1017 | for (c = 0; c < rd_count; c++) | 1017 | for (c = 0; c < rd_count; c++) |
1018 | { | 1018 | { |
1019 | if (rd[c].expiration.abs_value != rrc->rd->expiration.abs_value) | ||
1020 | continue; | ||
1021 | GNUNET_break(0); | 1019 | GNUNET_break(0); |
1022 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SENT FLAGES: %u \n",rd[c].flags); | 1020 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SENT FLAGES: %u \n",rd[c].flags); |
1023 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STORED FLAGES: %u \n",rrc->rd->flags); | 1021 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STORED FLAGES: %u \n",rrc->rd->flags); |