Преглед изворни кода

db_get_login(): database can be NULL (ignored)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60466 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa пре 11 година
родитељ
комит
8c802dfae6
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      lib/db/dbmi_base/login.c

+ 2 - 2
lib/db/dbmi_base/login.c

@@ -221,7 +221,7 @@ int db_set_login(const char *driver, const char *database, const char *user,
   is not found, user/password are set to NULL
   
   \param driver driver name
-  \param database database name
+  \param database database name (can be NULL)
   \param[out] user name
   \param[out] password string
   
@@ -246,7 +246,7 @@ int db_get_login(const char *driver, const char *database, const char **user,
 
     for (i = 0; i < login.n; i++) {
 	if (strcmp(login.data[i].driver, driver) == 0 &&
-	    strcmp(login.data[i].database, database) == 0) {
+	    (!database || strcmp(login.data[i].database, database) == 0)) {
 	    if (login.data[i].user && strlen(login.data[i].user) > 0)
 		*user = G_store(login.data[i].user);
 	    else