denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed Android product string

Browse Source
This commit is contained in:
Andreas Steffen
2012-11-07 14:57:41 +01:00
parent f77d425da3
commit 8cae17431a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imv_os/imv_os.c
+1 -2
View File
@@ -354,8 +354,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
{ {
ita_attr_get_settings_t *attr_cast; ita_attr_get_settings_t *attr_cast;
DBG1(DBG_IMV, "requesting installed packages for '%s'", /* requesting installed packages */
product_info);
os_state->set_package_request(os_state, TRUE); os_state->set_package_request(os_state, TRUE);
attr = ietf_attr_attr_request_create(PEN_IETF, attr = ietf_attr_attr_request_create(PEN_IETF,
IETF_ATTR_INSTALLED_PACKAGES); IETF_ATTR_INSTALLED_PACKAGES);
src/libimcv/plugins/imv_os/imv_os_database.c
+5 -5
View File
@@ -57,18 +57,18 @@ METHOD(imv_os_database_t, check_packages, status_t,
if (os_type == OS_TYPE_ANDROID) if (os_type == OS_TYPE_ANDROID)
{ {
/*no package dependency on Android version */ /*no package dependency on Android version */
os_version_len = 0; product = strdup(enum_to_name(os_type_names, os_type));
} }
else else
{ {
/* remove appended platform info */ /* remove appended platform info */
pos = memchr(os_version.ptr, ' ', os_version.len); pos = memchr(os_version.ptr, ' ', os_version.len);
os_version_len = pos ? (pos - os_version.ptr) : os_version.len; os_version_len = pos ? (pos - os_version.ptr) : os_version.len;
product = malloc(os_name.len + 1 + os_version_len + 1);
sprintf(product, "%.*s %.*s", os_name.len, os_name.ptr,
os_version_len, os_version.ptr);
} }
DBG1(DBG_IMV, "processing installed '%s' packages", product);
product = malloc(os_name.len + 1 + os_version_len + 1);
sprintf(product, "%.*s %.*s", os_name.len, os_name.ptr,
os_version_len, os_version.ptr);
/* Get primary key of product */ /* Get primary key of product */
e = this->db->query(this->db, e = this->db->query(this->db,