-bugfixes

2 files changed, 7 insertions, 3 deletions

diff --git a/src/gnsrecord/json_gnsrecord.c b/src/gnsrecord/json_gnsrecord.c
index 9b74f6699..1c59d146e 100644
--- a/src/gnsrecord/json_gnsrecord.c
+++ b/src/gnsrecord/json_gnsrecord.c
@@ -142,6 +142,9 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
                   (is_rel_exp) ? "No relative expiration given" : err.text);
       return GNUNET_SYSERR;
     }
+    rd->expiration_time = abs_exp.abs_value_us;
+  } else {
+    rd->expiration_time = rel_exp.rel_value_us;
   }
   rd->record_type = GNUNET_GNSRECORD_typename_to_number (record_type);
   if (UINT32_MAX == rd->record_type)
diff --git a/src/identity/test_identity_messages.sh b/src/identity/test_identity_messages.sh
index 0879061e4..d29d14acc 100755
--- a/src/identity/test_identity_messages.sh
+++ b/src/identity/test_identity_messages.sh
@@ -20,13 +20,14 @@ which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30"
 TEST_MSG="This is a test message. 123"
 gnunet-arm -s -c test_identity.conf
 gnunet-identity -C recipientego -c test_identity.conf
-RECIPIENT_KEY=$(gnunet-identity -d -e recipientego -q -c test_identity.conf)
-MSG_ENC=$(gnunet-identity -W "$TEST_MSG" -k $RECIPIENT_KEY -c test_identity.conf)
-MSG_DEC=$(gnunet-identity -R "$MSG_ENC" -e recipientego -c test_identity.conf)
+RECIPIENT_KEY=`gnunet-identity -d -e recipientego -q -c test_identity.conf`
+MSG_ENC=`gnunet-identity -W "$TEST_MSG" -k $RECIPIENT_KEY -c test_identity.conf`
+MSG_DEC=`gnunet-identity -R "$MSG_ENC" -e recipientego -c test_identity.conf`
 gnunet-identity -D recipientego -c test_identity.conf
 gnunet-arm -e -c test_identity.conf
 if [ "$TEST_MSG" != "$MSG_DEC" ]
 then
+  diff  <(echo "$TEST_MSG" ) <(echo "$MSG_DEC")
   echo "Failed - \"$TEST_MSG\" != \"$MSG_DEC\""
   exit 1
 fi