don't do the duplicate check unless there's a file already; fixes problem with first...

[freeside.git] / FS / bin / freeside-adduser

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index e9b3008..2eef758 100644 (file)
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,9 +1,10 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.6 2002-08-25 01:09:50 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";
@@ -12,6 +13,16 @@ getopts("bch:s:");
 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;
@@ -24,12 +35,13 @@ if ( $opt_h ) {
 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