Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr

diff --combined gsm_conf.c
index 08d49dd,082a6ed..efde7bd
--- 1/gsm_conf.c
--- 2/gsm_conf.c
+++ b/gsm_conf.c
@@@ -47,10 -47,8 +47,8 @@@ int gsm_conf(struct gsm_conf *gsm_conf
        }
  
        line=0;
-       while((fgets(buffer,sizeof(buffer),fp))) {
+       while((GETLINE(buffer, fp))) {
                line++;
-               buffer[sizeof(buffer)-1]=0;
-               if (buffer[0]) buffer[strlen(buffer)-1]=0;
                p=buffer;
  
                while(*p <= 32) { /* skip spaces */
@@@ -160,6 -158,9 +158,6 @@@
                if (!strcmp(option,"no-mergency-shutdown")) {
                        gsm_conf->noemergshut = 1;
                } else
 -              if (!strcmp(option,"rtp-proxy")) {
 -                      gsm_conf->rtp_proxy = 1;
 -              } else
                if (!strcmp(option,"pcapfile")) {
                        if (params[0][0]==0) {
                                SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);