Bug 783579: Fix incorrect mapping of 'unextractable'. Remove a debug
message in GetFlags. r=emaldona.
--- a/cmd/certutil/certutil.c
+++ b/cmd/certutil/certutil.c
@@ -1981,31 +1981,29 @@ flagArray attrFlagsArray[] =
{NAME_SIZE(session), PK11_ATTR_SESSION},
{NAME_SIZE(private), PK11_ATTR_PRIVATE},
{NAME_SIZE(public), PK11_ATTR_PUBLIC},
{NAME_SIZE(modifiable), PK11_ATTR_MODIFIABLE},
{NAME_SIZE(unmodifiable), PK11_ATTR_UNMODIFIABLE},
{NAME_SIZE(sensitive), PK11_ATTR_SENSITIVE},
{NAME_SIZE(insensitive), PK11_ATTR_INSENSITIVE},
{NAME_SIZE(extractable), PK11_ATTR_EXTRACTABLE},
- {NAME_SIZE(unextractable), PK11_ATTR_EXTRACTABLE}
+ {NAME_SIZE(unextractable), PK11_ATTR_UNEXTRACTABLE}
};
int attrFlagsCount = sizeof(attrFlagsArray)/sizeof(flagArray);
#define MAX_STRING 30
CK_ULONG
GetFlags(char *flagsString, flagArray *flagArray, int count)
{
CK_ULONG flagsValue = strtol(flagsString, NULL, 0);
int i;
-fprintf(stderr, "parsing flags <%s>\n", flagsString);
-
if ((flagsValue != 0) || (*flagsString == 0)) {
return flagsValue;
}
while (*flagsString) {
for (i=0; i < count; i++) {
if (strncmp(flagsString, flagArray[i].name, flagArray[i].nameSize)
== 0) {
flagsValue |= flagArray[i].value;