fixup: review feedback

kgiusti · Oct 1, 2024 · ceacaab · ceacaab
1 parent 9ce46e4
commit ceacaab
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 15 deletions.
diff --git a/include/qpid/dispatch/tls_amqp.h b/include/qpid/dispatch/tls_amqp.h
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 
 typedef struct pn_transport_t pn_transport_t;
 

diff --git a/include/qpid/dispatch/tls.h → include/qpid/dispatch/tls_common.h b/include/qpid/dispatch/tls.h → include/qpid/dispatch/tls_common.h
@@ -1,5 +1,5 @@
-#ifndef __tls_h__
-#define __tls_h__ 1
+#ifndef __tls_common_h__
+#define __tls_common_h__ 1
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

diff --git a/include/qpid/dispatch/tls_raw.h b/include/qpid/dispatch/tls_raw.h
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 #include "qpid/dispatch/buffer.h"
 
 typedef struct pn_raw_connection_t pn_raw_connection_t;

diff --git a/python/skupper_router/management/skrouter.json b/python/skupper_router/management/skrouter.json
@@ -712,14 +712,12 @@
                 "uidFormat": {
                     "type": "string",
                     "description": "A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of 'cou' indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of 'o2' indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of 'c'( ISO3166 two character country code), 's'(state or province), 'l'(Locality; generally - city), 'o'(Organization - Company Name), 'u'(Organization Unit - typically certificate type or brand), 'n'(CommonName - typically a user name for client certificates) and '1'(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate with say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint). The user identifier (uid) that is generated based on the uidFormat is a string which has a semi-colon as a separator between the components",
-                    "create": true,
-                    "update": true
+                    "create": true
                 },
                 "uidNameMappingFile": {
                     "type": "string",
                     "description": "The absolute path to the file containing the unique id to display name mapping",
-                    "create": true,
-                    "update": true
+                    "create": true
                 },
                 "version": {
                     "type": "integer",

diff --git a/src/adaptors/amqp/server_config.c b/src/adaptors/amqp/server_config.c
@@ -26,7 +26,7 @@
 #include "entity.h"
 
 #include <qpid/dispatch/log.h>
-#include <qpid/dispatch/tls.h>
+#include <qpid/dispatch/tls_common.h>
 
 #include <proton/codec.h>
 

diff --git a/src/adaptors/legacy_tls.c b/src/adaptors/legacy_tls.c
@@ -25,7 +25,7 @@
 #include "qpid/dispatch/atomic.h"
 #include "qpid/dispatch/connection_manager.h"
 #include "qpid/dispatch/ctools.h"
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 
 #include <proton/tls.h>
 

diff --git a/src/dispatch.c b/src/dispatch.c
@@ -37,7 +37,7 @@
 #include "qpid/dispatch/discriminator.h"
 #include "qpid/dispatch/server.h"
 #include "qpid/dispatch/static_assert.h"
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 
 #include <dlfcn.h>
 #include <inttypes.h>

diff --git a/src/http-libwebsockets.c b/src/http-libwebsockets.c
@@ -33,7 +33,7 @@
 #include "qpid/dispatch/threading.h"
 #include "qpid/dispatch/timer.h"
 #include "qpid/dispatch/connection_counters.h"
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 
 #include <proton/connection_driver.h>
 #include <proton/object.h>

diff --git a/src/tls/display_name.c b/src/tls/display_name.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 #include "private.h"
 
 #include "qpid/dispatch/internal/export.h"

diff --git a/src/tls/tls.c b/src/tls/tls.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 #include "private.h"
 
 #include "qpid/dispatch/alloc_pool.h"

diff --git a/tests/cpp/cpp_system/test_connection_manager_static.cpp b/tests/cpp/cpp_system/test_connection_manager_static.cpp
@@ -24,7 +24,7 @@
 
 extern "C" {
 #include "entity.h"
-#include "qpid/dispatch/tls.h"
+#include "qpid/dispatch/tls_common.h"
 #include "qpid/dispatch/threading.h"
 }