Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / bin / ad / ad.c

diff --git a/bin/ad/ad.c b/bin/ad/ad.c
index 078989fca081f8ac2a793ee666ecf3b15b75b5c8..3de3030b9a820bbde3c53caef74a27ac1b769482 100644 (file)
--- a/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@ -48,17 +48,17 @@ int main(int argc, char **argv)
 {
     AFPObj obj = { 0 };
 
-    setuplog("default:note", "/dev/tty");
-
     if (argc < 2) {
         usage_main();
         return 1;
     }
 
-    if (afp_config_parse(&obj) != 0)
+    if (afp_config_parse(&obj, "ad") != 0)
         return 1;
 
-    if (load_volumes(&obj, NULL) != 0)
+    setuplog("default:note", "/dev/tty");
+
+    if (load_volumes(&obj) != 0)
         return 1;
 
     if (STRCMP(argv[1], ==, "ls"))
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
     else if (STRCMP(argv[1], ==, "mv"))
         return ad_mv(argc, argv, &obj);
     else if (STRCMP(argv[1], ==, "set"))
-        return ad_set(argc, argv, &obj);
+        return ad_set(argc - 1, argv + 1, &obj);
     else if (STRCMP(argv[1], ==, "find"))
         return ad_find(argc, argv, &obj);
     else if (STRCMP(argv[1], ==, "-v")) {