Fix fce merge conflict

[netatalk.git] / etc / cnid_dbd / pack.c

diff --git a/etc/cnid_dbd/pack.c b/etc/cnid_dbd/pack.c
index 7350f8032595d19b54174d6313620ee3db7592e8..2612469415eaa5582d71712bca82dc5b63c33770 100644 (file)
--- a/etc/cnid_dbd/pack.c
+++ b/etc/cnid_dbd/pack.c
@@ -22,7 +22,7 @@
 #include <atalk/cnid_dbd_private.h>
 #include "pack.h"
 
-/* in main.c */
+/* in main.c for `cnid_dbd` or cmd_dbd.c for `dbd` */
 extern struct volinfo volinfo;
 
 /* --------------- */
@@ -78,10 +78,9 @@ int devino(DB *dbp _U_, const DBT *pkey _U_,  const DBT *pdata, DBT *skey)
 /* --------------- */
 int idxname(DB *dbp _U_, const DBT *pkey _U_,  const DBT *pdata, DBT *skey)
 {
-    char buffer[MAXPATHLEN +2];
+    static char buffer[MAXPATHLEN +2];
     uint16_t flags = CONV_TOLOWER;
     memset(skey, 0, sizeof(DBT));
-    skey->data = (char *)pdata->data + CNID_NAME_OFS;
 
     if (convert_charset(volinfo.v_volcharset,
                         volinfo.v_volcharset,