diff options
| author | Luke Howard <lukeh@padl.com> | 2009-10-20 15:40:47 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2009-10-20 15:40:47 +0000 |
| commit | 098cbb480ff74cd46b89675d32d9c84d5430eeaf (patch) | |
| tree | 5f2d5bc415fd58a9077cf2ec61fadef97e702171 | |
| parent | 11fcd1b94b801fae4ebee2d03f618a64b0834c2e (diff) | |
| download | krb5-098cbb480ff74cd46b89675d32d9c84d5430eeaf.tar.gz krb5-098cbb480ff74cd46b89675d32d9c84d5430eeaf.tar.xz krb5-098cbb480ff74cd46b89675d32d9c84d5430eeaf.zip | |
For naming extensions draft compliance, s/mspac:/urn:mspac:/
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22957 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/pac.c | 24 | ||||
| -rw-r--r-- | src/plugins/authdata/greet_client/greet.c | 2 | ||||
| -rw-r--r-- | src/tests/gssapi/t_namingexts.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/krb5/krb/pac.c b/src/lib/krb5/krb/pac.c index 58a28cd17..3fcdaea1c 100644 --- a/src/lib/krb5/krb/pac.c +++ b/src/lib/krb5/krb/pac.c @@ -1127,14 +1127,14 @@ static struct { krb5_ui_4 type; krb5_data attribute; } mspac_attribute_types[] = { - { (krb5_ui_4)-1, { KV5M_DATA, STRLENOF("mspac:"), "mspac:" } }, - { PAC_LOGON_INFO, { KV5M_DATA, STRLENOF("mspac:logon-info"), "mspac:logon-info" } }, - { PAC_CREDENTIALS_INFO, { KV5M_DATA, STRLENOF("mspac:credentials-info"), "mspac:credentials-info" } }, - { PAC_SERVER_CHECKSUM, { KV5M_DATA, STRLENOF("mspac:server-checksum"), "mspac:server-checksum" } }, - { PAC_PRIVSVR_CHECKSUM, { KV5M_DATA, STRLENOF("mspac:privsvr-checksum"), "mspac:privsvr-checksum" } }, - { PAC_CLIENT_INFO, { KV5M_DATA, STRLENOF("mspac:client-info"), "mspac:client-info" } }, - { PAC_DELEGATION_INFO, { KV5M_DATA, STRLENOF("mspac:delegation-info"), "mspac:delegation-info" } }, - { PAC_UPN_DNS_INFO, { KV5M_DATA, STRLENOF("mspac:upn-dns-info"), "mspac:upn-dns-info" } }, + { (krb5_ui_4)-1, { KV5M_DATA, STRLENOF("urn:mspac:"), "urn:mspac:" } }, + { PAC_LOGON_INFO, { KV5M_DATA, STRLENOF("urn:mspac:logon-info"), "urn:mspac:logon-info" } }, + { PAC_CREDENTIALS_INFO, { KV5M_DATA, STRLENOF("urn:mspac:credentials-info"), "urn:mspac:credentials-info" } }, + { PAC_SERVER_CHECKSUM, { KV5M_DATA, STRLENOF("urn:mspac:server-checksum"), "urn:mspac:server-checksum" } }, + { PAC_PRIVSVR_CHECKSUM, { KV5M_DATA, STRLENOF("urn:mspac:privsvr-checksum"), "urn:mspac:privsvr-checksum" } }, + { PAC_CLIENT_INFO, { KV5M_DATA, STRLENOF("urn:mspac:client-info"), "urn:mspac:client-info" } }, + { PAC_DELEGATION_INFO, { KV5M_DATA, STRLENOF("urn:mspac:delegation-info"), "urn:mspac:delegation-info" } }, + { PAC_UPN_DNS_INFO, { KV5M_DATA, STRLENOF("urn:mspac:upn-dns-info"), "urn:mspac:upn-dns-info" } }, }; #define MSPAC_ATTRIBUTE_COUNT (sizeof(mspac_attribute_types)/sizeof(mspac_attribute_types[0])) @@ -1167,10 +1167,10 @@ mspac_attr2type(const krb5_data *attr, krb5_ui_4 *type) } } - if (attr->length > STRLENOF("mspac:") && - strncasecmp(attr->data, "mspac:", STRLENOF("mspac:")) == 0) + if (attr->length > STRLENOF("urn:mspac:") && + strncasecmp(attr->data, "urn:mspac:", STRLENOF("urn:mspac:")) == 0) { - char *p = &attr->data[STRLENOF("mspac:")]; + char *p = &attr->data[STRLENOF("urn:mspac:")]; char *endptr; *type = strtoul(p, &endptr, 10); @@ -1225,7 +1225,7 @@ mspac_get_attribute_types(krb5_context kcontext, } else { int length; - length = asprintf(&attrs[j].data, "mspac:%d", + length = asprintf(&attrs[j].data, "urn:mspac:%d", pacctx->pac->pac->Buffers[i].ulType); if (length < 0) { krb5int_free_data_list(kcontext, attrs); diff --git a/src/plugins/authdata/greet_client/greet.c b/src/plugins/authdata/greet_client/greet.c index cb0d6e519..4c7af82b8 100644 --- a/src/plugins/authdata/greet_client/greet.c +++ b/src/plugins/authdata/greet_client/greet.c @@ -38,7 +38,7 @@ struct greet_context { }; static krb5_data greet_attr = { - KV5M_DATA, sizeof("greet:greeting") - 1, "greet:greeting" }; + KV5M_DATA, sizeof("urn:greet:greeting") - 1, "urn:greet:greeting" }; static krb5_error_code greet_init(krb5_context kcontext, void **plugin_context) diff --git a/src/tests/gssapi/t_namingexts.c b/src/tests/gssapi/t_namingexts.c index 25e73d087..3dae0a1c7 100644 --- a/src/tests/gssapi/t_namingexts.c +++ b/src/tests/gssapi/t_namingexts.c @@ -234,7 +234,7 @@ testGreetAuthzData(OM_uint32 *minor, gss_buffer_desc attr; gss_buffer_desc value; - attr.value = "greet:greeting"; + attr.value = "urn:greet:greeting"; attr.length = strlen((char *)attr.value); major = gss_delete_name_attribute(minor, |