1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00

Fix GSSAPI related (wrongly removed in previous commit).

PR:		ports/202278
Submitted by:	peter
This commit is contained in:
Jun Kuriyama 2015-08-23 14:51:08 +00:00
parent 9a53421542
commit 8fbb0e646f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=395094
4 changed files with 68 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= conserver
PORTVERSION= 8.2.1
PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= http://www.conserver.com/ \
ftp://ftp.conserver.com/conserver/

View File

@ -0,0 +1,26 @@
--- configure.orig 2014-04-17 21:55:40.000000000 -0700
+++ configure 2015-08-12 13:31:26.015249000 -0700
@@ -5307,6 +5307,7 @@
$as_echo_n "checking for gssapi library -lgssapi... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <stdio.h>
#include <gssapi/gssapi.h>
int
@@ -5332,6 +5333,7 @@
$as_echo_n "checking for gssapi library -lgssglue... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <stdio.h>
#include <gssapi/gssapi.h>
int
@@ -5357,6 +5359,7 @@
$as_echo_n "checking for gssapi library -lgss... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <stdio.h>
#include <gssapi/gssapi.h>
int

View File

@ -0,0 +1,13 @@
--- conserver/consent.c.dist 2015-08-12 13:38:39.837321000 -0700
+++ conserver/consent.c 2015-08-12 13:38:01.860668000 -0700
@@ -687,6 +687,10 @@
case INSSLSHUTDOWN:
return "SSL_shutdown";
#endif
+#if HAVE_GSSAPI
+ case INGSSACCEPT:
+ return "GSSAPI_accept";
+#endif
case ISFLUSHING:
return "flushing";
}

View File

@ -0,0 +1,28 @@
--- ./conserver/group.c.orig 2009-09-26 05:58:05.000000000 -0400
+++ ./conserver/group.c 2013-02-15 18:34:20.000000000 -0500
@@ -72,6 +72,7 @@
#include <master.h>
#include <main.h>
#include <version.h>
+#include <stdio.h>
#if HAVE_PAM
#include <security/pam_appl.h>
@@ -1930,7 +1931,7 @@
FileWrite(pCL->fd, FLAGFALSE, sendtok.value, sendtok.length);
FileSetQuoteIAC(pCL->fd, FLAGTRUE);
pCL->iState = S_NORMAL;
- gss_release_buffer(NULL, &sendtok);
+ gss_release_buffer(&stmin, &sendtok);
BuildString((char *)0, pCL->username);
BuildString((char *)0, pCL->acid);
stmaj = gss_display_name(&stmin, user, &dbuf, NULL);
@@ -1940,7 +1941,7 @@
BuildStringChar('@', pCL->acid);
BuildString(pCL->peername->string, pCL->acid);
gss_release_name(&stmin, &user);
- gss_release_buffer(NULL, &dbuf);
+ gss_release_buffer(&stmin, &dbuf);
ret = 1;
break;
case GSS_S_CREDENTIALS_EXPIRED: