From: Alexander Barton <alex@barton.de>
Date: Thu, 10 Jul 2014 22:59:44 +0000 (+0200)
Subject: Merge branch 'v3-cleanup' into v3.1.3-alex
X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=commitdiff_plain;h=refs%2Fheads%2Fv3.1.3-alex

Merge branch 'v3-cleanup' into v3.1.3-alex

* v3-cleanup:
  autoconf: Indentation fixes
  Spelling fixes
  Whitespace and exclamation mark fixes
  Reset version to 3.0.1 after merge
  sorry. revert...
  fix --enable-fhs

Conflicts:
	VERSION
	etc/afpd/main.c

Signed-off-by: Alexander Barton <alex@barton.de>
---

80b657d2448a51f80912a9195bdf56eb85e461b5
diff --cc VERSION
index 711ee4f5,13d683cc..781a07bb
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 3.1.3
 -3.0.1
++3.1.3-ab
diff --cc libatalk/cnid/dbd/cnid_dbd.c
index d4606400,c96a2259..09cf9ead
--- a/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@@ -487,10 -510,10 +487,10 @@@ cnid_dbd_open_fail
  /* ---------------------- */
  void cnid_dbd_close(struct _cnid_db *cdb)
  {
 -    CNID_private *db;
 +    CNID_bdb_private *db;
  
      if (!cdb) {
-         LOG(log_error, logtype_cnid, "cnid_close called with NULL argument !");
+         LOG(log_error, logtype_cnid, "cnid_close called with NULL argument!");
          return;
      }