From: franklahm <franklahm>
Date: Fri, 16 Apr 2010 18:28:45 +0000 (+0000)
Subject: Check for volume specific CNID config before LOGging it
X-Git-Tag: netatalk-2-1~15
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=3d8cd70cdcb477809a5625fd7cfe565f8517d6d1

Check for volume specific CNID config before LOGging it
---

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 786c5809..f43d65c4 100644
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.126 2010-04-10 08:24:54 franklahm Exp $
+ * $Id: volume.c,v 1.127 2010-04-16 18:28:45 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -1839,7 +1839,9 @@ static int volume_openDB(struct vol *volume)
         LOG(log_info, logtype_afpd, "Volume %s use CNID scheme %s.", volume->v_path, volume->v_cnidscheme);
     }
 
-    LOG(log_info, logtype_afpd, "%s:%s", volume->v_cnidserver, volume->v_cnidport);
+    LOG(log_info, logtype_afpd, "%s:%s",
+        volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv,
+        volume->v_cnidport ? volume->v_cnidport : Cnid_port);
     
     volume->v_cdb = cnid_open(volume->v_dbpath ? volume->v_dbpath : volume->v_path,
                               volume->v_umask,