Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/trousers/patches/tcs_tcs_caps.c.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 24 Mar 2014 15:08:36 -0700
branchs11-update
changeset 3005 78cdd8ccc600
parent 777 e2e604cdbd6a
permissions -rw-r--r--
Close of build 36.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
399
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     1
 
--- src/tcs/tcs_caps.c.old	Wed Jun  9 13:20:44 2010
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     2
 
+++ src/tcs/tcs_caps.c	Fri Jul  1 16:26:51 2011
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -149,6 +149,7 @@
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     4
 
 {
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     5
 
 	TSS_RESULT result;
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     6
 
 	UINT32 subCap, rv = 0;
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     7
 
+	UINT32 manuf;
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     8
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
     9
 
 	if ((result = get_current_version(&p->version)))
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    10
 
 		goto err;
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    11
 
@@ -181,8 +182,9 @@
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    12
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    13
 
 	UINT32ToArray(TPM_CAP_PROP_MANUFACTURER, (BYTE *)&subCap);
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    14
 
 	if ((result = get_cap_uint32(TCPA_CAP_PROPERTY, (BYTE *)&subCap, sizeof(UINT32),
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    15
 
-					(UINT32 *)&p->manufacturer)))
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    16
 
+					(UINT32 *)&manuf)))
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    17
 
 		goto err;
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    18
 
+	(void) memcpy(p->manufacturer, &manuf, sizeof (UINT32));
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    19
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    20
 
 	result = get_max_auths(&(p->num_auths));
d877cc559d95 7056071 enable tcsd failed in Solaris 11
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    21
upstream/oracle/userland-gate