cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/sqsh: disable CS_SEC_NETWORKAUTH code, FreeTDS 1.2 introduces

Browse Source 
this but API seems different than sqsh expects (it wants things like
CS_MAX_CHAR, CS_SEC_CHANBIND, CS_SEC_CONFIDENTIALITY, CS_SEC_INTEGRITY).
breakage reported by aja@, thanks!
This commit is contained in:
sthen 2020-07-05 10:26:52 +00:00
parent 655f86f720
commit 8537c69a8e
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/sqsh/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.30 2019/07/12 20:44:02 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2020/07/05 10:26:52 sthen Exp $
COMMENT= SQL shell for FreeTDS
DISTNAME= sqsh-2.5.16.1
REVISION= 1
REVISION= 2
WRKDIST= ${WRKDIR}/sqsh-2.5
EXTRACT_SUFX= .tgz

31
databases/sqsh/patches/patch-src_cmd_connect_c
View File

@ -1,9 +1,14 @@
$OpenBSD: patch-src_cmd_connect_c,v 1.1 2016/06/28 21:11:10 sthen Exp $
$OpenBSD: patch-src_cmd_connect_c,v 1.2 2020/07/05 10:26:52 sthen Exp $
CS_TDS_80 used to be #defined to CS_TDS_71 but has now been removed.
- CS_TDS_80 used to be #defined to CS_TDS_71 but has now been removed.
--- src/cmd_connect.c.orig Tue Jun 28 22:07:55 2016
+++ src/cmd_connect.c Tue Jun 28 22:09:22 2016
- Disable CS_SEC_NETWORKAUTH code. FreeTDS 1.2 introduces CS_SEC_NETWORKAUTH
but doesn't have CS_MAX_CHAR, CS_SEC_CHANBIND, CS_SEC_CONFIDENTIALITY,
CS_SEC_INTEGRITY, etc.
Index: src/cmd_connect.c
--- src/cmd_connect.c.orig
+++ src/cmd_connect.c
@@ -861,7 +861,7 @@ int cmd_connect( argc, argv )
else if (strcmp(tds_version, "7.0") == 0)
version = CS_TDS_70;
@ -22,3 +27,21 @@ CS_TDS_80 used to be #defined to CS_TDS_71 but has now been removed.
env_set( g_env, "tds_version", "8.0" );
break;
#endif
@@ -1875,7 +1875,7 @@ static CS_RETCODE SetNetAuth (conn, principal, keytab_
CS_CHAR *req_options;
{
-#if defined(CS_SEC_NETWORKAUTH)
+#if 0 && defined(CS_SEC_NETWORKAUTH)
CS_CHAR buf[CS_MAX_CHAR+1];
CS_INT buflen;
@@ -2051,7 +2051,7 @@ static CS_RETCODE ShowNetAuthCredExp (conn, cmdname)
CS_CONNECTION *conn;
CS_CHAR *cmdname;
{
-#if defined(CS_SEC_NETWORKAUTH)
+#if 0 && defined(CS_SEC_NETWORKAUTH)
CS_INT CredTimeOut;
CS_BOOL NETWORKAUTH;
char *datetime;