Make LCR run with OpenBSC main branch.

[lcr.git] / gsm_conf.c

diff --git a/gsm_conf.c b/gsm_conf.c
index 08d49dd..560d9b3 100644 (file)
--- a/gsm_conf.c
+++ b/gsm_conf.c
@@ -47,10 +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 */
@@ -143,12 +141,8 @@ int gsm_conf(struct gsm_conf *gsm_conf)
 
                } else
                if (!strcmp(option,"reject-cause")) {
-                       if (params[0][0]==0) {
-                               SPRINT(gsm_conf_error, "Error in %s (line %d): parameter for option %s missing.\n",filename,line, option);
-                               goto error;
-                       }
-                       gsm_conf->reject_cause = atoi(params[0]);
-
+                       SPRINT(gsm_conf_error, "Option '%s' in gsm.conf has moved to openbsc.cfg", option);
+                       goto error;
                } else
                if (!strcmp(option,"allow-all")) {
                        gsm_conf->allow_all = 1;