diff options
| -rwxr-xr-x | pinyadmin/sbin/newuser | 2 | ||||
| -rwxr-xr-x | pinyweb/cgi-bin/newuser.cgi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pinyadmin/sbin/newuser b/pinyadmin/sbin/newuser index e6dd785..858451d 100755 --- a/pinyadmin/sbin/newuser +++ b/pinyadmin/sbin/newuser @@ -121,7 +121,7 @@ if ( scalar @ARGV == 3 and $ARGV[0] eq "--batch" ) { if ( not defined $email or $email eq "" ) { print "Email address is undefined!\n"; exit 3; }; if ( not defined $username or $username eq "" ) { print "Username is undefined!\n"; exit 3; }; if ( $username =~ /^(git|iki)-/ ) { print "Username must not begin with git- or iki-!\n"; exit 3; }; -if ( $username !~ /^[a-zA-Z][a-zA-Z0-9_.-]{0,30}$/ ) { print "Usernames must be less than 32 bytes long, consist only of letters, digits, underscores, periods, and dashes, and must start with a letter. Usernames are case sensitive.\n" }; +if ( $username !~ /^[a-zA-Z][a-zA-Z0-9_.-]{0,30}$/ ) { print "Usernames must be less than 32 bytes long, consist only of letters, digits, underscores, periods, and dashes, and must start with a letter. Usernames are case sensitive.\n"; exit 3; }; if ( not defined $password or $password eq "" ) { print "Password is undefined!\n"; exit 3; }; # Here on down is the actual creation code. diff --git a/pinyweb/cgi-bin/newuser.cgi b/pinyweb/cgi-bin/newuser.cgi index 75fa7c8..bb48103 100755 --- a/pinyweb/cgi-bin/newuser.cgi +++ b/pinyweb/cgi-bin/newuser.cgi @@ -37,7 +37,7 @@ if( scalar( $q->param("n") ) && scalar( $q->param("a") ) && scalar( $q->param("p if ( scalar( $q->param("h") ) ) { if ( scalar( $q->param("h") ) eq $code ) { unless( open2( OUT, IN, "/usr/bin/sudo", "/usr/sbin/newuser", "--batch", scalar( $q->param("a") ), scalar( $q->param("n") ) ) ) { - print "could not execute newrepo"; + print "could not execute newuser"; die; }; # make things flushier |