From f98e8695f4488d47581dd92a620a25e779c8f979 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 1 Mar 2016 08:38:17 +0000
Subject: [PATCH] EgtExecutor 1.6n9 : - aggiunta funzione ExeGetKeyOptions -
 ricompilato per nuovo controllo chiave.

---
 EXE_General.cpp |  24 ++++++++++++++++++++++++
 EgtExecutor.rc  | Bin 11694 -> 11694 bytes
 2 files changed, 24 insertions(+)

diff --git a/EXE_General.cpp b/EXE_General.cpp
index d9fdc28..eab352e 100644
--- a/EXE_General.cpp
+++ b/EXE_General.cpp
@@ -29,6 +29,7 @@
 #include "/EgtDev/Include/EgtLogger.h"
 #include "/EgtDev/Include/EgtStringConverter.h"
 #include "/EgtDev/Include/SELkLockId.h"
+#include "/EgtDev/Include/SELkKeyProc.h"
 #include <fstream>
 
 using namespace std ;
@@ -296,6 +297,29 @@ ExeGetKeyInfo( string& sKey)
    return true ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetKeyOptions( int nProd, int nVer, int nLev, unsigned int& nOpt2)
+{
+  // verifico la chiave e le opzioni
+   unsigned int nOpt1 ;
+   int nOptExpDays ;
+   int nRet = GetKeyOptions( s_sKey, nProd, nVer, nLev, nOpt1, nOpt2, nOptExpDays) ;
+   if ( nRet != KEY_OK) {
+      string sErr = "Error on Key (EGKO/" + ToString( nRet) + ")" ;
+      LOG_ERROR( s_pGenLog, sErr.c_str()) ;
+      return false ;
+   }
+   if ( nOptExpDays < GetCurrDay()) {
+      nOpt2 = 0 ;
+      string sErr = "Error on Key (EGKO/OPT)" ;
+      LOG_ERROR( s_pGenLog, sErr.c_str()) ;
+      return true ;
+   }
+
+   return true ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeGetOsInfo( string& sOs)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index c29d38ffbecd97a1f0183aa469714b14d0c77eea..3d55bd24e3604dcd1ac915ec4a3a758776f57dde 100644
GIT binary patch
delta 97
zcmZ1%y)JsgA2vqI%@@V4Gflq2na5~3Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0HK*5bN~PV

delta 97
zcmZ1%y)JsgA2vpd%@@V4Gflq2na5}`Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0H6~eYybcN