work around JSON timestamp print modifier issue (%lld)

occurs only on some platforms (Debian 8)
thanks to @ralphvanetten
closes #79

Author: Hans Zandbelt

ChangeLog

@@ -1,6 +1,7 @@
 6/30/2015
 - improve memcache logging: don't report cache misses as an error, thanks to @scottdear
-- bump to 1.8.4rc2
+- work around JSON timestamp print modifier issue (%lld) on some platforms, thanks to @ralphvanetten
+- bump to 1.8.4rc3
 
 6/24/2015
 - support passing claims as environment variables (OIDCPassClaimsAs)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mod_auth_openidc],[1.8.4rc2],[[email protected]])
+AC_INIT([mod_auth_openidc],[1.8.4rc3],[[email protected]])
 
 AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
 

src/oauth.c

@@ -207,8 +207,8 @@ static apr_byte_t oidc_oauth_parse_and_cache_token_expiry(request_rec *r,
 	json_int_t value = json_integer_value(expiry);
 	if (value <= 0) {
 		oidc_warn(r,
-				"introspection response JSON object integer number value <= 0 (%" JSON_INTEGER_FORMAT "); introspection result will not be cached",
-				value);
+				"introspection response JSON object integer number value <= 0 (%ld); introspection result will not be cached",
+				(long)value);
 		return TRUE;
 	}
 

src/proto.c

@@ -388,14 +388,14 @@ static apr_byte_t oidc_proto_validate_iat(request_rec *r, apr_jwt_t *jwt,
 	/* check if this id_token has been issued just now +- slack (default 10 minutes) */
 	if ((now - slack) > jwt->payload.iat) {
 		oidc_error(r,
-				"\"iat\" validation failure (%" JSON_INTEGER_FORMAT "): JWT was issued more than %d seconds ago",
-				jwt->payload.iat, slack);
+				"\"iat\" validation failure (%ld): JWT was issued more than %d seconds ago",
+				(long)jwt->payload.iat, slack);
 		return FALSE;
 	}
 	if ((now + slack) < jwt->payload.iat) {
 		oidc_error(r,
-				"\"iat\" validation failure (%" JSON_INTEGER_FORMAT "): JWT was issued more than %d seconds in the future",
-				jwt->payload.iat, slack);
+				"\"iat\" validation failure (%ld): JWT was issued more than %d seconds in the future",
+				(long)jwt->payload.iat, slack);
 		return FALSE;
 	}
 
@@ -423,8 +423,8 @@ static apr_byte_t oidc_proto_validate_exp(request_rec *r, apr_jwt_t *jwt,
 	/* see if now is beyond the JWT expiry timestamp */
 	if (now > jwt->payload.exp) {
 		oidc_error(r,
-				"\"exp\" validation failure (%" JSON_INTEGER_FORMAT "): JWT expired %" JSON_INTEGER_FORMAT " seconds ago",
-				jwt->payload.exp, now - jwt->payload.exp);
+				"\"exp\" validation failure (%ld): JWT expired %ld seconds ago",
+				(long)jwt->payload.exp, (long)(now - jwt->payload.exp));
 		return FALSE;
 	}
 
@@ -759,9 +759,9 @@ apr_byte_t oidc_proto_parse_idtoken(request_rec *r, oidc_cfg *cfg,
 
 	apr_rfc822_date(buf, apr_time_from_sec((*jwt)->payload.exp));
 	oidc_debug(r,
-			"valid id_token for user \"%s\" expires: [%s], in %" JSON_INTEGER_FORMAT " secs from now)",
+			"valid id_token for user \"%s\" expires: [%s], in %ld secs from now)",
 			(*jwt)->payload.sub, buf,
-			(*jwt)->payload.exp - apr_time_sec(apr_time_now()));
+			(long)((*jwt)->payload.exp - apr_time_sec(apr_time_now())));
 
 	/* since we've made it so far, we may as well say it is a valid id_token */
 	return TRUE;

src/util.c

@@ -1232,8 +1232,8 @@ void oidc_util_set_app_infos(request_rec *r, const json_t *j_attrs,
 
 		} else if (json_is_integer(j_value)) {
 
-			if (sprintf(s_int, "%" JSON_INTEGER_FORMAT,
-					json_integer_value(j_value)) > 0) {
+			if (sprintf(s_int, "%ld",
+					(long)json_integer_value(j_value)) > 0) {
 				/* set long value in the application header whose name is based on the key and the prefix */
 				oidc_util_set_app_info(r, s_key, s_int, claim_prefix, as_header,
 						as_env_var);