diff options
| author | Hiroshi Inoue <inoue@tpf.co.jp> | 2002-06-12 02:27:44 +0000 |
|---|---|---|
| committer | Hiroshi Inoue <inoue@tpf.co.jp> | 2002-06-12 02:27:44 +0000 |
| commit | 0484700cdaa55f35cd64953ae76fb42f76d17e90 (patch) | |
| tree | 441d566afa861f9bbb7d9fe1fad524c15bfbae77 /src/interfaces/odbc/drvconn.c | |
| parent | 237fb9bbc678c008c9391708dd391b29ab3dcd3a (diff) | |
| download | postgresql-0484700cdaa55f35cd64953ae76fb42f76d17e90.tar.gz postgresql-0484700cdaa55f35cd64953ae76fb42f76d17e90.zip | |
1) Fix a bug *double error message*.
2) Fix a bug *passowrd prompt in case of md5 authentication*.
3) Improve the DSN setup dialog.
Diffstat (limited to 'src/interfaces/odbc/drvconn.c')
| -rw-r--r-- | src/interfaces/odbc/drvconn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index 1fb91550df8..6c08376ac4b 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -78,7 +78,8 @@ PGAPI_DriverConnect( char connStrIn[MAX_CONNECT_STRING]; char connStrOut[MAX_CONNECT_STRING]; int retval; - char password_required = FALSE; + char salt[5]; + char password_required = AUTH_REQ_OK; int len = 0; SWORD lenStrout; @@ -114,6 +115,7 @@ PGAPI_DriverConnect( getDSNdefaults(ci); /* initialize pg_version */ CC_initialize_pg_version(conn); + salt[0] = '\0'; #ifdef WIN32 dialog: @@ -173,7 +175,7 @@ dialog: } /* do the actual connect */ - retval = CC_connect(conn, password_required); + retval = CC_connect(conn, password_required, salt); if (retval < 0) { /* need a password */ if (fDriverCompletion == SQL_DRIVER_NOPROMPT) @@ -185,7 +187,7 @@ dialog: else { #ifdef WIN32 - password_required = TRUE; + password_required = -retval; goto dialog; #else return SQL_ERROR; /* until a better solution is found. */ |