diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt index d1ce21edc42f7a799595018e8657a5dbfa192c7e..1580203d3cff87a0cf921e98058f988d67954e5b 100644 --- a/doc/RELEASE_NOTES.txt +++ b/doc/RELEASE_NOTES.txt @@ -1,4 +1,4 @@ -Release 0.14 () +Release 0.14 (10/14/2016) ============================= - Introduced new framework and utilities for synchronizing users with diff --git a/setup.sh b/setup.sh index 25c7d179bcbaac3efa9b68882407982ac6a7bca0..5bf05917a28f1e1d692376c49e2abb49db358728 100644 --- a/setup.sh +++ b/setup.sh @@ -105,6 +105,12 @@ if [ -d $postgresqlDir ]; then export DM_POSTGRESQL_DIR=$postgresqlDir fi +# Setup oracle libraries. +oracleDir=$DM_SUPPORT_DIR/opt/oracle-client/$DM_HOST_ARCH +if [ -d $oracleDir ]; then + LD_LIBRARY_PATH=$oracleDir:$LD_LIBRARY_PATH +fi + # Get back to where we were before invoking the setup script cd $currentDir diff --git a/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py b/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py index 995dae6332838486435a2c9ac9a9d64d1ee52cc8..b9870b3ab7c2dca9f7bbaeda775981a5377bc711 100755 --- a/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py +++ b/src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py @@ -181,8 +181,8 @@ Description: # User needs update try: self.logger.debug('Modifying LDAP user with badge %s, username %s' % (badge, username)) - self.logger.debug('APS password hash: %s, DM password hash: %s' % (apsPasswordHash, dmPasswordHash)) - self.logger.debug('Encoded DM password hash: %s' % (dmUser['userAttrs']['userPassword'][0])) + #self.logger.debug('APS password hash: %s, DM password hash: %s' % (apsPasswordHash, dmPasswordHash)) + #self.logger.debug('Encoded DM password hash: %s' % (dmUser['userAttrs']['userPassword'][0])) ldapUserManager.modifyUserInfo(username, ldapModAttrDict) nUpdatedUsers += 1 except Exception, ex: