Merge branch-2-1

diff --git a/config/Makefile.am b/config/Makefile.am
index c0015baed933d5bd81d14cd985c9d20c84ae7b61..001affa9ca0a6f15732bb0621741e2a3eec2817a 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -58,7 +58,6 @@ if USE_DEBIAN
        rm -f $(DESTDIR)/etc/default/netatalk;
 endif
 
-
 install-config-files: $(CONFFILES) $(GENFILES)
        $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
        for f in $(CONFFILES) $(GENFILES); do \
@@ -79,6 +78,16 @@ if USE_DEBIAN
        fi;
 endif
 
+if USE_DEBIAN
+       $(mkinstalldirs) $(DESTDIR)/default
+       if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f /etc/default/netatalk; then \
+               echo "$(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk"; \
+               $(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk; \
+       else \
+               echo "not overwriting /etc/default/netatalk"; \
+       fi;
+endif
+
 install-webmin:
        if test "x$(webminpath)" != "x"; then \
                if ! test -d "x$(webminpath)"; then \

diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c
index 0ceb9e09508375fe715c6282efcbe2657a323884..602953768dc88f116973d15592dcd46a801691ce 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd_scanvol.c
+++ b/etc/cnid_dbd/cmd_dbd_scanvol.c
@@ -879,9 +879,10 @@ static int dbd_readdir(int volroot, cnid_t did)
 
         /* Check for special folders in volume root e.g. ".zfs" */
         if (volroot) {
-            if ((name = check_special_dirs(ep->d_name)) != NULL)
+            if ((name = check_special_dirs(ep->d_name)) != NULL) {
                 dbd_log(LOGSTD, "Ignoring special dir \"%s\"", name);
-            continue;
+                continue;
+            }
         }
 
         /* Skip .AppleDouble dir in this loop */

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index c40c8e8c29a007356684b86baf06e6b3a02dee81..ea22816b1cce8944dc53c865e2a38b914091dc96 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dbif.c,v 1.20 2010-01-19 14:57:11 franklahm Exp $
- *
  * Copyright (C) Joerg Lenneis 2003
  * Copyright (C) Frank Lahm 2009
  * All Rights Reserved.  See COPYING.
@@ -1049,9 +1047,11 @@ int dbif_idwalk(DBD *dbd, cnid_t *cnid, int close)
     static DBT key = { 0 }, data = { 0 };
     DB *db = dbd->db_table[DBIF_CNID].db;
 
-    if (close && dbd->db_cur) {
-        dbd->db_cur->close(dbd->db_cur);
-        dbd->db_cur = NULL;
+    if (close) {
+        if (dbd->db_cur) {
+            dbd->db_cur->close(dbd->db_cur);
+            dbd->db_cur = NULL;
+        }
         return 0;
     }
 

diff --git a/etc/cnid_dbd/dbif.h b/etc/cnid_dbd/dbif.h
index c63f302170bcfd0438eec7e6f425edb2bc752e88..e2903b284b7325c01991e3f1f588115b39d1b58e 100644 (file)
--- a/etc/cnid_dbd/dbif.h
+++ b/etc/cnid_dbd/dbif.h
@@ -1,6 +1,4 @@
 /*
-  $Id: dbif.h,v 1.9 2009-12-21 06:41:09 franklahm Exp $
- 
   Copyright (C) Joerg Lenneis 2003
   Copyright (C) Frank Lahm 2009
   All Rights Reserved.  See COPYING.