#!/usr/bin/perl -w
#
-# $Id: freeside-adduser,v 1.5 2002-08-24 08:13:25 ivan Exp $
+# $Id: freeside-adduser,v 1.10 2006-04-13 21:29:01 ivan Exp $
use strict;
use vars qw($opt_h $opt_b $opt_c $opt_s);
+use Fcntl qw(:flock);
use Getopt::Std;
my $FREESIDE_CONF = "/usr/local/etc/freeside";
die &usage if $opt_c && ! $opt_h;
my $user = shift or die &usage;
+if ( -e "$FREESIDE_CONF/mapsecrets" ) {
+ open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
+ or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+ while (<MAPSECRETS>) {
+ /^(\S+) / or die "unparsable line in mapsecrets: $_";
+ die "user $user already exists\n" if $user eq $1;
+ }
+ close MAPSECRETS;
+}
+
if ( $opt_h ) {
my @args = ( 'htpasswd' );
push @args, '-b' if $opt_b;
my $secretfile = $opt_s || 'secrets';
open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
- or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+ and flock(MAPSECRETS,LOCK_EX)
+ or die "can't open $FREESIDE_CONF/mapsecrets: $!";
print MAPSECRETS "$user $secretfile\n";
close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
sub usage {
- die "Usage:\n\n freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username"
+ die "Usage:\n\n freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -s secretfile ] username"
}
=head1 NAME
-h: Also call htpasswd for this user with the given filename
- -c: Passed to htpasswd
+ -c: Passed to htpasswd(1)
-s: Specify an alternate secret file
+ -b: same as htpasswd(1), probably insecure, not recommended
+
=head1 SEE ALSO
-L<htpasswd>, base Freeside documentation
+L<htpasswd>(1), base Freeside documentation
=cut