Merge branch 'mdw+fixes'

[userv-utils.git] / misc / checkpasswd-service

diff --git a/misc/checkpasswd-service b/misc/checkpasswd-service
index 5418a7c54e23c9937e7608e72f6535b7797a8f8e..e78c44eea6dd709655521cfc6d97aeb5b738f6ce 100755 (executable)
--- a/misc/checkpasswd-service
+++ b/misc/checkpasswd-service
@@ -1,10 +1,58 @@
 #!/usr/bin/perl -w
+# checkpasswd-service
+# part of userv-utils
+
+# protocols:
+#
+#   userv root checkpasswd-self <<'END'
+# < PASSWORD
+# < ^D
+# > STATUS MESSAGE...
+#
+#   userv root checkpasswd-other USERNAME <<'END'
+# < PASSWORD
+# < ^D
+# > STATUS MESSAGE...
+#
+# STATUS MESSAGE may be
+#   0 ok
+#   2 incorrect password
+#   4 no such user
+#   5 password disabled
+
+# Copyright 1996-2013 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+# Copyright 1999,2003
+#    Chancellor Masters and Scholars of the University of Cambridge
+# Copyright 2010 Tony Finch <fanf@dotat.at>
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with userv-utils; if not, see http://www.gnu.org/licenses/.
+
+
 use strict;
 use IO::File;
 use Fcntl qw(:flock);
 
-die "$0: bad usage\n" unless @ARGV==1 && $ARGV[0] !~ m/^-/;
-my $username = shift @ARGV;
+my ($lockpath, $delay, $separator, $username) = @ARGV;
+
+die "$0: bad usage\n" unless
+    @ARGV == 4 ||
+    $lockpath =~ m#^/# ||
+    $delay =~ m/^[0-9.]+$/ ||
+    $separator eq '--' ||
+    $username =~ m/^\w/;
+
 $username = $ENV{'USERV_USER'} if $username eq 'SELF';
 
 sub result {
@@ -21,7 +69,6 @@ result 5, "password disabled" unless length $encrpw >= 13;
 $!=0; my $pw = <STDIN>;
 chomp $pw or die "reading password: $!\n";
 
-my $lockpath = "/var/run/checkpasswd.synch";
 my $lockf = new IO::File $lockpath, "w+" or die "open $lockpath: $!\n";
 flock($lockf, LOCK_EX) or die "lock $lockpath: $!\n";
 select(undef,undef,undef,0.5);