|
Check-in Number:
|
285 | |
| Date: |
2001-Jan-16 11:49:08 (local)
2001-Jan-16 10:49:08 (UTC) |
| User: | simons |
| Branch: | |
| Comment: |
Added new action keyword to the Access Control Language: approve. This
keyword will -- unlike to "pass" -- not only pass the mail, but will
also make sure that the mail passes all other authorization controls.
This means, the mail will be treated as if the Petidomo master
password had been given in the header. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/petidomo/acl.y 1.6 -> 1.7
--- acl.y 2001/01/10 17:07:19 1.6
+++ acl.y 2001/01/16 10:49:08 1.7
@@ -1,6 +1,6 @@
/*
$Source: /v/ossp/cvs/ossp-pkg/petidomo/acl.y,v $
- $Revision: 1.6 $
+ $Revision: 1.7 $
Copyright (C) 2000 by CyberSolutions GmbH, Germany.
@@ -45,7 +45,7 @@
%}
%token TOK_IF TOK_EQUAL TOK_EQUAL TOK_FROM TOK_SUBJECT
%token TOK_ENVELOPE TOK_HEADER TOK_BODY TOK_AND TOK_OR TOK_NOT
-%token TOK_THEN TOK_MATCH TOK_STRING TOK_DROP TOK_PASS
+%token TOK_THEN TOK_MATCH TOK_STRING TOK_DROP TOK_PASS TOK_APPROVE
%token TOK_REDIRECT TOK_FORWARD TOK_REJECT TOK_REJECTWITH
%token TOK_FILTER
%left TOK_AND
@@ -97,6 +97,7 @@
;
action: TOK_PASS { $$ = ACL_PASS; }
+ | TOK_APPROVE { $$ = ACL_APPROVE; }
| TOK_DROP { $$ = ACL_DROP; }
| TOK_REJECT { $$ = ACL_REJECT; }
| TOK_REJECTWITH TOK_STRING {
|
|
ossp-pkg/petidomo/acl_scan.l 1.2 -> 1.3
--- acl_scan.l 2000/12/13 15:35:14 1.2
+++ acl_scan.l 2001/01/16 10:49:08 1.3
@@ -1,6 +1,6 @@
/*
$Source: /v/ossp/cvs/ossp-pkg/petidomo/Attic/acl_scan.l,v $
- $Revision: 1.2 $
+ $Revision: 1.3 $
Copyright (C) 2000 by CyberSolutions GmbH, Germany.
@@ -47,6 +47,7 @@
}
drop return TOK_DROP;
pass return TOK_PASS;
+approve return TOK_APPROVE;
redirect return TOK_REDIRECT;
forward return TOK_FORWARD;
reject return TOK_REJECT;
|
|
ossp-pkg/petidomo/handleacl.c 1.5 -> 1.6
--- handleacl.c 2001/01/06 11:05:08 1.5
+++ handleacl.c 2001/01/16 10:49:08 1.6
@@ -1,6 +1,6 @@
/*
$Source: /v/ossp/cvs/ossp-pkg/petidomo/handleacl.c,v $
- $Revision: 1.5 $
+ $Revision: 1.6 $
Copyright (C) 2000 by CyberSolutions GmbH, Germany.
@@ -54,6 +54,9 @@
break;
case ACL_PASS:
break;
+ case ACL_APPROVE:
+ MailStruct->Approve = MasterConfig->master_password;
+ break;
case ACL_DROP:
return 1;
case ACL_REJECTWITH:
|
|
ossp-pkg/petidomo/petidomo.h 1.13 -> 1.14
--- petidomo.h 2001/01/15 18:48:49 1.13
+++ petidomo.h 2001/01/16 10:49:08 1.14
@@ -1,6 +1,6 @@
/*
$Source: /v/ossp/cvs/ossp-pkg/petidomo/petidomo.h,v $
- $Revision: 1.13 $
+ $Revision: 1.14 $
Copyright (C) 2000 by CyberSolutions GmbH, Germany.
@@ -160,6 +160,7 @@
{
ACL_DROP,
ACL_PASS,
+ ACL_APPROVE,
ACL_REDIRECT,
ACL_FORWARD,
ACL_REJECT,
|
|
