X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-adduser;h=c3ee05b9b092c87bbd6d21773d88014b572683db;hb=649ceeca76084d16d22013124bd7f80f053d75c4;hp=4517a83fadb52c6d7da2c16fb199903f58bc3a9a;hpb=399377be683d60fd80690504103b809885b27903;p=freeside.git

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 4517a83fa..c3ee05b9b 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,30 +1,37 @@
 #!/usr/bin/perl -w
 #
-# $Id: freeside-adduser,v 1.1 2001-10-30 10:20:32 ivan Exp $
+# $Id: freeside-adduser,v 1.8 2002-09-27 05:36:29 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_c);
+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";
 
-getopts("ch:");
+getopts("bch:s:");
 die &usage if $opt_c && ! $opt_h;
-my $secretfile = shift or die &usage;
 my $user = shift or die &usage;
 
-my @args = ( 'htpasswd' );
-push @args, '-c' if $opt_c;
-push @args, $opt_h, $user;
-system(@args) == 0 or die "htpasswd failed: $?";
+if ( $opt_h ) {
+  my @args = ( 'htpasswd' );
+  push @args, '-b' if $opt_b;
+  push @args, '-c' if $opt_c;
+  push @args, $opt_h, $user;
+  push @args, shift if $opt_b;
+  system(@args) == 0 or die "htpasswd failed: $?";
+}
+
+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 ] ] secretfile username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -s secretfile ] username"
 }
 
 =head1 NAME
@@ -33,20 +40,24 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] username
+  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username
 
-=head DESCRIPTION
+=head1 DESCRIPTION
 
 Adds a user to the Freeside billing system.  This is for adding users (internal
 sales/tech folks) to the web interface, not for adding customer accounts.
 
   -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