[Rt-commit] r3768 - rt/branches/QUEBEC-EXPERIMENTAL

[jesse at bestpractical.com]

Author: jesse
Date: Thu Sep  1 18:14:13 2005
New Revision: 3768

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/   (props changed)
   rt/branches/QUEBEC-EXPERIMENTAL/configure.ac
Log:
 r14221 at hualien:  jesse | 2005-09-01 13:48:56 -0400
  r14192 at hualien:  jesse | 2005-09-01 13:37:34 -0400
   r14130 at hualien (orig r3739):  robert | 2005-08-31 16:46:16 -0400
    r3748 at woof:  rspier | 2005-08-31 13:41:53 -0700
    Check for invalid character (-) in mysql database names and prevent RT from allowing it to be configured.
   
  
 


Modified: rt/branches/QUEBEC-EXPERIMENTAL/configure.ac
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/configure.ac	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/configure.ac	Thu Sep  1 18:14:13 2005
@@ -23,6 +23,7 @@
 
 dnl Check for programs
 AC_PROG_INSTALL
+AC_PROG_AWK
 AC_ARG_VAR([PERL],[Perl interpreter command])
 AC_PATH_PROG([PERL], [perl], [not found])
 if test "$PERL" = 'not found'; then
@@ -213,6 +214,15 @@
             WEB_USER=$my_user
             WEB_GROUP=$my_group)
 
+# Test for valid database names
+AS_IF([ test "$DB_TYPE" == "mysql" ],
+      [ AC_MSG_CHECKING([if database name is valid])
+          AS_IF([ echo $DB_DATABASE | $AWK '/-/ { exit 1 }' ],
+                [ AC_MSG_RESULT([yes]) ],
+                [ AC_MSG_ERROR([no.  database name ($DB_DATABASE) contains '-' which is not valid for mysql]) ]
+               )
+      ]
+     )
 
 
 dnl Set the value of apachectl