uLab
/
remotelaboratory
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/remotelaboratory
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix incorrect SASL property fetch calls

Browse Source 
This resolves the long-standing incorrect buffer size issues
master
Timothy Pearson 9 years ago
parent a1de7e6e37
commit c6d4bab160
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File

13
lib/libtdekrb/src/tdekrbclientsocket.cpp
Unescape View File

@ -810,6 +810,7 @@ void TDEKerberosClientSocket::continueKerberosInitialization() {
const char *data = 0; const char *data = 0;
const char *chosenmech = 0; const char *chosenmech = 0;
sasl_ssf_t *ssf = 0; sasl_ssf_t *ssf = 0;
const void *sasl_prop_ptr;
if (m_krbInitRunning) { if (m_krbInitRunning) {
switch (m_krbInitState) { switch (m_krbInitState) {
@ -957,7 +958,8 @@ void TDEKerberosClientSocket::continueKerberosInitialization() {
break; break;
case 2: case 2:
if (state() == TQSocket::Connected) { if (state() == TQSocket::Connected) {
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_USERNAME, (const void **)&data); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_USERNAME, &sasl_prop_ptr);
data = (const char *)sasl_prop_ptr;
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine authenticated username!\n\r"); printf("[WARNING] Unable to determine authenticated username!\n\r");
} }
@ -966,7 +968,8 @@ void TDEKerberosClientSocket::continueKerberosInitialization() {
} }
#if 0 #if 0
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_DEFUSERREALM, (const void **)&data); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_DEFUSERREALM, &sasl_prop_ptr);
data = (const char *)sasl_prop_ptr;
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine authenticated realm!\n\r"); printf("[WARNING] Unable to determine authenticated realm!\n\r");
} }
@ -975,7 +978,8 @@ void TDEKerberosClientSocket::continueKerberosInitialization() {
} }
#endif #endif
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_SSF, (const void **)&ssf); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_SSF, &sasl_prop_ptr);
ssf = (sasl_ssf_t *)sasl_prop_ptr;
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine SSF!\n\r"); printf("[WARNING] Unable to determine SSF!\n\r");
} }
@ -983,7 +987,8 @@ void TDEKerberosClientSocket::continueKerberosInitialization() {
printf("[DEBUG] Authenticated SSF: %d\n", *ssf); printf("[DEBUG] Authenticated SSF: %d\n", *ssf);
} }
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_MAXOUTBUF, (const void **)&m_negotiatedMaxBufferSize); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_MAXOUTBUF, &sasl_prop_ptr);
m_negotiatedMaxBufferSize = *((unsigned*)sasl_prop_ptr);
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine maximum buffer size!\n\r"); printf("[WARNING] Unable to determine maximum buffer size!\n\r");
m_negotiatedMaxBufferSize = NET_SEC_BUF_SIZE; m_negotiatedMaxBufferSize = NET_SEC_BUF_SIZE;

13
lib/libtdekrb/src/tdekrbserversocket.cpp
Unescape View File

@ -804,6 +804,7 @@ void TDEKerberosServerSocket::continueKerberosInitialization() {
int slen; int slen;
char buf[NET_SEC_BUF_SIZE]; char buf[NET_SEC_BUF_SIZE];
sasl_ssf_t *ssf; sasl_ssf_t *ssf;
const void *sasl_prop_ptr;
if (m_krbInitRunning) { if (m_krbInitRunning) {
switch (m_krbInitState) { switch (m_krbInitState) {
@ -916,7 +917,8 @@ void TDEKerberosServerSocket::continueKerberosInitialization() {
sendSASLDataToNetwork(m_krbInitData, m_krbInitLastLen); sendSASLDataToNetwork(m_krbInitData, m_krbInitLastLen);
} }
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_USERNAME, (const void **)&m_krbInitData); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_USERNAME, &sasl_prop_ptr);
m_krbInitData = (const char *)sasl_prop_ptr;
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine authenticated username!\n\r"); printf("[WARNING] Unable to determine authenticated username!\n\r");
} }
@ -926,7 +928,8 @@ void TDEKerberosServerSocket::continueKerberosInitialization() {
} }
#if 0 #if 0
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_DEFUSERREALM, (const void **)&m_krbInitData); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_DEFUSERREALM, (const void **)&sasl_prop_ptr);
m_krbInitData = (const char *)sasl_prop_ptr;
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine authenticated realm!\n\r"); printf("[WARNING] Unable to determine authenticated realm!\n\r");
} }
@ -938,7 +941,8 @@ void TDEKerberosServerSocket::continueKerberosInitialization() {
m_authenticatedRealmName = "(NULL)"; m_authenticatedRealmName = "(NULL)";
#endif #endif
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_SSF, (const void **)&ssf); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_SSF, &sasl_prop_ptr);
ssf = (sasl_ssf_t *)sasl_prop_ptr;
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine SSF!\n\r"); printf("[WARNING] Unable to determine SSF!\n\r");
} }
@ -946,7 +950,8 @@ void TDEKerberosServerSocket::continueKerberosInitialization() {
printf("[DEBUG] Authenticated SSF: %d\n", *ssf); printf("[DEBUG] Authenticated SSF: %d\n", *ssf);
} }
m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_MAXOUTBUF, (const void **)&m_negotiatedMaxBufferSize); m_krbInitResult = sasl_getprop(saslData->m_krbConnection, SASL_MAXOUTBUF, &sasl_prop_ptr);
m_negotiatedMaxBufferSize = *((unsigned*)sasl_prop_ptr);
if (m_krbInitResult != SASL_OK) { if (m_krbInitResult != SASL_OK) {
printf("[WARNING] Unable to determine maximum buffer size!\n\r"); printf("[WARNING] Unable to determine maximum buffer size!\n\r");
m_negotiatedMaxBufferSize = NET_SEC_BUF_SIZE; m_negotiatedMaxBufferSize = NET_SEC_BUF_SIZE;

Write Preview
Loading…
Cancel
Save