Index: CVSNTSCCI.cpp =================================================================== RCS file: /scotty/vs.net/CVSNTSCCI.cpp,v retrieving revision 1.43.4.83.2.25 diff -c -r1.43.4.83.2.25 CVSNTSCCI.cpp *** CVSNTSCCI.cpp 22 Jun 2012 08:28:05 -0000 1.43.4.83.2.25 --- CVSNTSCCI.cpp 25 Jun 2012 01:52:26 -0000 *************** *** 480,486 **** } if(license.type==licTrial) bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense1!=0)||(license.type==licMulti)) bTrial = false; else if(license.type==licISV && license.otherLicense1==0) { --- 480,486 ---- } if(license.type==licTrial) bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense1!=0)||(license.type==licMulti)) bTrial = false; else if(license.type==licISV && license.otherLicense1==0) { Index: ReleaseManager.cpp =================================================================== RCS file: /scotty/releasemanager/ReleaseManager.cpp,v retrieving revision 1.13.2.4 diff -c -r1.13.2.4 ReleaseManager.cpp *** ReleaseManager.cpp 22 Jun 2012 08:27:38 -0000 1.13.2.4 --- ReleaseManager.cpp 25 Jun 2012 01:52:26 -0000 *************** *** 111,117 **** } if(license.type==licTrial) bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense2!=0)||(license.type==licMulti)) bTrial = false; else if(license.type==licISV && license.otherLicense2==0) { --- 111,117 ---- } if(license.type==licTrial) bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense2!=0)||(license.type==licMulti)) bTrial = false; else if(license.type==licISV && license.otherLicense2==0) { Index: WorkspaceManager.cpp =================================================================== RCS file: /scotty/WorkspaceManager/WorkspaceManager.cpp,v retrieving revision 1.40.2.10 diff -c -r1.40.2.10 WorkspaceManager.cpp *** WorkspaceManager.cpp 22 Jun 2012 08:27:54 -0000 1.40.2.10 --- WorkspaceManager.cpp 25 Jun 2012 01:52:26 -0000 *************** *** 1142,1148 **** } if(license.type==licTrial) g_bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense3!=0)||(license.type==licMulti)) g_bTrial = false; else if(license.type==licISV && license.otherLicense3==0) { --- 1142,1148 ---- } if(license.type==licTrial) g_bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licISV && license.otherLicense3!=0)||(license.type==licMulti)) g_bTrial = false; else if(license.type==licISV && license.otherLicense3==0) { Index: wizard.cpp =================================================================== RCS file: /scotty/wizard/wizard.cpp,v retrieving revision 1.1.2.11.2.8 diff -c -r1.1.2.11.2.8 wizard.cpp *** wizard.cpp 22 Jun 2012 08:28:16 -0000 1.1.2.11.2.8 --- wizard.cpp 25 Jun 2012 01:52:25 -0000 *************** *** 223,229 **** bTrial = false; bNeedsActivate = false; if(license.type==licTrial) bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licMulti) bNeedsActivate = true; else if((license.type==licUnlimited)||(license.type==licISV)) { bTrial = false; bNeedsActivate = false; } #else --- 223,229 ---- bTrial = false; bNeedsActivate = false; if(license.type==licTrial) bTrial = true; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licMulti) bNeedsActivate = true; else if((license.type==licUnlimited)||(license.type==licISV)) { bTrial = false; bNeedsActivate = false; } #else ? Release Index: CvsProxyWin32.cpp =================================================================== RCS file: /scotty/cvsproxy/CvsProxyWin32.cpp,v retrieving revision 1.11 diff -c -r1.11 CvsProxyWin32.cpp *** CvsProxyWin32.cpp 22 Jun 2012 06:27:53 -0000 1.11 --- CvsProxyWin32.cpp 25 Jun 2012 01:52:25 -0000 *************** *** 3,8 **** --- 3,9 ---- #include #include + #include #include #include *************** *** 248,254 **** printf("Invalid license key\n"); return -1; } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((lic.type!=licTrial)&&(lic.type!=licUnlimited)&&(lic.type!=licISV)&&(lic.type!=licMulti)) #else if((lic.type!=licTrial)&&(lic.type!=licFull)) --- 249,255 ---- printf("Invalid license key\n"); return -1; } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((lic.type!=licTrial)&&(lic.type!=licUnlimited)&&(lic.type!=licISV)&&(lic.type!=licMulti)) #else if((lic.type!=licTrial)&&(lic.type!=licFull)) Index: CvsManager.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsManager.cpp,v retrieving revision 1.72 diff -c -r1.72 CvsManager.cpp *** CvsManager.cpp 22 Jun 2012 06:27:40 -0000 1.72 --- CvsManager.cpp 25 Jun 2012 01:52:25 -0000 *************** *** 46,52 **** #include #endif ! #if !((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) #define hwinfo_t void #endif --- 46,52 ---- #include #endif ! #if !((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) #define hwinfo_t void #endif *************** *** 972,978 **** { CSocketIO& cvs = *pcvs; CSocketIO& proxy = *pproxy; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; --- 972,978 ---- { CSocketIO& cvs = *pcvs; CSocketIO& proxy = *pproxy; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; *************** *** 981,987 **** LPVOID errbuf; #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo)) #else if(!CheckLicense(license)) --- 981,987 ---- LPVOID errbuf; #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo)) #else if(!CheckLicense(license)) *************** *** 1032,1038 **** #endif } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licMulti)&&(license.activateId==0)) { if (license.daysLeft<0) --- 1032,1038 ---- #endif } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licMulti)&&(license.activateId==0)) { if (license.daysLeft<0) *************** *** 1070,1076 **** #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); //CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseCPU",license.cpuline.c_str()); --- 1070,1076 ---- #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); //CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseCPU",license.cpuline.c_str()); *************** *** 1100,1106 **** { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; --- 1100,1106 ---- { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; *************** *** 1173,1179 **** rf.addArg(tmp.c_str()); } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if (1) // this must ALWAYS come before RSP_LINE { rf.addArg("+"); --- 1173,1179 ---- rf.addArg(tmp.c_str()); } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if (1) // this must ALWAYS come before RSP_LINE { rf.addArg("+"); *************** *** 1421,1427 **** static void _license_thread_proc(int daysleft, hwinfo_t *phwinfo) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; --- 1421,1427 ---- static void _license_thread_proc(int daysleft, hwinfo_t *phwinfo) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; *************** *** 1439,1451 **** // GlobalFindAtom is win32 specific if(timeSinceLastCheck>=licenseCheckTime*60) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(CheckLicense(license,hwinfo)) #else if(CheckLicense(license)) #endif { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) --- 1439,1451 ---- // GlobalFindAtom is win32 specific if(timeSinceLastCheck>=licenseCheckTime*60) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(CheckLicense(license,hwinfo)) #else if(CheckLicense(license)) #endif { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) *************** *** 1520,1526 **** int run_server() { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) #ifdef _WIN32 BSTR hwcpuname; unsigned int hwiddsig; --- 1520,1526 ---- int run_server() { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) #ifdef _WIN32 BSTR hwcpuname; unsigned int hwiddsig; *************** *** 1551,1557 **** srand((unsigned int)global_session_time_t); ! #if (defined (_WIN32) && (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if (get_hw_info(hwcpuname, hwiddsig, swosver, hwspeed) == 0) { hwinfo.osVerId=swosver; --- 1551,1557 ---- srand((unsigned int)global_session_time_t); ! #if (defined (_WIN32) && (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if (get_hw_info(hwcpuname, hwiddsig, swosver, hwspeed) == 0) { hwinfo.osVerId=swosver; *************** *** 1563,1569 **** char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo,errmsg)) #else if(!CheckLicense(license,errmsg)) --- 1563,1569 ---- char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo,errmsg)) #else if(!CheckLicense(license,errmsg)) *************** *** 1587,1593 **** } free(errmsg); errmsg=NULL; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) --- 1587,1593 ---- } free(errmsg); errmsg=NULL; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) *************** *** 1618,1624 **** return -1; } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else else if(license.type==licFull) --- 1618,1624 ---- return -1; } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else else if(license.type==licFull) *************** *** 1631,1637 **** #endif CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); #endif --- 1631,1637 ---- #endif CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); #endif *************** *** 1639,1645 **** { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; --- 1639,1645 ---- { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; *************** *** 1743,1749 **** if (cvs_port_num_mgr==0) cvs_port_num_mgr=2401; cvs_port_num=cvs_port_num_mgr; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else if(license.type==licFull) --- 1743,1749 ---- if (cvs_port_num_mgr==0) cvs_port_num_mgr=2401; cvs_port_num=cvs_port_num_mgr; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else if(license.type==licFull) *************** *** 1935,1941 **** #endif #ifdef _WIN32 ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) --- 1935,1941 ---- #endif #ifdef _WIN32 ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) *************** *** 1943,1949 **** { if(g_bTestMode) printf("Start license check thread\n"); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) start_license_thread(license.daysLeft,&hwinfo); #else start_license_thread(license.daysLeft,NULL); --- 1943,1949 ---- { if(g_bTestMode) printf("Start license check thread\n"); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) start_license_thread(license.daysLeft,&hwinfo); #else start_license_thread(license.daysLeft,NULL); *************** *** 1961,1967 **** g_running_servers = 0; for(int n=0; n4135)) start_cvs_thread(&cvs_sock,&proxy_sock,&hwinfo); #else start_cvs_thread(&cvs_sock,&proxy_sock,NULL); --- 1961,1967 ---- g_running_servers = 0; for(int n=0; n=2) && (CVSNT_PRODUCT_BUILD>4135)) start_cvs_thread(&cvs_sock,&proxy_sock,&hwinfo); #else start_cvs_thread(&cvs_sock,&proxy_sock,NULL); *************** *** 2011,2017 **** { // If any servers have quit, replace them. This doesn't need to be too exact, provided we just don't run out of them for(int n=g_running_servers; n4135)) start_cvs_thread(&cvs_sock, &proxy_sock, &hwinfo); #else start_cvs_thread(&cvs_sock, &proxy_sock, NULL); --- 2011,2017 ---- { // If any servers have quit, replace them. This doesn't need to be too exact, provided we just don't run out of them for(int n=g_running_servers; n=2) && (CVSNT_PRODUCT_BUILD>4135)) start_cvs_thread(&cvs_sock, &proxy_sock, &hwinfo); #else start_cvs_thread(&cvs_sock, &proxy_sock, NULL); Index: CvsMgrService.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsMgrService.cpp,v retrieving revision 1.30 diff -c -r1.30 CvsMgrService.cpp *** CvsMgrService.cpp 22 Jun 2012 06:27:40 -0000 1.30 --- CvsMgrService.cpp 25 Jun 2012 01:52:25 -0000 *************** *** 183,189 **** lic.maxUsers2 = TRIAL_MAXUSERS2; lic.osType = licAny; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licISV; lic.rspline = "SuiteClient2010"; GenerateLicense(lic, licString); --- 183,189 ---- lic.maxUsers2 = TRIAL_MAXUSERS2; lic.osType = licAny; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licISV; lic.rspline = "SuiteClient2010"; GenerateLicense(lic, licString); *************** *** 205,211 **** lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Windows %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = 1; GenerateLicense(lic, licString); --- 205,211 ---- lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Windows %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = 1; GenerateLicense(lic, licString); *************** *** 227,233 **** printf("Unlimited Windows %s\n",licString.c_str()); #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.osType=licMacOSX; lic.type = licTrial; --- 227,233 ---- printf("Unlimited Windows %s\n",licString.c_str()); #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.osType=licMacOSX; lic.type = licTrial; *************** *** 260,266 **** lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); --- 260,266 ---- lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); *************** *** 328,334 **** char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t hwinfo; if(!CheckLicense(license,hwinfo,errmsg)) #else --- 328,334 ---- char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t hwinfo; if(!CheckLicense(license,hwinfo,errmsg)) #else *************** *** 385,391 **** { printf("Evaluation\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licUnlimited) #else else if(license.type==licFull) --- 385,391 ---- { printf("Evaluation\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licUnlimited) #else else if(license.type==licFull) *************** *** 393,399 **** { printf("Unlimited\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licISV) { printf("ISV\n"); --- 393,399 ---- { printf("Unlimited\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licISV) { printf("ISV\n"); *************** *** 416,422 **** printf("License days until renewal: %d\n",license.daysLeft); if(license.maxUsers) printf("Licensed users: %d\n",license.maxUsers); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(license.rspline.size()) printf("Licensed ISV client: %s\n",license.rspline.c_str()); if(license.email.size()) --- 416,422 ---- printf("License days until renewal: %d\n",license.daysLeft); if(license.maxUsers) printf("Licensed users: %d\n",license.maxUsers); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(license.rspline.size()) printf("Licensed ISV client: %s\n",license.rspline.c_str()); if(license.email.size()) *************** *** 426,432 **** printf("Licensed owner: %s\n",license.user.c_str()); if(license.company.size()) printf("Licensed company: %s\n",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(license.customerId!=0) printf("Licensed customer id: %d\n",license.customerId); if(license.vendorId!=0) --- 426,432 ---- printf("Licensed owner: %s\n",license.user.c_str()); if(license.company.size()) printf("Licensed company: %s\n",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(license.customerId!=0) printf("Licensed customer id: %d\n",license.customerId); if(license.vendorId!=0)