ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-04-09 03:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #28 from zi0r/gssapi

Browse Source 
FreeBSD/FreeBSD GSSAPI Fixes
This commit is contained in:
Bryan Stansell 2019-03-29 12:43:31 -07:00 committed by GitHub
commit 68422e949d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conserver/consent.c
View File

@ -699,6 +699,10 @@ ConsState(CONSENT *pCE)
return "SSL_accept";
case INSSLSHUTDOWN:
return "SSL_shutdown";
#endif
#if HAVE_GSSAPI
case INGSSACCEPT:
return "GSSAPI_accept";
#endif
case ISFLUSHING:
return "flushing";

4
conserver/cutil.c
View File

@ -1941,7 +1941,11 @@ ProbeInterfaces(in_addr_t bindAddr)
if ((ifc.ifc_len - r) < sizeof(*ifr))
break;
# ifdef HAVE_SA_LEN
# ifdef __FreeBSD__
if (sa->sa_len > sizeof(ifr->ifr_addr))
# else
if (sa->sa_len > sizeof(ifr->ifr_ifru))
# endif
r += sizeof(ifr->ifr_name) + sa->sa_len;
else
# endif

5
conserver/group.c
View File

@ -66,6 +66,7 @@
#include <master.h>
#include <main.h>
#include <version.h>
#include <stdio.h>
#if HAVE_PAM
# include <security/pam_appl.h>
@ -1985,7 +1986,7 @@ AttemptGSSAPI(CONSCLIENT *pCL)
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);
@ -1995,7 +1996,7 @@ AttemptGSSAPI(CONSCLIENT *pCL)
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: