X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fdirplex%2Fconf.c;h=10d501fd351f60cb2f031ef968455b07a8c338c7;hp=08b78f31ef2225042810ae3e3370547c976c04c4;hb=7db7f6782db37193f6ba9c2c8bac38a5bfcbb114;hpb=0fb57c32e8108895981d6b380c1b126a39042608

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index 08b78f3..10d501f 100644
--- a/src/dirplex/conf.c
+++ b/src/dirplex/conf.c
@@ -46,9 +46,16 @@ static void freerule(struct rule *rule)
 static void freepattern(struct pattern *pat)
 {
     struct rule **rule;
+    struct headmod *head;
     
     for(rule = pat->rules; *rule; rule++)
 	freerule(*rule);
+    while((head = pat->headers) != NULL) {
+	pat->headers = head->next;
+	free(head->name);
+	free(head->value);
+	free(head);
+    }
     if(pat->childnm != NULL)
 	free(pat->childnm);
     freeca(pat->fchild);
@@ -131,6 +138,7 @@ static struct pattern *parsepattern(struct cfstate *s)
 {
     struct pattern *pat;
     struct rule *rule;
+    struct headmod *head;
     int sl;
 
     if(!strcmp(s->argv[0], "match")) {
@@ -177,6 +185,19 @@ static struct pattern *parsepattern(struct cfstate *s)
 	    pat->childnm = sstrdup(s->argv[1]);
 	} else if(!strcmp(s->argv[0], "fork")) {
 	    pat->fchild = cadup(s->argv + 1);
+	} else if(!strcmp(s->argv[0], "set") || !strcmp(s->argv[0], "xset")) {
+	    if(s->argc < 3) {
+		flog(LOG_WARNING, "%s:%i: missing header name or pattern for `%s' directive", s->file, s->lno, s->argv[0]);
+		continue;
+	    }
+	    omalloc(head);
+	    if(!strcmp(s->argv[0], "xset"))
+		head->name = sprintf2("X-Ash-%s", s->argv[1]);
+	    else
+		head->name = sstrdup(s->argv[1]);
+	    head->value = sstrdup(s->argv[2]);
+	    head->next = pat->headers;
+	    pat->headers = head;
 	} else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) {
 	    break;
 	} else {
@@ -308,6 +329,8 @@ struct config **getconfigs(char *file)
     if(ret != NULL)
 	free(ret);
     bufinit(buf);
+    if(!strncmp(file, "./", 2))
+	file += 2;
     tmp = sstrdup(file);
     while(1) {
 	if((p = strrchr(tmp, '/')) == NULL)