Merge branch 'develop' into ad_set

diff --cc bin/ad/ad.c
index 3433e1b624c692340ae3f2e81c5cba7093a64a26,883378f58f68b2217feccb8c805f6df2883148b1..083bb62ae3905f0562706ea06dc986e92b5e6902
--- 1/bin/ad/ad.c
--- 2/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@@ -53,11 -55,9 +53,11 @@@ int main(int argc, char **argv
          return 1;
      }
  
-     if (afp_config_parse(&obj) != 0)
+     if (afp_config_parse(&obj, "") != 0)
          return 1;
  
 +    setuplog("default:note", "/dev/tty");
 +
      if (load_volumes(&obj, NULL) != 0)
          return 1;