lib/thread: rewrite _parent_or_toplevel to use depths

[notmuch] / lib / indexopts.c

diff --git a/lib/indexopts.c b/lib/indexopts.c
index 78f533916f2a995f0da70df25ec42812caff4ef9..b78a57b6840996d524e1cdcc9fade0609876f5d2 100644 (file)
--- a/lib/indexopts.c
+++ b/lib/indexopts.c
@@ -26,18 +26,25 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db)
     notmuch_indexopts_t *ret = talloc_zero (db, notmuch_indexopts_t);
     if (!ret)
        return ret;
-    ret->crypto.decrypt = NOTMUCH_DECRYPT_FALSE;
+    ret->crypto.decrypt = NOTMUCH_DECRYPT_AUTO;
 
     char * decrypt_policy;
     notmuch_status_t err = notmuch_database_get_config (db, "index.decrypt", &decrypt_policy);
     if (err)
        return ret;
 
-    if (decrypt_policy &&
-       ((!(strcasecmp(decrypt_policy, "true"))) ||
-        (!(strcasecmp(decrypt_policy, "yes"))) ||
-        (!(strcasecmp(decrypt_policy, "1")))))
-       notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_TRUE);
+    if (decrypt_policy) {
+       if ((!(strcasecmp(decrypt_policy, "true"))) ||
+           (!(strcasecmp(decrypt_policy, "yes"))) ||
+           (!(strcasecmp(decrypt_policy, "1"))))
+           notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_TRUE);
+       else if ((!(strcasecmp(decrypt_policy, "false"))) ||
+                (!(strcasecmp(decrypt_policy, "no"))) ||
+                (!(strcasecmp(decrypt_policy, "0"))))
+           notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_FALSE);
+       else if (!strcasecmp(decrypt_policy, "nostash"))
+           notmuch_indexopts_set_decrypt_policy (ret, NOTMUCH_DECRYPT_NOSTASH);
+    }
 
     free (decrypt_policy);
     return ret;