浏览代码

try to enforce password prompts

Ralf S. Engelschall 18 年之前
父节点
当前提交
03649ceda0
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      dbmail/dbmail-setup.sh
  2. 1 1
      dbmail/dbmail.spec

+ 3 - 3
dbmail/dbmail-setup.sh

@@ -63,8 +63,8 @@ case "$cmd" in
             ( echo "CREATE ROLE $db_user LOGIN ENCRYPTED PASSWORD '$db_pass' NOCREATEDB NOCREATEUSER;"
               echo "CREATE TABLESPACE $db_name OWNER $db_user LOCATION '$db_dir';"
               echo "CREATE DATABASE $db_name OWNER $db_user TABLESPACE $db_name;"
-            ) | @l_prefix@/bin/psql -q -U "$db_suser" -d template1 -f-
-            @l_prefix@/bin/psql -q -U "$db_user" -d "$db_name" -f- <$db_script
+            ) | @l_prefix@/bin/psql -q -W -U "$db_suser" -d template1 -f-
+            @l_prefix@/bin/psql -q -W -U "$db_user" -d "$db_name" -f- <$db_script
         fi
         ;;
     uninstall )
@@ -78,7 +78,7 @@ case "$cmd" in
             ( echo "DROP DATABASE $db_name;"
               echo "DROP TABLESPACE $db_name;"
               echo "DROP ROLE $db_user;"
-            ) | @l_prefix@/bin/psql -q -U "$db_suser" -d template1 -f-
+            ) | @l_prefix@/bin/psql -q -W -U "$db_suser" -d template1 -f-
         fi
         ;;
 esac

+ 1 - 1
dbmail/dbmail.spec

@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      %{V_major}.%{V_minor}%{V_micro}
-Release:      20070809
+Release:      20070827
 
 #   package options
 %option       with_fsl    yes