[Fusionforge-commits] FusionForge branch Branch_5_3 updated. f91af2bcad60ae1019b4153099471aabf0e24379

Sylvain Beucler beuc-inria at fusionforge.org
Sat Mar 22 18:53:07 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  f91af2bcad60ae1019b4153099471aabf0e24379 (commit)
      from  a5817e33c0ed2b00b9dbd08fb1871dce55f039a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f91af2bcad60ae1019b4153099471aabf0e24379
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sat Mar 22 18:53:00 2014 +0100

    install-nsspgsql.sh: merge old bugfix from the Debian branch

diff --git a/src/utils/install-nsspgsql.sh b/src/utils/install-nsspgsql.sh
index cb0a5a1..fbcfff6 100755
--- a/src/utils/install-nsspgsql.sh
+++ b/src/utils/install-nsspgsql.sh
@@ -39,17 +39,12 @@ modify_pam_pgsql(){
 
 # Check/Modify /etc/libnss-pgsql.conf
 configure_libnss_pgsql(){
-    hostconf=''
-    case "$db_host" in
-	127.*|localhost.*|localhost) ;; # 'local'
-	*) hostconf="host=$db_host"  ;; # 'host'
-    esac
     cat > /etc/nss-pgsql.conf.gforge-new <<EOF
 ### NSS Configuration for Gforge
 
 #----------------- DB connection
 # Use 'trust' authentication, cf. https://bugs.debian.org/551389
-connectionstring = user=$db_user_nss dbname=$db_name $hostconf
+connectionstring = user=$db_user_nss dbname=$db_name
 
 
 #----------------- NSS queries
@@ -66,7 +61,7 @@ EOF
 ### NSS Configuration for Gforge
 
 #----------------- DB connection
-shadowconnectionstring = user=$sys_dbuser_nss dbname=$db_name $hostconf
+shadowconnectionstring = user=$sys_dbuser_nss dbname=$db_name
 
 #----------------- NSS queries
 shadowbyname    = SELECT login AS shadow_name, passwd AS shadow_passwd, 14087 AS shadow_lstchg, 0 AS shadow_min, 99999 AS shadow_max, 7 AS shadow_warn, '' AS shadow_inact, '' AS shadow_expire, '' AS shadow_flag FROM nss_passwd WHERE login = \$1

-----------------------------------------------------------------------

Summary of changes:
 src/utils/install-nsspgsql.sh |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list