[Dbconfig-common-changes] [dbconfig-common] r201 - in trunk: debian dpkg

[Sean Finney]

Author: seanius
Date: 2006-04-23 15:04:29 +0000 (Sun, 23 Apr 2006)
New Revision: 201

Modified:
   trunk/debian/changelog
   trunk/dpkg/postinst
Log:
fix for GRANT logic from radu.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-10 07:02:05 UTC (rev 200)
+++ trunk/debian/changelog	2006-04-23 15:04:29 UTC (rev 201)
@@ -2,6 +2,13 @@
 
   [sean finney]
   * dbconfig-common is now migrated to svn.debian.org.
+  * two fixes for GRANT command construction from Radu Spineanu:
+    - if dbc_dbserver is localhost, then dbc_dballow should
+      also be set to localhost (currently it's set to the output of
+      `hostname`, just like with remote connections)
+    - if connecting to a remote host, use the fqdn (`hostname -f`)
+      instead of the node name.
+    (closes: #362571).
   * the source package in ./examples is now split into several
     smaller source packages, one per binary.  this should hopefully
     make things much easier to understand for developers interested
@@ -12,7 +19,8 @@
     (closes: #348720).
   * Cameron Dale noticed that a mix of script/sql/admin sql upgrades
     would not necessarily be applied in sorted order with respect
-    to each other.  fixed.
+    to each other.  this *should* be fixed now, but i'm sure i'll
+    hear if it isn't.
 
  -- sean finney <seanius at debian.org>  Mon, 10 Apr 2006 09:01:02 +0200
 

Modified: trunk/dpkg/postinst
===================================================================
--- trunk/dpkg/postinst	2006-04-10 07:02:05 UTC (rev 200)
+++ trunk/dpkg/postinst	2006-04-23 15:04:29 UTC (rev 201)
@@ -25,12 +25,12 @@
 		###
 
 		# if dbserver is unset, that means localhost.  
-		if [ -z "$dbc_dbserver" ]; then 
+		if [ -z "$dbc_dbserver" ] || [ "$dbc_dbserver" = "localhost" ]; then 
 			# if the server is local, only allow connections from localhost
 			dbc_dballow="localhost"
 		else
 			# otherwise, only tell the remote database to allow from us
-			dbc_dballow=`hostname`
+			dbc_dballow=`hostname -f`
 		fi
 
 		# export the config file if it exists, for the scripts