Index: cvsmgrd.cpp =================================================================== RCS file: /scotty/cvsmanager/cvsmgrd.cpp,v retrieving revision 1.16 diff -c -r1.16 cvsmgrd.cpp *** cvsmgrd.cpp 5 Jun 2012 08:05:49 -0000 1.16 --- cvsmgrd.cpp 24 Jun 2012 21:56:24 -0000 *************** *** 35,42 **** --- 35,46 ---- 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 + if(!CheckLicense(license,errmsg)) + #endif { if (errmsg) fprintf(stderr,"%s\n",errmsg); fprintf(stderr,"Startup failed - %s license [%s]\n",license.type==licExpired?"Expired":"Bad",CVSNT_PRODUCTVERSION_SHORT); *************** *** 84,89 **** --- 88,94 ---- { fprintf(stdout,"Evaluation\n"); } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licUnlimited) { fprintf(stdout,"Unlimited\n"); *************** *** 96,101 **** --- 101,112 ---- { fprintf(stdout,"ISV\n"); } + #else + else if(license.type==licFull) + { + fprintf(stdout,"Unlimited\n"); + } + #endif else { /* This *should* be caught in CheckLicense, but just in case it slips through.. */ *************** *** 109,122 **** --- 120,136 ---- fprintf(stdout,"License days until renewal: %d\n",license.daysLeft); if(license.maxUsers) fprintf(stdout,"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()) fprintf(stdout,"Licensed ISV client: %s\n",license.rspline.c_str()); if(license.email.size()) fprintf(stdout,"Licensed email: %s\n",license.email.c_str()); + #endif if(license.user.size()) fprintf(stdout,"Licensed owner: %s\n",license.user.c_str()); if(license.company.size()) fprintf(stdout,"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) fprintf(stdout,"Licensed customer id: %d\n",license.customerId); if(license.vendorId!=0) *************** *** 125,130 **** --- 139,145 ---- fprintf(stdout,"Licensed integration: defect tracking: %s\n",(license.bugLicense)?"yes":"no"); fprintf(stdout,"Licensed integration: build: %s\n",(license.makeLicense)?"yes":"no"); fprintf(stdout,"Licensed integration: multi-site sync: %s\n",(license.syncLicense)?"yes":"no"); + #endif if(errmsg!=NULL) if (*errmsg!='\0') { fprintf(stdout,"Licensed version: %s\n",CVSNT_PRODUCTVERSION_SHORT); Index: CvsProxyUnix.cpp =================================================================== RCS file: /scotty/cvsproxy/CvsProxyUnix.cpp,v retrieving revision 1.7 diff -c -r1.7 CvsProxyUnix.cpp *** CvsProxyUnix.cpp 19 Jun 2012 23:44:00 -0000 1.7 --- CvsProxyUnix.cpp 24 Jun 2012 22:02:04 -0000 *************** *** 110,116 **** --- 110,120 ---- 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!=licMulti)&&(lic.type!=licISV)) + #else + if((lic.type!=licTrial)&&(lic.type!=licFull)) + #endif { /* This *should* be caught in CheckLicense, but just in case it slips through.. */ printf("Invalid license type\n");