From b5b3d4ad4663657fcc980ed8c421b3558d4b7482 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 13 Apr 2006 21:29:01 +0000 Subject: [PATCH] don't do the duplicate check unless there's a file already; fixes problem with first use of freeside-adduser --- FS/bin/freeside-adduser | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser index 67ffef612..2eef75827 100644 --- a/FS/bin/freeside-adduser +++ b/FS/bin/freeside-adduser @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: freeside-adduser,v 1.9 2006-04-09 20:36:06 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,13 +13,15 @@ getopts("bch:s:"); die &usage if $opt_c && ! $opt_h; my $user = shift or die &usage; -open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets") - or die "can't open $FREESIDE_CONF/mapsecrets: $!"; -while () { - /^(\S+) / or die "unparsable line in mapsecrets: $_"; - die "user $user already exists\n" if $user eq $1; +if ( -e "$FREESIDE_CONF/mapsecrets" ) { + open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets") + or die "can't open $FREESIDE_CONF/mapsecrets: $!"; + while () { + /^(\S+) / or die "unparsable line in mapsecrets: $_"; + die "user $user already exists\n" if $user eq $1; + } + close MAPSECRETS; } -close MAPSECRETS; if ( $opt_h ) { my @args = ( 'htpasswd' ); -- 2.11.0