You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/11/14 19:01:08 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2800] Fix
modifications to set TRAF_ENABLE_AUTHENTICATION
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 3a35dbee0 -> e4ef5e31d
[TRAFODION-2800] Fix modifications to set TRAF_ENABLE_AUTHENTICATION
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7cdda983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7cdda983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7cdda983
Branch: refs/heads/master
Commit: 7cdda98347f24be723506bc313337bf1ad90561d
Parents: d820854
Author: Steve Varnau <st...@esgyn.com>
Authored: Wed Nov 8 19:17:22 2017 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Wed Nov 8 19:17:22 2017 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/traf_authentication_setup | 4 ++--
install/python-installer/scripts/traf_ldap.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7cdda983/core/sqf/sql/scripts/traf_authentication_setup
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_authentication_setup b/core/sqf/sql/scripts/traf_authentication_setup
index 650a7a0..ea6d9b4 100755
--- a/core/sqf/sql/scripts/traf_authentication_setup
+++ b/core/sqf/sql/scripts/traf_authentication_setup
@@ -93,10 +93,10 @@ function change_sqenvcom
echo "INFO: Modifying sqenvcom.sh to adjust the authentication default"
cp $TRAF_HOME/sqenvcom.sh sqenvcom.sh_temp
if [ $authOn -eq 1 ]; then
- sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@" <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
+ sed -e 's@TRAFODION_ENABLE_AUTHENTICATION=.*$@TRAFODION_ENABLE_AUTHENTICATION=YES@' <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
echo "INFO: Authentication has been enabled"
else
- sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=YES@TRAFODION_ENABLE_AUTHENTICATION=NO@" <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
+ sed -e 's@TRAFODION_ENABLE_AUTHENTICATION.*$@TRAFODION_ENABLE_AUTHENTICATION=NO@' <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
echo "INFO: Authentication has been disabled"
fi
rm sqenvcom.sh_temp > /dev/null 2>&1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7cdda983/install/python-installer/scripts/traf_ldap.py
----------------------------------------------------------------------
diff --git a/install/python-installer/scripts/traf_ldap.py b/install/python-installer/scripts/traf_ldap.py
index 2d0b9f8..1c5b584 100755
--- a/install/python-installer/scripts/traf_ldap.py
+++ b/install/python-installer/scripts/traf_ldap.py
@@ -69,7 +69,7 @@ def run():
# err('Failed to access LDAP server with user %s' % db_root_user)
print 'Modfiy sqenvcom.sh to turn on authentication'
- mod_file(sqenv_file, {'TRAFODION_ENABLE_AUTHENTICATION=NO':'TRAFODION_ENABLE_AUTHENTICATION=YES'})
+ mod_file(sqenv_file, {'TRAFODION_ENABLE_AUTHENTICATION=.*$':'TRAFODION_ENABLE_AUTHENTICATION=YES'})
# main
try:
[2/2] incubator-trafodion git commit: Merge remote branch
'origin/pr/1293/head' into merge_1293
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1293/head' into merge_1293
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e4ef5e31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e4ef5e31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e4ef5e31
Branch: refs/heads/master
Commit: e4ef5e31d5639fa6b4decedfa6d8fd82f0f129b1
Parents: 3a35dbe 7cdda98
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue Nov 14 19:00:40 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue Nov 14 19:00:40 2017 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/traf_authentication_setup | 4 ++--
install/python-installer/scripts/traf_ldap.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------