kdc: preserve value types in auditing

Preserve integer/boolean audit values as their native types; convert to strings
when logging only. This commit goes some way towards unifying the two auditing
APIs.

lib/base/heimbase.h

@@ -436,9 +436,10 @@ void    heim_db_iterate(heim_db_t, heim_string_t,
 
 typedef struct heim_number_data *heim_number_t;
 
-heim_number_t heim_number_create(int);
+heim_number_t heim_number_create(int64_t);
 heim_tid_t heim_number_get_type_id(void);
 int heim_number_get_int(heim_number_t);
+int64_t heim_number_get_long(heim_number_t);
 
 /*
  *

lib/base/log.c

@@ -817,23 +817,59 @@ heim_audit_addkv_timediff(heim_svc_req_desc r, const char *k,
 }
 
 void
-heim_audit_addkv_object(heim_svc_req_desc r, const char *k, heim_object_t obj)
+heim_audit_addkv_bool(heim_svc_req_desc r, const char *k, int v)
 {
     heim_string_t key = heim_string_create(k);
-    heim_string_t value;
+    heim_number_t value;
 
     if (key == NULL)
 	return;
 
-    value = heim_json_copy_serialize(obj, 0, NULL);
-    heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_object(): "
-	     "adding kv pair %s=%s",
-	     k, value ? heim_string_get_utf8(value) : "<unprintable>");
-    heim_dict_set_value(r->kv, key, obj);
+    heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_bool(): "
+	     "adding kv pair %s=%s", k, v ? "true" : "false");
+
+    value = heim_bool_create(v);
+    heim_dict_set_value(r->kv, key, value);
     heim_release(key);
     heim_release(value);
 }
 
+void
+heim_audit_addkv_number(heim_svc_req_desc r, const char *k, intptr_t v)
+{
+    heim_string_t key = heim_string_create(k);
+    heim_number_t value;
+
+    if (key == NULL)
+	return;
+
+    heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_number(): "
+	     "adding kv pair %s=%ld", k, v);
+
+    value = heim_number_create(v);
+    heim_dict_set_value(r->kv, key, value);
+    heim_release(key);
+    heim_release(value);
+}
+
+void
+heim_audit_addkv_object(heim_svc_req_desc r, const char *k, heim_object_t value)
+{
+    heim_string_t key = heim_string_create(k);
+    heim_string_t descr;
+
+    if (key == NULL)
+	return;
+
+    descr = heim_json_copy_serialize(value, 0, NULL);
+    heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_object(): "
+	     "adding kv pair %s=%s",
+	     k, descr ? heim_string_get_utf8(descr) : "<unprintable>");
+    heim_dict_set_value(r->kv, key, value);
+    heim_release(key);
+    heim_release(descr);
+}
+
 void
 heim_audit_delkv(heim_svc_req_desc r, const char *k)
 {
@@ -883,7 +919,7 @@ audit_trail_iterator(heim_object_t key, heim_object_t value, void *arg)
 	v = heim_string_get_utf8(value);
 	break;
     case HEIM_TID_NUMBER:
-	snprintf(num, sizeof(num), "%d", heim_number_get_int(value));
+	snprintf(num, sizeof(num), "%lld", (long long)heim_number_get_long(value));
 	v = num;
 	break;
     case HEIM_TID_NULL:

lib/base/number.c

@@ -86,16 +86,16 @@ struct heim_type_data _heim_number_object = {
  */
 
 heim_number_t
-heim_number_create(int number)
+heim_number_create(int64_t number)
 {
     heim_number_t n;
 
     if (number < 0xffffff && number >= 0)
 	return heim_base_make_tagged_object(number, HEIM_TID_NUMBER);
 
-    n = _heim_alloc_object(&_heim_number_object, sizeof(int));
+    n = _heim_alloc_object(&_heim_number_object, sizeof(int64_t));
     if (n)
-	*((int *)n) = number;
+	*((int64_t *)n) = number;
     return n;
 }
 
@@ -124,5 +124,13 @@ heim_number_get_int(heim_number_t number)
 {
     if (heim_base_is_tagged_object(number))
 	return heim_base_tagged_object_value(number);
-    return *(int *)number;
+    return (int)(*(int64_t *)number);
+}
+
+int64_t
+heim_number_get_long(heim_number_t number)
+{
+    if (heim_base_is_tagged_object(number))
+	return heim_base_tagged_object_value(number);
+    return *(int64_t *)number;
 }

lib/base/version-script.map

@@ -29,6 +29,8 @@ HEIMDAL_BASE_1.0 {
 		heim_array_iterate_reverse_f;
 		heim_array_set_value;
 		heim_audit_addkv;
+		heim_audit_addkv_bool;
+		heim_audit_addkv_number;
 		heim_audit_addkv_object;
 		heim_audit_addkv_timediff;
 		heim_audit_addreason;
@@ -150,6 +152,7 @@ HEIMDAL_BASE_1.0 {
 		heim_null_create;
 		heim_number_create;
 		heim_number_get_int;
+		heim_number_get_long;
 		heim_number_get_type_id;
 		heim_openlog;
 		heim_path_copy;