From b5422a1ac72edabb6e114387ca44e5cb45b725ad Mon Sep 17 00:00:00 2001
From: Ken Zangelin <kzangeli@gmail.com>
Date: Sun, 12 Nov 2023 10:55:31 +0100
Subject: [PATCH] Hopefully fixed #1451

---
 CHANGES_NEXT_RELEASE                  |  1 +
 src/lib/orionld/mongoc/mongocInit.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index c185611924..48a389dcf0 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -13,3 +13,4 @@ Fixed issues:
   * #280  - New CLI (hidden) for extra field in notifications (trigger: "VERB URL PATH"): -triggerOperation
   * #1456 - Bug fix - entity id+type duplicated in forwarded request of "Create Entity"
   * #1458 - Supporting system timestamps (createdAt/modifiedAt) in q
+  * #1451 - Bug fix - removed a trailing ampersand from the URI for the connection to mongodb
diff --git a/src/lib/orionld/mongoc/mongocInit.cpp b/src/lib/orionld/mongoc/mongocInit.cpp
index 46c1e7e4cd..c5b10b7aae 100644
--- a/src/lib/orionld/mongoc/mongocInit.cpp
+++ b/src/lib/orionld/mongoc/mongocInit.cpp
@@ -143,7 +143,6 @@ static char* uriCompose
   char* compV[50];
   int   compNo = 0;
 
-  LM_T(LmtMongoc, ("dbURI:           '%s'", dbURI));
   LM_T(LmtMongoc, ("dbHost:          '%s'", dbHost));
   LM_T(LmtMongoc, ("dbUser:          '%s'", dbUser));
   if (dbPwd != NULL)
@@ -162,21 +161,22 @@ static char* uriCompose
     // Is "${PWD}" present?
     // If so, split dbURI into two parts - before and after "${PWD}" and add dbPwd in between
     //
+    compV[0] = dbURI;
+    compNo   = 1;
+
     char* pwdP = strstr(dbURI, "${PWD}");
     if (pwdP != NULL)
     {
       if (dbPwd[0] == 0)
         LM_X(1, ("Invalid Command Line Options: -dbURI is used with a password substitution, but no password (-dbPwd) is supplied"));
 
-      compV[compNo++] = dbURI;
-      *pwdP = 0;
-      compV[compNo++] = dbPwd;
-      compV[compNo++] = &pwdP[6];
-    }
-    else
-      compV[compNo++] = dbURI;
+      *pwdP    = 0;
+      compV[1] = dbPwd;
+      compV[2] = &pwdP[6];
+      compNo   = 3;
 
-    compV[compNo++] = (char*) "&";
+      LM_T(LmtMongoc, ("dbURI:           '%s****%s'", compV[0], compV[2]));
+    }
   }
   else
   {