tls: renamed a function

- GetNeedFromConfiguration --> GetLocalTlsPolicyFromConfiguration
bareos · Jun 1, 2018 · 0c5a5fa · 0c5a5fa
1 parent ba14b86
commit 0c5a5fa
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc
@@ -554,7 +554,7 @@ bool DoNativeBackup(JobControlRecord *jcr)
        * TLS Requirement
        */
 
-      tls_need = GetNeedFromConfiguration(client);
+      tls_need = GetLocalTlsPolicyFromConfiguration(client);
 
       connection_target_address = StorageAddressToContact(client, store);
 
@@ -568,7 +568,7 @@ bool DoNativeBackup(JobControlRecord *jcr)
        * TLS Requirement
        */
 
-      tls_need = GetNeedFromConfiguration(me);
+      tls_need = GetLocalTlsPolicyFromConfiguration(me);
 
       connection_target_address = ClientAddressToContact(client, store);
 

diff --git a/core/src/dird/migrate.cc b/core/src/dird/migrate.cc
@@ -1542,7 +1542,7 @@ static inline bool DoActualMigration(JobControlRecord *jcr)
       /*
        * TLS Requirement
        */
-      tls_need = GetNeedFromConfiguration(wstore);
+      tls_need = GetLocalTlsPolicyFromConfiguration(wstore);
 
       char *connection_target_address = StorageAddressToContact(rstore, wstore);
 

diff --git a/core/src/dird/restore.cc b/core/src/dird/restore.cc
@@ -260,7 +260,7 @@ static inline bool DoNativeRestoreBootstrap(JobControlRecord *jcr)
          /*
           * TLS Requirement
           */
-            tls_need = GetNeedFromConfiguration(store);
+            tls_need = GetLocalTlsPolicyFromConfiguration(store);
 
          connection_target_address = StorageAddressToContact(client, store);
 
@@ -289,7 +289,7 @@ static inline bool DoNativeRestoreBootstrap(JobControlRecord *jcr)
          /*
           * TLS Requirement
           */
-            tls_need = GetNeedFromConfiguration(client);
+            tls_need = GetLocalTlsPolicyFromConfiguration(client);
 
          connection_target_address = ClientAddressToContact(client, store);
          /*

diff --git a/core/src/dird/verify.cc b/core/src/dird/verify.cc
@@ -347,7 +347,7 @@ bool DoVerify(JobControlRecord *jcr)
           * TLS Requirement
           */
 
-         tls_need = GetNeedFromConfiguration(store);
+         tls_need = GetLocalTlsPolicyFromConfiguration(store);
 
          fd->fsend(storaddrcmd, store->address, store->SDDport, tls_need, jcr->sd_auth_key);
          if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {
@@ -360,7 +360,7 @@ bool DoVerify(JobControlRecord *jcr)
          /*
           * TLS Requirement
           */
-            tls_need = GetNeedFromConfiguration(client);
+            tls_need = GetLocalTlsPolicyFromConfiguration(client);
 
          /*
           * Tell the SD to connect to the FD.

diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -33,12 +33,12 @@
 #include "lib/util.h"
 #include "lib/tls_openssl.h"
 
-DLL_IMP_EXP uint32_t GetNeedFromConfiguration(TlsResource *tls_configuration) {
+DLL_IMP_EXP uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_configuration) {
    uint32_t merged_policy = 0;
 
 #if defined(HAVE_TLS)
    merged_policy = tls_configuration->tls_cert.GetPolicy() | tls_configuration->tls_psk.GetPolicy();
-   Dmsg1(100, "GetNeedFromConfiguration: %u\n", merged_policy);
+   Dmsg1(100, "GetLocalTlsPolicyFromConfiguration: %u\n", merged_policy);
 #else
    Dmsg1(100, "Ignore configuration no tls compiled in: %u\n", merged_policy);
 #endif
@@ -363,7 +363,7 @@ bool BareosSocket::two_way_authenticate(JobControlRecord *jcr,
    const int debuglevel    = 50;
    bool compatible     = true;
    bool auth_success   = false;
-   uint32_t local_tls_policy = GetNeedFromConfiguration(tls_configuration);
+   uint32_t local_tls_policy = GetLocalTlsPolicyFromConfiguration(tls_configuration);
    uint32_t remote_tls_policy = 0;
    alist *verify_list = NULL;
    TlsBase * selected_local_tls = nullptr;

diff --git a/core/src/lib/bsock.h b/core/src/lib/bsock.h
@@ -45,7 +45,7 @@ class BareosSocket;
 btimer_t *StartBsockTimer(BareosSocket *bs, uint32_t wait);
 void StopBsockTimer(btimer_t *wid);
 
-uint32_t GetNeedFromConfiguration(TlsResource *tls_configuration);
+uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_configuration);
 
 
 TlsBase *SelectTlsFromPolicy(TlsResource *tls_configuration, uint32_t remote_policy);