Skip to content
Browse files

fix #2391 , also remove module_cccshare from config.sh

  • Loading branch information...
1 parent eacb1d5 commit 7c4b705a80a3f2ec5de53f1350f76fe421a1fcf7 lareq78 committed Feb 10, 2012
Showing with 6 additions and 4 deletions.
  1. +1 −2 config.sh
  2. +2 −0 oscam-config.h
  3. +3 −2 oscam-http.c
View
3 config.sh
@@ -16,7 +16,7 @@ fi
cp -f $configfile $tempfileconfig
addons="WEBIF HAVE_DVBAPI WITH_STAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_SSL WITH_LB CS_CACHEEX LCDSUPPORT IPV6SUPPORT"
-protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA"
+protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA"
readers="WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG"
check_test() {
@@ -90,7 +90,6 @@ menu_protocols() {
MODULE_CAMD35_TCP "camd 3.5 TCP" $(check_test "MODULE_CAMD35_TCP") \
MODULE_NEWCAMD "newcamd" $(check_test "MODULE_NEWCAMD") \
MODULE_CCCAM "CCcam" $(check_test "MODULE_CCCAM") \
- MODULE_CCCSHARE "CCcam share" $(check_test "MODULE_CCCSHARE") \
MODULE_GBOX "gbox" $(check_test "MODULE_GBOX") \
MODULE_RADEGAST "radegast" $(check_test "MODULE_RADEGAST") \
MODULE_SERIAL "Serial" $(check_test "MODULE_SERIAL") \
View
2 oscam-config.h
@@ -79,9 +79,11 @@
#define MODULE_CCCAM
#endif
+#ifdef MODULE_CCCAM
#ifndef MODULE_CCCSHARE
#define MODULE_CCCSHARE
#endif
+#endif
#ifndef MODULE_GBOX
View
5 oscam-http.c
@@ -2648,7 +2648,7 @@ static char *send_oscam_entitlement(struct templatevars *vars, struct uriparams
print_cards(vars, params, cardarray, cardsize, 1, NULL, offset, apicall);
free(cardarray);
-#endif
+
} else {
struct s_client *rc = rdr->client;
struct cc_data *rcc = (rc)?rc->cc:NULL;
@@ -2658,7 +2658,8 @@ static char *send_oscam_entitlement(struct templatevars *vars, struct uriparams
print_cards(vars, params, cardarray, cardsize, 0, rdr, offset, apicall);
free(cardarray);
}
- }
+#endif
+ }
} else {

0 comments on commit 7c4b705

Please sign in to comment.
Something went wrong with that request. Please try again.