squash w/ startup/shutdown. Pass RsComm by ref instead of ptr for cli…

…ent/server negotiation.

lib/core/include/irods/irods_client_server_negotiation.hpp

@@ -70,7 +70,7 @@ namespace irods
         irods::network_object_ptr,  // server connection handle
         std::string&,               // results of negotiation
         bool,                       // boolean indicating whether client-server negotiation is needed
-        RsComm* = nullptr);         // optional RsComm initialized during agent startup (maintains compatibility with rodsAgent.cpp)
+        RsComm&);                   // RsComm initialized during agent startup
 
     /// =-=-=-=-=-=-=-
     /// @brief function which manages the TLS and Auth negotiations with the client

server/core/src/irods_server_negotiation.cpp

@@ -73,12 +73,12 @@ namespace irods
         irods::network_object_ptr _ptr,
         std::string& _result,
         bool _require_cs_neg,
-        RsComm* _comm) // TODO Consider making this a required argument.
+        RsComm& _comm)
     {
         // =-=-=-=-=-=-=-
         // manufacture an rei for the applyRule
         ruleExecInfo_t rei{};
-        rei.rsComm = _comm;
+        rei.rsComm = &_comm;
 
         std::string rule_result;
         std::list<boost::any> params;

server/main_server/src/agent_main.cpp

@@ -866,7 +866,7 @@ namespace
         // this scope block makes valgrind happy
         {
             std::string neg_results;
-            ret = irods::client_server_negotiation_for_server(net_obj, neg_results, require_cs_neg, &rsComm);
+            ret = irods::client_server_negotiation_for_server(net_obj, neg_results, require_cs_neg, rsComm);
             if (!ret.ok() || irods::CS_NEG_FAILURE == neg_results) {
                 // send a 'we failed to negotiate' message here??
                 // or use the error stack rule engine thingie