Merged revisions 3475 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3475 | kpfleming | 2007-12-13 16:59:16 -0600 (Thu, 13 Dec 2007) | 2 lines

remove some code that is not compatible with modern versions of pppd

........


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3476 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 0 insertions, 55 deletions

diff --git a/ppp/zaptel.c b/ppp/zaptel.c
index f203765..d231794 100644
--- a/ppp/zaptel.c
+++ b/ppp/zaptel.c
@@ -44,56 +44,6 @@ const char pppd_version[] = VERSION;
 
 #define ZAP_MTU	(ZT_DEFAULT_MTU_MRU - 16)
 extern int kill_link;
-static char *bad_options[] = {
-    "noaccomp",
-    "-ac",
-    "default-asyncmap",
-    "-am",
-    "asyncmap",
-    "-as",
-    "escape",
-    "multilink",
-    "receive-all",
-    "crtscts",
-    "-crtscts",
-    "nocrtscts",
-    "cdtrcts",
-    "nocdtrcts",
-    "xonxoff",
-    "modem",
-    "local",
-    "sync",
-    "deflate",
-    "nodeflate",
-    "vj",
-    "novj",
-    "nobsdcomp",
-    "bsdcomp",
-    "-bsdcomp",
-    NULL
-};
-#if 0
-static char *bad_options[] = {
-    "noaccomp",
-    "-ac",
-    "default-asyncmap",
-    "-am",
-    "asyncmap",
-    "-as",
-    "escape",
-    "receive-all",
-    "crtscts",
-    "-crtscts",
-    "nocrtscts",
-    "cdtrcts",
-    "nocdtrcts",
-    "xonxoff",
-    "modem",
-    "local",
-    "sync",
-    NULL
-};
-#endif
 int     retries = 0;
 
 int setdevname_zaptel(const char *cp);
@@ -283,11 +233,6 @@ int setdevname_zaptel(const char *cp)
 
 	the_channel = &zaptel_channel;
 
-	{
-	    char **a;
-	    for (a = bad_options; *a != NULL; a++)
-		remove_option(*a);
-	}
 	modem = 0;
 
 	lcp_allowoptions[0].neg_accompression = 0;