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 c3ee05b..2eef758 100644 (file)
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.8 2002-09-27 05:36:29 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);
@@ -13,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;