Merge master

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

diff --git a/etc/afpd/afp_util.c b/etc/afpd/afp_util.c
index 970a93a5d9bb7bba7be98eed5871658c02b7e297..a8282c22b3fb38e57a4ddb94af1e529004a7022f 100644 (file)
--- a/etc/afpd/afp_util.c
+++ b/etc/afpd/afp_util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_util.c,v 1.9 2010-01-18 12:55:28 franklahm Exp $
+ * $Id: afp_util.c,v 1.10 2010-01-23 14:44:42 franklahm Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -15,7 +15,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <atalk/afp.h>
-#include "globals.h"
+#include <atalk/globals.h>
 
 const char *AfpNum2name(int num)
 {
@@ -122,6 +122,8 @@ const char *AfpErr2name(int err)
         AFPERR2NAME(AFPERR_FLATVOL);
         AFPERR2NAME(AFPERR_NOITEM);
         AFPERR2NAME(AFPERR_LOCK);
+        AFPERR2NAME(AFPERR_MISC);
+        AFPERR2NAME(AFPERR_NLOCK);
         AFPERR2NAME(AFPERR_NOSRVR);
         AFPERR2NAME(AFPERR_EXIST);
         AFPERR2NAME(AFPERR_NOOBJ);
@@ -148,6 +150,8 @@ const char *AfpErr2name(int err)
         AFPERR2NAME(AFPERR_BADID);
         AFPERR2NAME(AFPERR_PWDSAME);
         AFPERR2NAME(AFPERR_PWDSHORT);
+        AFPERR2NAME(AFPERR_PWDEXPR);
+        AFPERR2NAME(AFPERR_INSHRD);
         AFPERR2NAME(AFPERR_INTRASH);
         AFPERR2NAME(AFPERR_PWDCHNG);
         AFPERR2NAME(AFPERR_PWDPOLCY);