From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 21 Nov 2025 00:09:28 +0000 (-0700)
Subject: Do not apply the pass and client subcommands to former members.
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=82d9b27927cb43d713ceb8ab111fe30d411343fe;p=Institute.git

Do not apply the pass and client subcommands to former members.
---

diff --git a/README.org b/README.org
index c5c596f..235be4c 100644
--- a/README.org
+++ b/README.org
@@ -6439,7 +6439,8 @@ if (defined $ARGV[0] && $ARGV[0] eq "pass") {
   my $mem_yaml = read_members_yaml ();
   my $members = $mem_yaml->{"members"};
   my $member = $members->{$user};
-  die "No such member: $user\n" if ! defined $member;
+  die "$user: does not exist\n" if ! defined $member;
+  die "$user: no longer current\n" if $member->{"status"} ne "current";
 
   my $pass = decode_base64 $pass64;
   my $epass = shell_escape $pass;
@@ -6670,6 +6671,8 @@ if (defined $ARGV[0] && $ARGV[0] eq "client") {
   my $member = $members->{$user};
   die "$user: does not exist\n"
     if !defined $member && $type ne "campus";
+  die "$user: no longer current\n"
+    if defined $member && $member->{"status"} ne "current";
 
   my @campus_peers # [ name, hostnum, type, pubkey, user|"" ]
      = map { [ (split / /), "" ] } @{$yaml->{"clients"}};
diff --git a/inst b/inst
index d6e8ebd..7d44a6d 100755
--- a/inst
+++ b/inst
@@ -310,7 +310,8 @@ if (defined $ARGV[0] && $ARGV[0] eq "pass") {
   my $mem_yaml = read_members_yaml ();
   my $members = $mem_yaml->{"members"};
   my $member = $members->{$user};
-  die "No such member: $user\n" if ! defined $member;
+  die "$user: does not exist\n" if ! defined $member;
+  die "$user: no longer current\n" if $member->{"status"} ne "current";
 
   my $pass = decode_base64 $pass64;
   my $epass = shell_escape $pass;
@@ -389,6 +390,8 @@ if (defined $ARGV[0] && $ARGV[0] eq "client") {
   my $member = $members->{$user};
   die "$user: does not exist\n"
     if !defined $member && $type ne "campus";
+  die "$user: no longer current\n"
+    if defined $member && $member->{"status"} ne "current";
 
   my @campus_peers # [ name, hostnum, type, pubkey, user|"" ]
      = map { [ (split / /), "" ] } @{$yaml->{"clients"}};