Merge branch 'develop' of netafp.com:git/netatalk into develop

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

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index 8adfb3bbd9539a9e3daa1b9b9e6f4a871862a269..d99d381edd38cc4408a5076039ef47f53d4e7899 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -30,13 +30,12 @@
 #include <atalk/afp.h>
 #include <atalk/util.h>
 #include <atalk/globals.h>
+#include <atalk/volume.h>
 
 #include "afp_config.h"
 #include "auth.h"
 #include "uam_auth.h"
 
-#define utf8_encoding() (afp_version >= 30)
-
 #ifdef TRU64
 #include <netdb.h>
 #include <sia.h>
@@ -233,7 +232,7 @@ struct passwd *uam_getname(void *private, char *name, const int len)
     }
 #ifndef NO_REAL_USER_NAME
 
-    if ( (size_t) -1 == (namelen = convert_string((utf8_encoding())?CH_UTF8_MAC:obj->options.maccharset,
+    if ( (size_t) -1 == (namelen = convert_string((utf8_encoding(obj))?CH_UTF8_MAC:obj->options.maccharset,
                                CH_UCS2, name, -1, username, sizeof(username))))
        return NULL;
 
@@ -372,7 +371,7 @@ int uam_afpserver_option(void *private, const int what, void *option,
         break;
 
     case UAM_OPTION_SIGNATURE:
-        *buf = (void *) (((AFPConfig *)obj->config)->signature);
+        *buf = (void *)obj->dsi->signature;
         if (len)
             *len = 16;
         break;
@@ -390,10 +389,6 @@ int uam_afpserver_option(void *private, const int what, void *option,
             *len = strlen(obj->options.hostname);
         break;
 
-    case UAM_OPTION_PROTOCOL:
-        *((int *) option) = obj->proto;
-        break;
-        
     case UAM_OPTION_CLIENTNAME:
     {
         struct DSI *dsi = obj->dsi;