* krb5.conf: Test with a space after ']' and '{'

	* prof_parse.c (parse_std_line): Spaces after '{' or ']' should
	not be a fatal error. This is a common lossage in krb5.conf files.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12595 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index a0f2b79ea911180da6b511f043063f36cc4d7558..b3993c6da160db00d666dc8a2f6e44f6b00c4024 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-02  Ezra Peisach  <epeisach@mit.edu>
+
+       * krb5.conf: Test with a space after ']' and '{'
+
+       * prof_parse.c (parse_std_line): Spaces after '{' or ']' should
+       not be a fatal error. This is a common lossage in krb5.conf files.
+
 2000-07-24  Ezra Peisach  <epeisach@mit.edu>
 
        * prof_init.c: Cleanup internal type warnings in calls to profile_init.

diff --git a/src/util/profile/krb5.conf b/src/util/profile/krb5.conf
index 01eb66ce8aceb4c3673ab3c8835086132d99930e..8b46c95fe3de32ff80e1f4f9d7b84928f9f43d85 100644 (file)
--- a/src/util/profile/krb5.conf
+++ b/src/util/profile/krb5.conf
@@ -8,8 +8,8 @@
        kdc_timesync = 1
        ccache_type = 4
 
-[realms]
-       ATHENA.MIT.EDU = {
+[realms] 
+       ATHENA.MIT.EDU = { 
 #              kdc = kerberos-2000.mit.edu
                kdc = kerberos.mit.edu:88
                kdc = kerberos-1.mit.edu:88

diff --git a/src/util/profile/prof_parse.c b/src/util/profile/prof_parse.c
index 0e3cffe7466a318bcaa5f4cee724fee72561f6ea..7e8bcb8732a906536831a76ee0263482dbbd5d5f 100644 (file)
--- a/src/util/profile/prof_parse.c
+++ b/src/util/profile/prof_parse.c
@@ -130,6 +130,10 @@ static errcode_t parse_std_line(line, state)
                        profile_make_node_final(state->current_section);
                        cp++;
                }
+               /*
+                * A space after ']' should not be fatal 
+                */
+               cp = skip_over_blanks(cp);
                if (*cp)
                        return PROF_SECTION_SYNTAX;
                return 0;
@@ -169,7 +173,7 @@ static errcode_t parse_std_line(line, state)
        } else if (value[0] == 0) {
                do_subsection++;
                state->state = STATE_GET_OBRACE;
-       } else if (value[0] == '{' && value[1] == 0) 
+       } else if (value[0] == '{' && *(skip_over_blanks(value+1)) == 0)
                do_subsection++;
        else {
                cp = value + strlen(value) - 1;