summaryrefslogtreecommitdiff
path: root/src/cstore
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-07-14 19:39:03 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-07-15 11:59:04 -0500
commite396460d35f11b95434e5f08d6376859b0eb5bcd (patch)
tree0f46dbaae130c0e15e509893a59c5aba7fc55aa3 /src/cstore
parent63ce0b05d99225496f31ba9fd444ab2fefdc37e9 (diff)
downloadvyatta-cfg-e396460d35f11b95434e5f08d6376859b0eb5bcd.tar.gz
vyatta-cfg-e396460d35f11b95434e5f08d6376859b0eb5bcd.zip
Bugfix 7331: better fix for the bug
(cherry picked from commit fdac525b7596f1b18c201bdcd5923d3e76453ebd)
Diffstat (limited to 'src/cstore')
-rw-r--r--src/cstore/cstore.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp
index c86631b..b8ab82f 100644
--- a/src/cstore/cstore.cpp
+++ b/src/cstore/cstore.cpp
@@ -999,12 +999,10 @@ Cstore::commentCfgPath(const Cpath& args)
}
if (comment.find("CONFIGURATION COMMENTED OUT DURING MIGRATION BELOW") != string::npos){
// Don't allow users to set configuration migration comments
- output_user("Cannot use the string 'CONFIGURATION COMMENTED OUT DURING MIGRATION BELOW' in a comment\n");
return false;
}
if (comment.find("CONFIGURATION COMMENTED OUT DURING MIGRATION ABOVE") != string::npos){
// Don't allow users to set configuration migration comments
- output_user("Cannot use the string 'CONFIGURATION COMMENTED OUT DURING MIGRATION ABOVE' in a comment\n");
return false;
}
@@ -1826,7 +1824,11 @@ Cstore::loadFile(const char *filename)
}
for (size_t i = 0; i < com_list.size(); i++) {
if (!commentCfgPath(com_list[i])) {
- print_path_vec("Comment [", "] failed\n", com_list[i], "'");
+ string comment = string(com_list[i][com_list[i].size()-1]);
+ if (comment.find("CONFIGURATION COMMENTED OUT DURING MIGRATION BELOW") == string::npos
+ && comment.find("CONFIGURATION COMMENTED OUT DURING MIGRATION ABOVE") == string::npos) {
+ print_path_vec("Comment [", "] failed\n", com_list[i], "'");
+ }
}
}