added new type logtype_afpd

[netatalk.git] / etc / afpd / directory.c

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 9842001b37165e062534217079d7c87d05cc0c99..414ca4358093a56f239c394a618aec8a1aacfb11 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.22 2001-12-29 08:22:23 jmarcus Exp $
+ * $Id: directory.c,v 1.28 2002-03-24 01:23:40 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,7 +12,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <sys/syslog.h>
+#include <atalk/logger.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -456,11 +456,11 @@ static int deletedir(char *dir)
                     continue; /* somebody went and deleted it behind our backs. */
                 case EROFS:
                     err = AFPERR_VLOCK;
-                                       break;
+                    break;
                 case EPERM:
                 case EACCES :
                     err = AFPERR_ACCESS;
-                                       break;
+                    break;
                 default :
                     err = AFPERR_PARAM;
                 }
@@ -1228,8 +1228,8 @@ int setdirparams(const struct vol *vol,
                     goto setdirparam_done;
                     break;
                 default :
-                    syslog( LOG_ERR, "setdirparam: setdeskowner: %s",
-                            strerror(errno) );
+                    LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %s",
+                        strerror(errno) );
                     if (!isad) {
                         err = AFPERR_PARAM;
                         goto setdirparam_done;
@@ -1249,8 +1249,8 @@ int setdirparams(const struct vol *vol,
                     goto setdirparam_done;
                     break;
                 default :
-                    syslog( LOG_ERR, "setdirparam: setdirowner: %s",
-                            strerror(errno) );
+                    LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s",
+                        strerror(errno) );
                     break;
                 }
             }
@@ -1273,7 +1273,7 @@ int setdirparams(const struct vol *vol,
                 goto setdirparam_done;
                 break;
             default :
-                syslog( LOG_ERR, "setdirparam: setdeskowner: %m" );
+                LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %m" );
                 if (!isad) {
                     err = AFPERR_PARAM;
                     goto setdirparam_done;
@@ -1294,8 +1294,8 @@ int setdirparams(const struct vol *vol,
                     goto setdirparam_done;
                     break;
                 default :
-                    syslog( LOG_ERR, "setdirparam: setdirowner: %s",
-                            strerror(errno) );
+                    LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s",
+                        strerror(errno) );
                     break;
                 }
             }
@@ -1319,8 +1319,8 @@ int setdirparams(const struct vol *vol,
                 err = AFPERR_VLOCK;
                 goto setdirparam_done;
             default :
-                syslog( LOG_ERR, "setdirparam: setdeskmode: %s",
-                        strerror(errno) );
+                LOG(log_error, logtype_afpd, "setdirparam: setdeskmode: %s",
+                    strerror(errno) );
                 break;
                 err = AFPERR_PARAM;
                 goto setdirparam_done;
@@ -1339,8 +1339,8 @@ int setdirparams(const struct vol *vol,
                 err = AFPERR_VLOCK;
                 goto setdirparam_done;
             default :
-                syslog( LOG_ERR, "setdirparam: setdirmode: %s",
-                        strerror(errno) );
+                LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s",
+                    strerror(errno) );
                 err = AFPERR_PARAM;
                 goto setdirparam_done;
             }
@@ -1424,13 +1424,12 @@ int             ibuflen, *rbuflen;
         }
     }
 
-    /* check for illegal bits */
-    if ((vol->v_flags & AFPVOL_MSWINDOWS) &&
-            strpbrk(path, MSWINDOWS_BADCHARS))
-        return AFPERR_PARAM;
-
     upath = mtoupath(vol, path);
 
+    /* check for illegal bits in the unix filename */
+    if (!wincheck(vol, upath))
+        return AFPERR_PARAM;
+
     if ((vol->v_flags & AFPVOL_NOHEX) && strchr(upath, '/'))
         return AFPERR_PARAM;
 
@@ -1577,7 +1576,7 @@ const int noadouble;
 
 renamedir_done:
     if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) {
-        syslog( LOG_ERR, "renamedir: realloc: %s", strerror(errno) );
+        LOG(log_error, logtype_afpd, "renamedir: realloc: %s", strerror(errno) );
         return AFPERR_MISC;
     }
     dir->d_name = buf;