From fb7a39bc56092ecd2a52d8b6fc403eda6b905ba1 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sun, 13 Feb 2005 18:32:56 +0000
Subject: add pass proto

---
 src/cmd/auth/factotum/ctl.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/cmd/auth/factotum/ctl.c')

diff --git a/src/cmd/auth/factotum/ctl.c b/src/cmd/auth/factotum/ctl.c
index 85fbe5d8..d426f86f 100644
--- a/src/cmd/auth/factotum/ctl.c
+++ b/src/cmd/auth/factotum/ctl.c
@@ -36,7 +36,7 @@ ctlwrite(char *a)
 {
 	char *p;
 	int i, nmatch, ret;
-	Attr *attr, **l, **lpriv, **lprotos, *pa, *priv, *protos;
+	Attr *attr, *kpa, **l, **lpriv, **lprotos, *pa, *priv, *protos;
 	Key *k;
 	Proto *proto;
 
@@ -107,17 +107,22 @@ ctlwrite(char *a)
 				ret = -1;
 				continue;
 			}
-			if(proto->checkkey == nil){
-				werrstr("proto %s does not accept keys", proto->name);
-				ret = -1;
-				continue;
+			if(proto->keyprompt){
+				kpa = parseattr(proto->keyprompt);
+				if(!matchattr(kpa, attr, priv)){
+					freeattr(kpa);
+					werrstr("missing attributes -- want %s", proto->keyprompt);
+					ret = -1;
+					continue;
+				}
+				freeattr(kpa);
 			}
 			k = emalloc(sizeof(Key));
 			k->attr = mkattr(AttrNameval, "proto", proto->name, copyattr(attr));
 			k->privattr = copyattr(priv);
 			k->ref = 1;
 			k->proto = proto;
-			if((*proto->checkkey)(k) < 0){
+			if(proto->checkkey && (*proto->checkkey)(k) < 0){
 				ret = -1;
 				keyclose(k);
 				continue;
-- 
cgit v1.2.3