diff -ur voms-2.0.7.orig/src/install/voms_install_db.in voms-2.0.7/src/install/voms_install_db.in --- voms-2.0.7.orig/src/install/voms_install_db.in 2012-02-23 11:24:35.000000000 +0100 +++ voms-2.0.7/src/install/voms_install_db.in 2012-03-20 09:00:13.854089704 +0100 @@ -49,7 +49,7 @@ logformat="" sqlloc="" help="" -oldformat="no" +newformat="yes" vomscert="/etc/grid-security/voms/hostcert.pem" vomskey="/etc/grid-security/voms/hostkey.pem" @@ -60,7 +60,7 @@ fi -TEMP=`getopt -o h --long vomscert:,vomskey:,mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,compat -n 'voms_install_db' -- "$@"` +TEMP=`getopt -o h --long vomscert:,vomskey:,mysql-home:,loglevel:,logtype:,logformat:,logdateformat:,oracle-home:,db:,port:,code:,voms-vo:,socktimeout:,db-type:,sqlloc:,db-admin:,db-pwd:,voms-name:,voms-pwd:,newformat,oldformat,compat -n 'voms_install_db' -- "$@"` if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi @@ -86,8 +86,8 @@ --logtype) logtype=$2 ; shift 2 ;; --logformat) logformat=$2 ; shift 2 ;; --logdateformat) logdateformat=$2 ; shift 2 ;; - --newformat) oldformat="yes" ; shift 1 ;; - --oldformat) oldformat="no" ; shift 1 ;; + --newformat) newformat="yes" ; shift 1 ;; + --oldformat) newformat="no" ; shift 1 ;; --vomscert) vomscert=$2 ; shift 2 ;; --vomskey) vomskey=$2 ; shift 2 ;; -h) help="yes" ; shift 1 ;; @@ -138,7 +138,7 @@ $ECHO " --logtype type Specifies what to log. See the voms(8) man page for details." $ECHO " --logformat format See the voms(8) man page for details." $ECHO " --logdateformat format See the voms(8) man page for details." - $ECHO " --newformat Creates AC according to the old format." + $ECHO " --newformat Creates AC according to the new format." $ECHO " --oldformat Creates AC according to the old format." $ECHO " --help This output." exit 0;