summaryrefslogtreecommitdiffstats
path: root/source/ap/mariadb/mysql_install_db.nopam.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/mariadb/mysql_install_db.nopam.diff')
-rw-r--r--source/ap/mariadb/mysql_install_db.nopam.diff44
1 files changed, 22 insertions, 22 deletions
diff --git a/source/ap/mariadb/mysql_install_db.nopam.diff b/source/ap/mariadb/mysql_install_db.nopam.diff
index 3d67d2bf..70503865 100644
--- a/source/ap/mariadb/mysql_install_db.nopam.diff
+++ b/source/ap/mariadb/mysql_install_db.nopam.diff
@@ -1,45 +1,45 @@
---- ./scripts/mysql_install_db.sh.orig 2019-08-01 13:25:00.406477885 -0500
-+++ ./scripts/mysql_install_db.sh 2019-08-01 13:27:53.316490799 -0500
+--- ./scripts/mysql_install_db.sh.orig 2020-01-28 11:31:09.088303502 -0600
++++ ./scripts/mysql_install_db.sh 2020-01-28 11:35:47.822283410 -0600
@@ -480,25 +480,26 @@
if test -n "$user"
then
-- chown $user "$pamtooldir/auth_pam_tool_dir" && \
-- chmod 0700 "$pamtooldir/auth_pam_tool_dir"
-- if test $? -ne 0
-- then
-- echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
-- echo " to the '$user' user. Check that you have the necessary permissions and try again."
-- exit 1
-- fi
-- if test -z "$srcdir"
+- if test -z "$srcdir" -a "$in_rpm" -eq 0
- then
- chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
- chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
- if test $? -ne 0
- then
- echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
-- echo " It must be root, the PAM authentication plugin doesn't work otherwise.."
+- echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
+- echo
+- fi
+- chown $user "$pamtooldir/auth_pam_tool_dir" && \
+- chmod 0700 "$pamtooldir/auth_pam_tool_dir"
+- if test $? -ne 0
+- then
+- echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
+- echo "to the '$user' user. Check that you have the necessary permissions and try again."
- echo
- fi
- fi
+ # Commented out since Slackware does not currently provide PAM:
-+ #chown $user "$pamtooldir/auth_pam_tool_dir" && \
-+ #chmod 0700 "$pamtooldir/auth_pam_tool_dir"
-+ #if test $? -ne 0
-+ #then
-+ # echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
-+ # echo " to the '$user' user. Check that you have the necessary permissions and try again."
-+ # exit 1
-+ #fi
-+ #if test -z "$srcdir"
++ #if test -z "$srcdir" -a "$in_rpm" -eq 0
+ #then
+ # chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
+ # chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
+ # if test $? -ne 0
+ # then
+ # echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
-+ # echo " It must be root, the PAM authentication plugin doesn't work otherwise.."
++ # echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
++ # echo
++ # fi
++ # chown $user "$pamtooldir/auth_pam_tool_dir" && \
++ # chmod 0700 "$pamtooldir/auth_pam_tool_dir"
++ # if test $? -ne 0
++ # then
++ # echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
++ # echo "to the '$user' user. Check that you have the necessary permissions and try again."
+ # echo
+ # fi
+ #fi