Fixed bug in snfCFGmgr where OEM provided license ID was not always captured in the configuration data causing SYNC authentication problems.

Updated version to 3.0.12.

git-svn-id: https://svn.microneil.com/svn/SNFMulti/trunk@29 dc71a809-1921-45c4-985c-09c81d0142d9

SNFMulti.cpp

@@ -23,7 +23,7 @@ using namespace std;
 
 //// Version Info
 
-const char* SNF_ENGINE_VERSION = "SNFMulti Engine Version 3.0.11 Build: " __DATE__ " " __TIME__;
+const char* SNF_ENGINE_VERSION = "SNFMulti Engine Version 3.0.12 Build: " __DATE__ " " __TIME__;
 
 //// Script Caller Methods
 

snfCFGmgr.cpp

@@ -557,6 +557,11 @@ void snfCFGmgr::initialize(
     InitAuthentication = (NULL==Authentication)?"":Authentication;
 }
 
+//*****************************************************************************
+//// IMPORTANT: If the authentication string is provided in the initialize() it
+//// MUST NOT be put into D.node_authentication.
+//*****************************************************************************
+
 //// When the license ID and security string come from an OEM application they
 //// may not appear in the configuration files. If that is the case we will assume
 //// that they developer wants to keep the security string secret by encrypting it
@@ -570,7 +575,7 @@ void snfCFGmgr::initialize(
 
 string SecurityKeyDisplayString(snfCFGData& D) {                                // Returns appropriate SecurityKey: data
     string ConfigLogSecurityKey = "************************";                   // Start with a masked display.
-    if(0 < D.node_licenseid.length()) {                                         // If auth info is in the config files then
+    if(0 < D.node_authentication.length()) {                                    // If auth info is in the config files then
         ConfigLogSecurityKey = D.node_licenseid + D.node_authentication;        // build up the key from that data so it
     }                                                                           // can be displayed in the config log.
     return ConfigLogSecurityKey;
@@ -994,8 +999,9 @@ void snfCFGmgr::load() {
 
     //// The SecurityKey is built from the licenseID and the Authentication
 
-    if(InitLicenseIdIsProvided) {                                               // If the LicenseID has been provided then
-        CFGData.SecurityKey = InitLicenseId;                                    // the first part of our security key is that.
+    if(InitLicenseIdIsProvided) {                                               // If the LicenseID is OEM provided then
+        CFGData.SecurityKey = InitLicenseId;                                    // the first part of our security key is that.
+        CFGData.node_licenseid = InitLicenseId;                                 // Also override any file-loaded license ID.
     } else {                                                                    // If it was not provided then we will get
         CFGData.SecurityKey = CFGData.node_licenseid;                           // the LicenseID from our config file.
     }