BUGFIX: we convert from v_volcharset to CH_UCS, not the other way round :-(

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index a92580855e2607a9d51da4529380c0ef6469a5ee..e9da430b72b4032ab45c8fefe3ca670a408a4e07 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.45.2.2.2.4 2003-11-15 00:00:34 bfernhomberg Exp $
+ * $Id: filedir.c,v 1.45.2.2.2.5 2004-01-08 03:50:56 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -413,11 +413,11 @@ int         isdir;
 
         /* deal with case insensitive, case-preserving filesystems. */
         if ((stat(upath, st) == 0)) {
-           if ((size_t)-1 == (convert_string_allocate(CH_UCS2, vol->v_volcharset, oldname,
+           if ((size_t)-1 == (convert_string_allocate(vol->v_volcharset, CH_UCS2, oldname,
                                 strlen(oldname), (char**) &oldname_w)) ) {
                 return AFPERR_MISC; /* conversion error has already been logged */
             }
-           if ((size_t)-1 == (convert_string_allocate(CH_UCS2, vol->v_volcharset, newname, 
+           if ((size_t)-1 == (convert_string_allocate(vol->v_volcharset, CH_UCS2, newname, 
                                 strlen(newname), (char**) &newname_w)) ) {
                 free(oldname_w);
                 return AFPERR_MISC; /* conversion error has already been logged */