[GRASS-SVN] r71221 - grass/branches/releasebranch_7_0/vector/v.in.ogr

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-06-26 06:14:32 -0700 (Mon, 26 Jun 2017)
New Revision: 71221

Modified:
   grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
Log:
v.in.ogr: do not replace user-given dbname, user, and/or password

Modified: grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c	2017-06-26 12:56:08 UTC (rev 71220)
+++ grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c	2017-06-26 13:14:32 UTC (rev 71221)
@@ -354,7 +354,9 @@
     else
 	datetime_type = "datetime";
 
+#if 0
     /* dsn is 'PG:', check default connection settings */
+    /* TODO: do not replace user-given dbname, user, and/or password */
     dsn = NULL;
     if (driver_name && strcmp(driver_name, "pg") == 0 &&
         G_strcasecmp(param.dsn->answer, "PG:") == 0) {
@@ -392,6 +394,8 @@
     else if (param.dsn->answer) {
         dsn = G_store(param.dsn->answer);
     }
+#endif
+    dsn = G_store(param.dsn->answer);
     
     min_area = atof(param.min_area->answer);
     snap = atof(param.snap->answer);