From 3337479238e3697547cf731b2f419e5fa50fe4f3 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sat, 2 Mar 2002 16:10:54 +0000
Subject: [PATCH] Reduced aka match check for areas (dis)connect

---
 ChangeLog        | 3 +++
 mbfido/areamgr.c | 4 ++--
 mbfido/filemgr.c | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a1c2f03..c636533a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4637,6 +4637,9 @@ v0.33.20        10-Feb-2002
 		Implemented the FileMgr and AreaMgr pause and resume commands.
 		Changed logging when AreaMgr/FileMgr commands did fail.
 		Some checks improved and fixed some potential sigsegv crashes.
+		Reduced aka match level for (dis)connect areas to zone, net.
+		This should fix problems on systems with multiple aka's when
+		the first aka is not the aka in the areas.
 
 	mball:
 		Will not crash anymore when it needs more then 10 minutes to
diff --git a/mbfido/areamgr.c b/mbfido/areamgr.c
index e21cef65..ef85a0b1 100644
--- a/mbfido/areamgr.c
+++ b/mbfido/areamgr.c
@@ -668,7 +668,7 @@ void A_Disconnect(faddr *t, char *Area, FILE *tmp)
     i = metric(b, fido2faddr(mgroup.UseAka));
     Syslog('m', "Aka match level is %d", i);
 
-    if (i > METRIC_POINT) {
+    if (i >= METRIC_NET) {
 	fprintf(tmp, "You may not disconnect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
 	Syslog('+', "  %s may not disconnect from group %s", ascfnode(t, 0x1f), mgroup.Name);
 	return;
@@ -748,7 +748,7 @@ void A_Connect(faddr *t, char *Area, FILE *tmp)
     i = metric(b, fido2faddr(mgroup.UseAka));
     Syslog('m', "Aka match level is %d", i);
 
-    if (i > METRIC_POINT) {
+    if (i >= METRIC_NET) {
 	fprintf(tmp, "You may not connect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
 	Syslog('+', "  %s may not connect to group %s", ascfnode(t, 0x1f), mgroup.Name);
 	return;
diff --git a/mbfido/filemgr.c b/mbfido/filemgr.c
index f8d1d19b..9149357f 100644
--- a/mbfido/filemgr.c
+++ b/mbfido/filemgr.c
@@ -550,7 +550,7 @@ void F_Disconnect(faddr *t, char *Area, FILE *tmp)
     i = metric(b, fido2faddr(fgroup.UseAka));
     Syslog('m', "Aka match level is %d", i);
 
-    if (i > METRIC_POINT) {
+    if (i >= METRIC_NET) {
 	fprintf(tmp, "You may not disconnect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
 	Syslog('+', "  %s may not disconnect from group %s", ascfnode(t, 0x1f), fgroup.Name);
 	return;
@@ -630,7 +630,7 @@ void F_Connect(faddr *t, char *Area, FILE *tmp)
     i = metric(b, fido2faddr(fgroup.UseAka));
     Syslog('m', "Aka match level is %d", i);
 
-    if (i > METRIC_POINT) {
+    if (i >= METRIC_NET) {
 	fprintf(tmp, "You may not connect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
 	Syslog('+', "  Node %s may not connect to group %s", ascfnode(t, 0x1f), fgroup.Name);
 	return;