trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [1/2] incubator-trafodion git commit: [TRAFODION-2800] Fix modifications to set TRAF_ENABLE_AUTHENTICATION
Date Tue, 14 Nov 2017 19:01:08 GMT
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 <steve.varnau@esgyn.com>
Authored: Wed Nov 8 19:17:22 2017 +0000
Committer: Steve Varnau <steve.varnau@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:


Mime
View raw message