Fixed: [Issue 631: Private candidate datastores are not deleted](#631)

Author: joc-se

lib/src/clixon_datastore.c

@@ -895,7 +895,8 @@ xmldb_clear(clixon_handle h,
  * @retval     0   OK
  * @retval    -1   Error
  * @note Datastores / dirs are not actually deleted so that a backend after dropping priviliges
- *       can re-create them
+ *       can re-create them. It is not possible to drop priviliges when private candidate option
+ *       is enabled because candidate datastores are created dynamically for each session.
  */
 int
 xmldb_delete(clixon_handle h,
@@ -910,17 +911,33 @@ xmldb_delete(clixon_handle h,
     int            ndp;
     int            i;
     char          *regexp = NULL;
+    db_elmnt      *de;
+    int            del = 0;
 
     clixon_debug(CLIXON_DBG_DATASTORE | CLIXON_DBG_DETAIL, "%s", db);
+    if (clicon_option_bool(h, "CLICON_XMLDB_PRIVATE_CANDIDATE")) {
+        if ((de = xmldb_find(h, db)) != NULL)
+            del = xmldb_candidate_get(de);
+    } 
     if (xmldb_clear(h, db) < 0)
         goto done;
     if (xmldb_db2file(h, db, &filename) < 0)
         goto done;
-    if (lstat(filename, &st) == 0)
-        if (truncate(filename, 0) < 0){
-            clixon_err(OE_DB, errno, "truncate %s", filename);
-            goto done;
+    if (lstat(filename, &st) == 0) {
+        if (del) {
+            clixon_debug(CLIXON_DBG_DATASTORE | CLIXON_DBG_DETAIL, "unlink %s", filename);
+            if (unlink(filename) < 0) {
+                clixon_err(OE_DB, errno, "unlink %s", filename);
+                goto done;
+            }
         }
+        else {
+            if (truncate(filename, 0) < 0){
+                clixon_err(OE_DB, errno, "truncate %s", filename);
+                goto done;
+            }
+        }
+    }
     if (clicon_option_bool(h, "CLICON_XMLDB_MULTI")){
         if (xmldb_db2subdir(h, db, &subdir) < 0)
             goto done;
@@ -934,11 +951,20 @@ xmldb_delete(clixon_handle h,
             for (i = 0; i < ndp; i++){
                 cbuf_reset(cb);
                 cprintf(cb, "%s/%s", subdir, dp[i].d_name);
-                if (truncate(cbuf_get(cb), 0) < 0){
-                    clixon_err(OE_DB, errno, "truncate %s", filename);
-                    goto done;
+                if (del) {
+                    clixon_debug(CLIXON_DBG_DATASTORE | CLIXON_DBG_DETAIL, "unlink %s", cbuf_get(cb));
+                    if (unlink(cbuf_get(cb)) < 0) {
+                        clixon_err(OE_DB, errno, "unlink %s", cbuf_get(cb));
+                        goto done;
+                    }
                 }
-            }
+                else {
+                    if (truncate(cbuf_get(cb), 0) < 0){
+                        clixon_err(OE_DB, errno, "truncate %s", cbuf_get(cb));
+                        goto done;
+                    }
+                }
+             }
         }
     }
     retval = 0;

test/test_netconf_privcand.sh

@@ -645,6 +645,11 @@ if [ $? -ne 0 ]; then
     err1 "Failed: test private candidate using expect"
 fi
 
+new "Issue 631: Private candidate datastores are not deleted"
+if  ls $dir/db/candidate* >/dev/null 2>&1; then
+    err
+fi
+
 if [ $BE -ne 0 ]; then
     new "Kill backend"
     # Check if premature kill