diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-08-15 20:29:07 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-08-15 20:29:07 +0000 |
| commit | 66e22f21679a4853ceebf67e12e9629a4826b4f4 (patch) | |
| tree | 062c0fe0d5cc55028624dd22242b543774ed46a0 | |
| parent | 0d8f3bddd53328a8765f8c9b1c6e2465c6d1a8df (diff) | |
| download | krb5-66e22f21679a4853ceebf67e12e9629a4826b4f4.tar.gz krb5-66e22f21679a4853ceebf67e12e9629a4826b4f4.tar.xz krb5-66e22f21679a4853ceebf67e12e9629a4826b4f4.zip | |
Make data_eq_string work with const strings
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25101 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/include/k5-int.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index d506e7a457..17a0abe454 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2720,8 +2720,13 @@ krb5int_build_principal_alloc_va(krb5_context context, static inline int data_eq(krb5_data d1, krb5_data d2) { - return (d1.length == d2.length - && !memcmp(d1.data, d2.data, d1.length)); + return (d1.length == d2.length && !memcmp(d1.data, d2.data, d1.length)); +} + +static inline int +data_eq_string (krb5_data d, const char *s) +{ + return (d.length == strlen(s) && !memcmp(d.data, s, d.length)); } static inline krb5_data @@ -2762,12 +2767,6 @@ alloc_data(krb5_data *data, unsigned int len) } static inline int -data_eq_string (krb5_data d, char *s) -{ - return data_eq(d, string2data(s)); -} - -static inline int authdata_eq(krb5_authdata a1, krb5_authdata a2) { return (a1.ad_type == a2.ad_type |