merged in fwknop-2.0.4 changes

This commit is contained in:
Michael Rash
2013-01-18 17:25:16 -05:00
107 changed files with 8305 additions and 952 deletions
+3 -3
View File
@@ -83,7 +83,7 @@ fko_encode_spa_data(fko_ctx_t ctx)
* (at leaset expand the error reporting for the missing
* data).
*/
if( ctx->username == NULL || strnlen(ctx->username, MAX_SPA_USERNAME_SIZE) == 0
if( validate_username(ctx->username) != FKO_SUCCESS
|| ctx->version == NULL || strnlen(ctx->version, MAX_SPA_VERSION_SIZE) == 0
|| ctx->message == NULL || strnlen(ctx->message, MAX_SPA_MESSAGE_SIZE) == 0)
{
@@ -157,7 +157,7 @@ fko_encode_spa_data(fko_ctx_t ctx)
if((res = append_b64(tbuf, ctx->nat_access)) != FKO_SUCCESS)
{
free(tbuf);
return(res);
return(res);
}
}
@@ -170,7 +170,7 @@ fko_encode_spa_data(fko_ctx_t ctx)
if((res = append_b64(tbuf, ctx->server_auth)) != FKO_SUCCESS)
{
free(tbuf);
return(res);
return(res);
}
}