From: Tom Yu Date: Thu, 26 Apr 2007 00:31:33 +0000 (+0000) Subject: pull up r19529 from trunk X-Git-Tag: kfw-3.2.0-beta3~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0eabd7898f8c382382082d96e63a3b96ae737dea;p=krb5.git pull up r19529 from trunk r19529@cathode-dark-space: jaltman | 2007-04-25 18:55:58 -0400 ticket: new subject: profile stores empty string values without double quotes tags: pullup prof_parse.c (need_double_quotes): The profile library will happily read in right hand values that represent the empty string by parsing "". However, when storing the same empty string back to a file, the empty string is written without the double quotes. This means that [section] foo = "" becomes [section] foo = which is invalid input. A subsequent attempt to parse the profile will result in an invalid input error. KFW and KFM's realm editors can inadvertently produce an invalid krb5 profile if one of the ignored sections of the input profile contains a right hand value that is "". This patch was produced by Asanka Herath and it was reviewed by jaltman and lxs. ticket: 5547 version_fixed: 1.6.2 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19530 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/util/profile/prof_parse.c b/src/util/profile/prof_parse.c index c5ef4f8e7..db491591d 100644 --- a/src/util/profile/prof_parse.c +++ b/src/util/profile/prof_parse.c @@ -306,8 +306,10 @@ errcode_t profile_parse_file(FILE *f, struct profile_node **root) */ static int need_double_quotes(char *str) { - if (!str || !*str) - return 0; + if (!str) + return 0; + if (*str) + return 1; if (isspace((int) (*str)) ||isspace((int) (*(str + strlen(str) - 1)))) return 1; if (strchr(str, '\n') || strchr(str, '\t') || strchr(str, '\b'))