summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>1999-05-26 16:37:07 +0200
committerPavel Machek <pavel@ucw.cz>1999-05-26 16:37:07 +0200
commit858a717796d7aa48fe9b22a6b035fec9edbb5a2a (patch)
tree1e9753c5047d3c947080a314fa5e3124def6f947
parent7eb01479c92cd2f615993f2112aa5986f3e2b0ad (diff)
downloadbird-858a717796d7aa48fe9b22a6b035fec9edbb5a2a.tar
bird-858a717796d7aa48fe9b22a6b035fec9edbb5a2a.zip
Change format of passwords (less ;'s) and fix password.h to allow
multiple inclusions.
-rw-r--r--nest/config.Y11
-rw-r--r--nest/password.h3
2 files changed, 9 insertions, 5 deletions
diff --git a/nest/config.Y b/nest/config.Y
index c13a6ae..b0634a6 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -146,15 +146,16 @@ password_begin:
password_items:
/* empty */ { }
- | FROM datetime ';' password_items { last_password_item->from = $2; }
- | TO datetime ';' password_items { last_password_item->to = $2; }
- | ID NUM ';' password_items { last_password_item->id = $2; }
+ | FROM datetime password_items { last_password_item->from = $2; }
+ | TO datetime password_items { last_password_item->to = $2; }
+ | ID NUM password_items { last_password_item->id = $2; }
;
password_list:
/* empty */ { $$ = NULL; }
- | '{' password_begin ';' password_items '}' password_list {
- last_password_item->next = $6;
+ | password_begin password_items ';' password_list {
+ last_password_item->next = $4;
+ $$ = last_password_item;
}
;
diff --git a/nest/password.h b/nest/password.h
index db2a8bf..b457495 100644
--- a/nest/password.h
+++ b/nest/password.h
@@ -6,6 +6,8 @@
* Can be freely distributed and used under the terms of the GNU GPL.
*/
+#ifndef PASSWORD_H
+#define PASSWORD_H
struct password_item {
struct password_item *next;
char *password;
@@ -14,3 +16,4 @@ struct password_item {
};
extern struct password_item *last_password_item;
+#endif