dbmi: fix db_get_connection() to get info about user/passwd

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59626 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/db/dbmi_base/connect.c

@@ -64,24 +64,33 @@ int db_set_connection(dbConnection * connection)
   \param[out] connection pointer to dbConnection to be modified
 
   \return DB_OK
+  \return DB_FAILED
  */
 int db_get_connection(dbConnection * connection)
 {
-  /* TODO: add checks and return DB_* error code if needed */
-
     G_zero(connection, sizeof(dbConnection));
     
     connection->driverName = (char *)G__getenv2("DB_DRIVER", G_VAR_MAPSET);
     connection->databaseName = (char *)G__getenv2("DB_DATABASE", G_VAR_MAPSET);
+    
+    if (connection->driverName == NULL ||
+        connection->databaseName == NULL)
+        return DB_FAILED;
+    
     connection->schemaName = (char *)G__getenv2("DB_SCHEMA", G_VAR_MAPSET);
     connection->group = (char *)G__getenv2("DB_GROUP", G_VAR_MAPSET);
 
-    /* below commented due to new mechanism:
+    /* below commented due to new mechanism: see db_get_login()
        connection->hostName = G__getenv("DB_HOST");
        connection->location = G__getenv("DB_LOCATION");
        connection->user = G__getenv("DB_USER");
        connection->password = G__getenv("DB_PASSWORD");
      */
+
+    /* try to get user/password */
+    db_get_login(connection->driverName, connection->databaseName,
+                 (const char **) &(connection->user),
+                 (const char **) &(connection->password));
     
     return DB_OK;
 }