diff -r 91517b874a86 -r ddc4efc9b0f8 dav/sopt.c
--- a/dav/sopt.c	Thu Jul 10 13:50:00 2014 +0200
+++ b/dav/sopt.c	Fri Jul 11 12:47:24 2014 +0200
@@ -56,6 +56,7 @@
                         cmd_args_free(a);
                         return NULL;
                     }
+                    /*
                     case 'k': {
                         if(!option) {
                             option = "key";
@@ -70,56 +71,13 @@
                         }
                         break;
                     }
-                    case 'p': {
-                        ucx_map_cstr_put(a->options, "plain", "");
-                        break;
-                    }
+                    */
                     case 'c': {
-                        ucx_map_cstr_put(a->options, "crypt", "");
-                        break;
-                    }
-                    case 'a': {
-                        ucx_map_cstr_put(a->options, "all", "");
-                        break;
-                    }
-                    case 'l': {
-                        ucx_map_cstr_put(a->options, "list", "");
-                        break;
-                    }
-                    case 't': {
-                        ucx_map_cstr_put(a->options, "type", "");
-                        break;
-                    }
-                    case 'R': {
-                        ucx_map_cstr_put(a->options, "recursive", "");
+                        ucx_map_cstr_put(a->options, "conflict", "");
                         break;
                     }
-                    case 'o': {
-                        if(!option) {
-                            option = "output";
-                            optchar = 'o';
-                        } else {
-                            fprintf(
-                                    stderr,
-                                    "Missing argument for option -%c\n",
-                                    optchar);
-                            cmd_args_free(a);
-                            return NULL;
-                        }
-                        break;
-                    }
-                    case 'u': {
-                        if(!option) {
-                            option = "update";
-                            optchar = 'u';
-                        } else {
-                            fprintf(
-                                    stderr,
-                                    "Missing argument for option -%c\n",
-                                    optchar);
-                            cmd_args_free(a);
-                            return NULL;
-                        }
+                    case 'r': {
+                        ucx_map_cstr_put(a->options, "read", "");
                         break;
                     }
                 }