diff options
| author | Michael Larson <mike@ft1.vyatta.com> | 2009-09-30 09:36:22 -0700 |
|---|---|---|
| committer | Michael Larson <mike@ft1.vyatta.com> | 2009-09-30 09:36:22 -0700 |
| commit | 5b695eb7e5751f81271ded175e5192ea69298880 (patch) | |
| tree | 55e3e0bce1e0cef3e780bda2fa28a75dd43913a8 | |
| parent | 5406cf4305e2247284d987e6110622ae322285c6 (diff) | |
| download | vyatta-cfg-5b695eb7e5751f81271ded175e5192ea69298880.tar.gz vyatta-cfg-5b695eb7e5751f81271ded175e5192ea69298880.zip | |
fix for bug 4969. on leaf nodes scan for '/' and don't make these values available to the partial commit status api (bug fix 4919). this approach will
be revised in next
release.
| -rw-r--r-- | src/common/unionfs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 8721651..3f42e5b 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -1041,7 +1041,10 @@ dlist_test_func(GQuark key_id,gpointer data,gpointer user_data) // strcat(new_vn->_data._path,"/"); strcat(new_vn->_data._path,"/value:"); if (vn_parent->_config._def.multi == FALSE) { - strcat(new_vn->_data._path,(char*)g_quark_to_string(key_id)); + char *tmp = (char*)g_quark_to_string(key_id); + if (strchr(tmp,'/') == NULL) { + strcat(new_vn->_data._path,tmp); + } } } new_vn->_data._value = TRUE; |