commit 80b3182db5a5b13a765b2ab8846cb1d0f3281990
parent 618fe72608aa79afca29421b5b8abb24196f8932
Author: Christian Grothoff <christian@grothoff.org>
Date: Fri, 5 Mar 2021 21:31:04 +0100
Merge branch 'master' of git+ssh://git.gnunet.org/gana
Diffstat:
4 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/gnu-name-system-record-types/Makefile b/gnu-name-system-record-types/Makefile
@@ -1,4 +1,4 @@
-FILES=gnu-name-system-record-types.h
+FILES=gnu_name_system_record_types.h
all: check $(FILES)
check:
@@ -10,10 +10,10 @@ distclean:
clean:
rm -f $(FILES) *.tmp
-gnu-name-system-record-types.h.tmp: registry.rec h.template
+gnu_name_system_record_types.h.tmp: registry.rec h.template
../format.sh h.template < registry.rec > $@
-gnu-name-system-record-types.h: h.header gnu-name-system-record-types.h.tmp h.footer
+gnu_name_system_record_types.h: h.header gnu_name_system_record_types.h.tmp h.footer
cat $^ > $@
.PHONY: check clean distclean
diff --git a/gnu-name-system-record-types/h.header b/gnu-name-system-record-types/h.header
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- Copyright (C) 2012-2020 GNUnet e.V.
+ Copyright (C) 2012-2021 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -20,6 +20,15 @@
#ifndef GNU_NAME_SYSTEM_RECORD_TYPES_H
#define GNU_NAME_SYSTEM_RECORD_TYPES_H
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add GNS record types, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
+
#ifdef __cplusplus
extern "C" {
#if 0 /* keep Emacsens' auto-indent happy */
diff --git a/gnu-name-system-record-types/registry.rec b/gnu-name-system-record-types/registry.rec
@@ -4,7 +4,7 @@
#
%rec: RecordType
-%key: Number
+%key: Number
%type: Number int
%mandatory: Number
%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]*$/
@@ -68,12 +68,12 @@ Contact: schanzen@gnunet.org
Number: 65548
Name: DELEGATE
-Comment: for policies
+Comment: For ABD policies
Contact: schanzen@gnunet.org
Number: 65549
Name: ATTRIBUTE
-Comment: for reverse lookups
+Comment: For ABD reverse lookups
Contact: schanzen@gnunet.org
Number: 65550
@@ -81,28 +81,32 @@ Name: RECLAIM_ATTRIBUTE_REF
Comment: for reclaim records
Contact: schanzen@gnunet.org
-Number: 65551
-Name: RECLAIM_MASTER
-Comment: for RECLAIM master
-Contact: schanzen@gnunet.org
+#Number: 65551
+#Name:
+#Comment:
+#Contact:
Number: 65552
-Name: RECLAIM_TICKET
-Comment: for reclaimOIDC clients
+Name: RECLAIM_OIDC_CLIENT
+Comment: For reclaim OIDC client names.
Contact: schanzen@gnunet.org
Number: 65553
-Name: RECLAIM_OIDC_CLIENT
-Comment: for reclaim OIDC redirect URIs
+Name: RECLAIM_OIDC_REDIRECT
+Comment: Used reclaimID OIDC client redirect URIs.
Contact: schanzen@gnunet.org
+
Number: 65554
-Name: RECLAIM_ATTESTATION
-Comment: for reclaim attestation
+Name: RECLAIM_CREDENTIAL
+Comment: Record type for an attribute attestation (e.g. JWT).
Contact: schanzen@gnunet.org
Number: 65555
-Name: RECLAIM_ATTESTATION_REF
-Comment: for attestation reference in a ticket
+Name: RECLAIM_PRESENTATION
+Comment: Record type for a presentation of a credential.
Contact: schanzen@gnunet.org
+Number: 65556
+Name: EDKEY
+Comment: Record type for EDKEY zone delegations.
diff --git a/gnu-taler-error-codes/registry.rec b/gnu-taler-error-codes/registry.rec
@@ -1109,6 +1109,16 @@ Name: MERCHANT_PRIVATE_POST_INSTANCES_ALREADY_EXISTS
Description: The merchant backend cannot create an instance under the given identifier as one already exists. Use PATCH to modify the existing entry.
HttpStatus: 409
+Value: 2601
+Name: MERCHANT_PRIVATE_POST_INSTANCES_BAD_AUTH
+Description: The merchant backend cannot create an instance because the authentication configuration field is malformed.
+HttpStatus: 400
+
+Value: 2602
+Name: MERCHANT_PRIVATE_POST_INSTANCE_AUTH_BAD_AUTH
+Description: The merchant backend cannot update an instance's authentication settings because the provided authentication settings are malformed.
+HttpStatus: 400
+
# 2650-2699: product operations
