From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 11 Apr 2012 08:26:52 +0000 (+0200)
Subject: Merge branch 'develop' into ad_set
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=b3c52ea7097b09cafe6002acca2c996f1f5ea2fb

Merge branch 'develop' into ad_set
---

b3c52ea7097b09cafe6002acca2c996f1f5ea2fb
diff --cc bin/ad/ad.c
index 3433e1b6,883378f5..083bb62a
--- a/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;