? Debug ? Release ? psqlodbc.aps ? ssl.patch ? installer/psqlodbc.msi ? installer/psqlodbc.msm ? installer/psqlodbc.wixobj ? installer/psqlodbclibpq-08_01_0001.zip ? installer/psqlodbclibpq-08_01_0002.zip ? installer/psqlodbcm.wixobj Index: connection.c =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/connection.c,v retrieving revision 1.97 diff -c -r1.97 connection.c *** connection.c 20 Jul 2005 14:50:21 -0000 1.97 --- connection.c 22 Jul 2005 13:11:35 -0000 *************** *** 1248,1259 **** return 0; } ! mylog("CC_connect(): DSN = '%s', server = '%s', port = '%s'," #ifdef HAVE_UNIX_SOCKETS " uds = '%s'," #endif " database = '%s', username = '%s'," ! " password='%s'\n", ci->dsn, ci->server, ci->port, #ifdef HAVE_UNIX_SOCKETS ci->uds, #endif --- 1248,1259 ---- return 0; } ! mylog("CC_connect(): DSN = '%s', server = '%s', port = '%s', sslmode = '%s'" #ifdef HAVE_UNIX_SOCKETS " uds = '%s'," #endif " database = '%s', username = '%s'," ! " password='%s'\n", ci->dsn, ci->server, ci->port, ci->sslmode, #ifdef HAVE_UNIX_SOCKETS ci->uds, #endif *************** *** 2632,2640 **** return 0; } ! mylog("CC_connect(): DSN = '%s', server = '%s', port = '%s'," " database = '%s', username = '%s'," ! " password='%s'\n", ci->dsn, ci->server, ci->port, ci->database, ci->username, ci->password ? "xxxxx" : ""); --- 2632,2640 ---- return 0; } ! mylog("CC_connect(): DSN = '%s', server = '%s', port = '%s', sslmode = '%s'," " database = '%s', username = '%s'," ! " password='%s'\n", ci->dsn, ci->server, ci->port, ci->sslmode, ci->database, ci->username, ci->password ? "xxxxx" : ""); *************** *** 3096,3101 **** --- 3096,3114 ---- } + if(self->connInfo.sslmode[0] != '\0') + { + size_t size = (sizeof(char) * (strlen(" sslmode=") + strlen(self->connInfo.sslmode) + 1)); + conninfo = (char *)realloc(conninfo,size+strlen(conninfo)); + if(!conninfo) + { + CC_set_error(self, CONN_MEMORY_ALLOCATION_FAILED,"Could not allocate memory for connection string(sslmode)"); + mylog("i could not allocate memory for sslmode \n"); + } + conninfo = strcat(conninfo," sslmode="); + conninfo = strcat(conninfo,self->connInfo.sslmode); + } + if(self->connInfo.password[0] != '\0') { size_t size = (sizeof(char) * (strlen(" password=") + strlen(self->connInfo.password) + 1)); Index: connection.h =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/connection.h,v retrieving revision 1.64 diff -c -r1.64 connection.h *** connection.h 13 Jul 2005 14:23:34 -0000 1.64 --- connection.h 22 Jul 2005 10:14:27 -0000 *************** *** 245,250 **** --- 245,251 ---- char conn_settings[LARGE_REGISTRY_LEN]; char protocol[SMALL_REGISTRY_LEN]; char port[SMALL_REGISTRY_LEN]; + char sslmode[MEDIUM_REGISTRY_LEN]; #ifdef HAVE_UNIX_SOCKETS char uds[LARGE_REGISTRY_LEN]; #endif Index: dlg_specific.c =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/dlg_specific.c,v retrieving revision 1.62 diff -c -r1.62 dlg_specific.c *** dlg_specific.c 13 Jul 2005 19:50:05 -0000 1.62 --- dlg_specific.c 22 Jul 2005 10:36:28 -0000 *************** *** 46,57 **** BOOL abbrev = (len < 1024); /* fundamental info */ ! sprintf(connect_string, "%s=%s;DATABASE=%s;SERVER=%s;PORT=%s;UID=%s;PWD=%s", got_dsn ? "DSN" : "DRIVER", got_dsn ? ci->dsn : ci->drivername, ci->database, ci->server, ci->port, ci->username, ci->password); --- 46,58 ---- BOOL abbrev = (len < 1024); /* fundamental info */ ! sprintf(connect_string, "%s=%s;DATABASE=%s;SERVER=%s;PORT=%s;SSLMODE=%s;UID=%s;PWD=%s", got_dsn ? "DSN" : "DRIVER", got_dsn ? ci->dsn : ci->drivername, ci->database, ci->server, ci->port, + ci->sslmode, ci->username, ci->password); *************** *** 285,290 **** --- 286,294 ---- else if (stricmp(attribute, INI_PORT) == 0) strcpy(ci->port, value); + + else if (stricmp(attribute, INI_SSLMODE) == 0 || stricmp(attribute, "sslmode") == 0) + strcpy(ci->sslmode, value); #ifndef USE_LIBPQ #ifdef HAVE_UNIX_SOCKETS *************** *** 335,341 **** else if (stricmp(attribute, "CX") == 0) unfoldCXAttribute(ci, value); ! mylog("copyAttributes: DSN='%s',server='%s',dbase='%s',user='%s',passwd='%s',port='%s',onlyread='%s',protocol='%s',conn_settings='%s',disallow_premature=%d)\n", ci->dsn, ci->server, ci->database, ci->username, ci->password ? "xxxxx" : "", ci->port, ci->onlyread, ci->protocol, ci->conn_settings, ci->disallow_premature); } void --- 339,345 ---- else if (stricmp(attribute, "CX") == 0) unfoldCXAttribute(ci, value); ! mylog("copyAttributes: DSN='%s',server='%s',dbase='%s',user='%s',passwd='%s',port='%s',sslmode='%s',onlyread='%s',protocol='%s',conn_settings='%s',disallow_premature=%d)\n", ci->dsn, ci->server, ci->database, ci->username, ci->password ? "xxxxx" : "", ci->port, ci->sslmode, ci->onlyread, ci->protocol, ci->conn_settings, ci->disallow_premature); } void *************** *** 406,411 **** --- 410,418 ---- { if (ci->port[0] == '\0') strcpy(ci->port, DEFAULT_PORT); + + if (ci->sslmode[0] == '\0') + strcpy(ci->sslmode, DEFAULT_SSLMODE); if (ci->onlyread[0] == '\0') sprintf(ci->onlyread, "%d", globals.onlyread); *************** *** 499,504 **** --- 506,514 ---- if (ci->port[0] == '\0' || overwrite) SQLGetPrivateProfileString(DSN, INI_PORT, "", ci->port, sizeof(ci->port), ODBC_INI); + if (ci->sslmode[0] == '\0' || overwrite) + SQLGetPrivateProfileString(DSN, INI_SSLMODE, "", ci->sslmode, sizeof(ci->sslmode), ODBC_INI); + #ifndef USE_LIBPQ #ifdef HAVE_UNIX_SOCKETS if (ci->uds[0] == '\0' || overwrite) *************** *** 738,743 **** --- 748,758 ---- INI_PORT, ci->port, ODBC_INI); + + SQLWritePrivateProfileString(DSN, + INI_SSLMODE, + ci->sslmode, + ODBC_INI); #ifndef USE_LIBPQ #ifdef HAVE_UNIX_SOCKETS Index: dlg_specific.h =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/dlg_specific.h,v retrieving revision 1.42 diff -c -r1.42 dlg_specific.h *** dlg_specific.h 13 Jul 2005 14:23:35 -0000 1.42 --- dlg_specific.h 22 Jul 2005 10:40:25 -0000 *************** *** 43,48 **** --- 43,49 ---- #define INI_KDESC "Description" /* Data source description */ #define INI_SERVER "Servername" /* Name of Server running PostgreSQL */ #define INI_PORT "Port" /* Port on which the Postmaster is listening */ + #define INI_SSLMODE "SSLmode" #if !defined WIN32 && defined HAVE_SYS_UN_H #ifndef HAVE_UNIX_SOCKETS *************** *** 129,134 **** --- 130,136 ---- /* Connection Defaults */ #define DEFAULT_PORT "5432" + #define DEFAULT_SSLMODE "prefer" #define DEFAULT_READONLY 0 #define DEFAULT_PROTOCOL "6.4" /* the latest protocol is the default */ #define DEFAULT_USEDECLAREFETCH 0 Index: dlg_wingui.c =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/dlg_wingui.c,v retrieving revision 1.9 diff -c -r1.9 dlg_wingui.c *** dlg_wingui.c 27 Aug 2003 10:17:53 -0000 1.9 --- dlg_wingui.c 22 Jul 2005 12:59:02 -0000 *************** *** 60,65 **** --- 60,70 ---- SetDlgItemText(hdlg, IDC_USER, ci->username); SetDlgItemText(hdlg, IDC_PASSWORD, ci->password); SetDlgItemText(hdlg, IDC_PORT, ci->port); + SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "prefer" )); + SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "allow" )); + SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "require" )); + SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_ADDSTRING, 0, (LPARAM) ((LPSTR) "disable" )); + SendDlgItemMessage(hdlg, IDC_SSLMODE, CB_SELECTSTRING, -1, (LPARAM) ((LPSTR) ci->sslmode )); } *************** *** 73,78 **** --- 78,84 ---- GetDlgItemText(hdlg, IDC_USER, ci->username, sizeof(ci->username)); GetDlgItemText(hdlg, IDC_PASSWORD, ci->password, sizeof(ci->password)); GetDlgItemText(hdlg, IDC_PORT, ci->port, sizeof(ci->port)); + GetDlgItemText(hdlg, IDC_SSLMODE, ci->sslmode, sizeof(ci->sslmode)); } Index: libpqconnection.h =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/libpqconnection.h,v retrieving revision 1.1 diff -c -r1.1 libpqconnection.h *** libpqconnection.h 13 Jul 2005 14:23:36 -0000 1.1 --- libpqconnection.h 22 Jul 2005 10:38:36 -0000 *************** *** 211,216 **** --- 211,217 ---- char conn_settings[LARGE_REGISTRY_LEN]; char protocol[SMALL_REGISTRY_LEN]; char port[SMALL_REGISTRY_LEN]; + char sslmode[MEDIUM_REGISTRY_LEN]; char onlyread[SMALL_REGISTRY_LEN]; char fake_oid_index[SMALL_REGISTRY_LEN]; char show_oid_column[SMALL_REGISTRY_LEN]; Index: psqlodbc.rc =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/psqlodbc.rc,v retrieving revision 1.55 diff -c -r1.55 psqlodbc.rc *** psqlodbc.rc 13 Jul 2005 19:55:02 -0000 1.55 --- psqlodbc.rc 22 Jul 2005 12:55:43 -0000 *************** *** 39,53 **** BEGIN RTEXT "デ−タソ−ス名:(&N)",IDC_DSNAMETEXT,2,9,63,17,NOT WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT ! EDITTEXT IDC_DSNAME,71,12,188,13,ES_AUTOHSCROLL | WS_GROUP, WS_EX_TRANSPARENT ! RTEXT "説明:(&D)",IDC_DESCTEXT,5,31,60,16,SS_CENTERIMAGE | NOT WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT ! EDITTEXT IDC_DESC,71,32,189,13,ES_AUTOHSCROLL,WS_EX_TRANSPARENT RTEXT "サ−バ−名:(&S)",IDC_STATIC,17,68,48,15,NOT WS_GROUP EDITTEXT IDC_SERVER,69,66,203,14,ES_AUTOHSCROLL RTEXT "デ−タベ−ス名:(&b)",IDC_STATIC,5,91,60,15,NOT WS_GROUP ! EDITTEXT IDC_DATABASE,69,88,203,14,ES_AUTOHSCROLL RTEXT "&Port:",IDC_STATIC,281,101,22,11 EDITTEXT IDC_PORT,307,99,37,14,ES_AUTOHSCROLL RTEXT "ユ−ザ−名:(&U)",IDC_STATIC,18,139,47,15 --- 39,56 ---- BEGIN RTEXT "デ−タソ−ス名:(&N)",IDC_DSNAMETEXT,2,9,63,17,NOT WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT ! EDITTEXT IDC_DSNAME,71,7,188,13,ES_AUTOHSCROLL | WS_GROUP, WS_EX_TRANSPARENT ! RTEXT "説明:(&D)",IDC_DESCTEXT,5,27,60,16,SS_CENTERIMAGE | NOT WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT ! EDITTEXT IDC_DESC,71,28,189,13,ES_AUTOHSCROLL,WS_EX_TRANSPARENT ! RTEXT "SS&L Mode",IDC_STATIC,37,50,28,9,NOT WS_GROUP ! COMBOBOX IDC_SSLMODE,71,47,65,12,CBS_DROPDOWNLIST | WS_VSCROLL | ! WS_TABSTOP RTEXT "サ−バ−名:(&S)",IDC_STATIC,17,68,48,15,NOT WS_GROUP EDITTEXT IDC_SERVER,69,66,203,14,ES_AUTOHSCROLL RTEXT "デ−タベ−ス名:(&b)",IDC_STATIC,5,91,60,15,NOT WS_GROUP ! EDITTEXT IDC_DATABASE,71,88,203,14,ES_AUTOHSCROLL RTEXT "&Port:",IDC_STATIC,281,101,22,11 EDITTEXT IDC_PORT,307,99,37,14,ES_AUTOHSCROLL RTEXT "ユ−ザ−名:(&U)",IDC_STATIC,18,139,47,15 *************** *** 299,306 **** // VS_VERSION_INFO VERSIONINFO ! FILEVERSION 8,1,0,2 ! PRODUCTVERSION 8,1,0,2 FILEFLAGSMASK 0x3L #ifdef _DEBUG FILEFLAGS 0x1L --- 302,309 ---- // VS_VERSION_INFO VERSIONINFO ! FILEVERSION 8,1,0,3 ! PRODUCTVERSION 8,1,0,3 FILEFLAGSMASK 0x3L #ifdef _DEBUG FILEFLAGS 0x1L *************** *** 322,333 **** #endif VALUE "CompanyName", "PostgreSQL Global Development Group" VALUE "FileDescription", "PostgreSQL Driver" ! VALUE "FileVersion", "08.01.0002" VALUE "InternalName", "psqlodbc" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoftョ is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." VALUE "OriginalFilename", "psqlodbc.dll" VALUE "ProductName", "Microsoft Open Database Connectivity" ! VALUE "ProductVersion", "08.01.0002" END END BLOCK "VarFileInfo" --- 325,336 ---- #endif VALUE "CompanyName", "PostgreSQL Global Development Group" VALUE "FileDescription", "PostgreSQL Driver" ! VALUE "FileVersion", "08.01.0003" VALUE "InternalName", "psqlodbc" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoftョ is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." VALUE "OriginalFilename", "psqlodbc.dll" VALUE "ProductName", "Microsoft Open Database Connectivity" ! VALUE "ProductVersion", "08.01.0003" END END BLOCK "VarFileInfo" *************** *** 389,394 **** --- 392,400 ---- EDITTEXT IDC_DESC,192,22,104,12,ES_AUTOHSCROLL RTEXT "Data&base",IDC_STATIC,16,40,38,12,NOT WS_GROUP EDITTEXT IDC_DATABASE,57,39,72,12,ES_AUTOHSCROLL + RTEXT "SS&L Mode",IDC_STATIC,145,40,45,12,NOT WS_GROUP + COMBOBOX IDC_SSLMODE,192,36,104,50,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP RTEXT "&Server",IDC_STATIC,26,55,29,12,NOT WS_GROUP EDITTEXT IDC_SERVER,57,54,72,12,ES_AUTOHSCROLL RTEXT "&Port",IDC_STATIC,168,56,22,12 *************** *** 606,613 **** // VS_VERSION_INFO VERSIONINFO ! FILEVERSION 8,1,0,2 ! PRODUCTVERSION 8,1,0,2 FILEFLAGSMASK 0x3L #ifdef _DEBUG FILEFLAGS 0x1L --- 612,619 ---- // VS_VERSION_INFO VERSIONINFO ! FILEVERSION 8,1,0,3 ! PRODUCTVERSION 8,1,0,3 FILEFLAGSMASK 0x3L #ifdef _DEBUG FILEFLAGS 0x1L *************** *** 629,640 **** #endif VALUE "CompanyName", "PostgreSQL Global Development Group" VALUE "FileDescription", "PostgreSQL Driver" ! VALUE "FileVersion", "08.01.0002" VALUE "InternalName", "psqlodbc" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoftョ is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." VALUE "OriginalFilename", "psqlodbc.dll" VALUE "ProductName", "Microsoft Open Database Connectivity" ! VALUE "ProductVersion", "08.01.0002" END END BLOCK "VarFileInfo" --- 635,646 ---- #endif VALUE "CompanyName", "PostgreSQL Global Development Group" VALUE "FileDescription", "PostgreSQL Driver" ! VALUE "FileVersion", "08.01.0003" VALUE "InternalName", "psqlodbc" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoftョ is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." VALUE "OriginalFilename", "psqlodbc.dll" VALUE "ProductName", "Microsoft Open Database Connectivity" ! VALUE "ProductVersion", "08.01.0003" END END BLOCK "VarFileInfo" Index: resource.h =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/resource.h,v retrieving revision 1.33 diff -c -r1.33 resource.h *** resource.h 12 May 2003 15:44:08 -0000 1.33 --- resource.h 22 Jul 2005 11:30:52 -0000 *************** *** 81,94 **** #define IDC_DRIVERNAME 1076 #define IDC_MANAGEDSN 1077 #define IDC_DRIVER_LIST 1078 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS ! #define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_COMMAND_VALUE 40001 ! #define _APS_NEXT_CONTROL_VALUE 1079 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif --- 81,95 ---- #define IDC_DRIVERNAME 1076 #define IDC_MANAGEDSN 1077 #define IDC_DRIVER_LIST 1078 + #define IDC_SSLMODE 1079 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS ! #define _APS_NEXT_RESOURCE_VALUE 109 #define _APS_NEXT_COMMAND_VALUE 40001 ! #define _APS_NEXT_CONTROL_VALUE 1082 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif Index: version.h =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/version.h,v retrieving revision 1.46 diff -c -r1.46 version.h *** version.h 13 Jul 2005 19:55:02 -0000 1.46 --- version.h 22 Jul 2005 13:06:57 -0000 *************** *** 11,18 **** #ifndef __VERSION_H__ #define __VERSION_H__ ! #define POSTGRESDRIVERVERSION "08.01.0002" ! #define POSTGRES_RESOURCE_VERSION "08.01.0002\0" ! #define PG_DRVFILE_VERSION 8,1,0,2 #endif --- 11,18 ---- #ifndef __VERSION_H__ #define __VERSION_H__ ! #define POSTGRESDRIVERVERSION "08.01.0003" ! #define POSTGRES_RESOURCE_VERSION "08.01.0003\0" ! #define PG_DRVFILE_VERSION 8,1,0,3 #endif Index: installer/Make.bat =================================================================== RCS file: /usr/local/cvsroot/psqlodbc/psqlodbc/installer/Make.bat,v retrieving revision 1.7 diff -c -r1.7 Make.bat *** installer/Make.bat 13 Jul 2005 19:55:02 -0000 1.7 --- installer/Make.bat 22 Jul 2005 10:37:13 -0000 *************** *** 3,9 **** if NOT "%1"=="" SET VERSION="%1" if NOT "%1"=="" GOTO GOT_VERSION ! SET VERSION="08.01.0002" echo. echo Version not specified - defaulting to %VERSION% echo. --- 3,9 ---- if NOT "%1"=="" SET VERSION="%1" if NOT "%1"=="" GOTO GOT_VERSION ! SET VERSION="08.01.0003" echo. echo Version not specified - defaulting to %VERSION% echo.