Merge branch 'master' into auction_brandt

1 files changed, 17 insertions, 0 deletions

diff --git a/src/kyclogic/kyclogic_api.c b/src/kyclogic/kyclogic_api.c
index 96bf16aa..0c4a5112 100644
--- a/src/kyclogic/kyclogic_api.c
+++ b/src/kyclogic/kyclogic_api.c
@@ -183,6 +183,7 @@ TALER_KYCLOGIC_kyc_trigger_from_string (const char *trigger_s,
     { "deposit", TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT  },
     { "merge", TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE },
     { "balance", TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE },
+    { "close", TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE },
     { NULL, 0 }
   };
 
@@ -213,6 +214,8 @@ TALER_KYCLOGIC_kyc_trigger2s (enum TALER_KYCLOGIC_KycTriggerEvent trigger)
     return "merge";
   case TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE:
     return "balance";
+  case TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE:
+    return "close";
   }
   GNUNET_break (0);
   return NULL;
@@ -1308,4 +1311,18 @@ TALER_KYCLOGIC_kyc_iterate_thresholds (
 }
 
 
+enum TALER_ErrorCode
+TALER_KYCLOGIC_user_to_attributes (const char *provider_section,
+                                   const char *provider_user_id,
+                                   const char *legitimization_id,
+                                   struct GNUNET_TIME_Timestamp *attr_expiration,
+                                   json_t **attrs)
+{
+  GNUNET_break (0); // FIXME: not yet implemented!!!
+  *attrs = json_object ();
+  *attr_expiration = GNUNET_TIME_UNIT_ZERO_TS;
+  return TALER_EC_NONE;
+}
+
+
 /* end of taler-exchange-httpd_kyc.c */