From 0a9ed4e020e3e935afb90123494dea1ebf4934d3 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 14 Dec 2005 21:08:49 +0000 Subject: [PATCH] Pull up r17557 from trunk ticket: 3285 version_fixed: 1.4.4 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17559 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/identity/include/khmsgtypes.h | 2 +- src/windows/identity/kcreddb/identity.c | 5 +---- src/windows/identity/kcreddb/kcreddb.h | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/windows/identity/include/khmsgtypes.h b/src/windows/identity/include/khmsgtypes.h index 9b63455e7..c2237ca19 100644 --- a/src/windows/identity/include/khmsgtypes.h +++ b/src/windows/identity/include/khmsgtypes.h @@ -552,7 +552,7 @@ name to be validated will be in the \a name_src member. The buffer will be NULL terminated with a maximum limit of KCDB_IDENT_MAXCCH_NAME characters including the terminating - NULL, consisting only of characters in KCDB_IDENT_VALID_CHARS + NULL. The \a result member should be set to one of the following depending on the result of the validation: diff --git a/src/windows/identity/kcreddb/identity.c b/src/windows/identity/kcreddb/identity.c index 896f723c5..e96c99608 100644 --- a/src/windows/identity/kcreddb/identity.c +++ b/src/windows/identity/kcreddb/identity.c @@ -1146,8 +1146,6 @@ kcdb_identpro_validate_name(const wchar_t * name) before calling the identity provider */ if(FAILED(StringCchLength(name, KCDB_IDENT_MAXCCH_NAME, &cch))) return KHM_ERROR_TOO_LONG; - if(wcsspn(name, KCDB_IDENT_VALID_CHARS) != cch) - return KHM_ERROR_INVALID_NAME; EnterCriticalSection(&cs_ident); if(kcdb_ident_sub != NULL) { @@ -1218,8 +1216,7 @@ kcdb_identpro_canon_name( khm_size cch; if(cb_name_out == 0 || - FAILED(StringCchLength(name_in, KCDB_IDENT_MAXCCH_NAME, &cch)) || - wcsspn(name_in, KCDB_IDENT_VALID_CHARS) != cch) + FAILED(StringCchLength(name_in, KCDB_IDENT_MAXCCH_NAME, &cch))) return KHM_ERROR_INVALID_NAME; EnterCriticalSection(&cs_ident); diff --git a/src/windows/identity/kcreddb/kcreddb.h b/src/windows/identity/kcreddb/kcreddb.h index e1bbfb0bd..52ca980ef 100644 --- a/src/windows/identity/kcreddb/kcreddb.h +++ b/src/windows/identity/kcreddb/kcreddb.h @@ -99,9 +99,6 @@ Functions, macros etc. for manipulating identities. name */ #define KCDB_IDENT_MAXCB_NAME (sizeof(wchar_t) * KCDB_IDENT_MAXCCH_NAME) -/*! \brief Valid characters in an identity name */ -#define KCDB_IDENT_VALID_CHARS L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._@-/" - /*! \name Flags for identities */ /*@{*/ -- 2.26.2