@@ -1337,7 +1337,7 @@ IMPORTFILE      "import_file"

 <DEFINE_DATA>\\{CR}		{	count(); ksr_cfg_print_part(yytext); } /* eat the escaped CR */

 <DEFINE_DATA>{CR}		{	count();

 							ksr_cfg_print_part(yytext);

-							if (pp_define_set(strlen(s_buf.s), s_buf.s)) return 1;

+							if (pp_define_set(strlen(s_buf.s), s_buf.s, KSR_PPDEF_NORMAL)) return 1;

 							memset(&s_buf, 0, sizeof(s_buf));

 							state = INITIAL;

 							ksr_cfg_print_initial_state();

@@ -2007,7 +2007,7 @@ int pp_define(int len, const char *text)

 	return 0;

 }

-int pp_define_set(int len, char *text)

+int pp_define_set(int len, char *text, int mode)

 {

 	int ppos;

@@ -2090,7 +2090,7 @@ int pp_define_env(const char *text, int len)

 		LM_ERR("cannot set define name [%s]\n", (char*)text);

 		return -1;

 	}

-	if(pp_define_set(defvalue.len, defvalue.s)<0) {

+	if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) {

 		LM_ERR("cannot set define value [%s]\n", (char*)text);

 		return -1;

 	}

@@ -143,20 +143,14 @@ found_repl:

 		LM_ERR("cannot set define name\n");

 		goto error;

 	}

-	if(mode==1) {

-		/* define the value enclosed in double quotes */

-		*(defvalue.s-1) = '"';

-		defvalue.s[defvalue.len] = '"';

-		defvalue.s--;

-		defvalue.len += 2;

-	}

 	if(memchr(defvalue.s, '$', defvalue.len) != NULL) {

 		fmsg = faked_msg_get_next();

 		if(pv_eval_str(fmsg, &newval, &defvalue)>=0) {

 			defvalue = newval;

 		}

 	}

-	if(pp_define_set(defvalue.len, defvalue.s)<0) {

+	if(pp_define_set(defvalue.len, defvalue.s,

+				(mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) {

 		LM_ERR("cannot set define value\n");

 		goto error;

 	}

@@ -25,6 +25,9 @@

 #include "str.h"

+#define KSR_PPDEF_NORMAL (0)     /* define normal value */

+#define KSR_PPDEF_QUOTED (1<<0)  /* define quoted value */

+

 typedef struct ksr_ppdefine {

 	str name;

 	str value;

@@ -39,7 +42,7 @@ int pp_substdef_add(char *data, int mode);

 int pp_subst_run(char **data);

 int  pp_define(int len, const char *text);

-int  pp_define_set(int len, char *text);

+int  pp_define_set(int len, char *text, int mode);

 int  pp_define_set_type(int type);

 str *pp_define_get(int len, const char * text);

 int  pp_define_env(const char * text, int len);

@@ -2264,7 +2264,7 @@ int main(int argc, char** argv)

 					}

 					if(p) {

 						p++;

-						if(pp_define_set(strlen(p), p)<0) {

+						if(pp_define_set(strlen(p), p, KSR_PPDEF_NORMAL)<0) {

 							fprintf(stderr, "error at define value: -A %s\n",

 								optarg);

 							goto error;