Merge branch-2-1

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

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 0737c07f83590e791295ffdf55113aeb1fefa41a..6027b8515850760ec8f4274907ae3be95b70e19a 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -26,9 +26,6 @@
 #include <time.h>
 #include <pwd.h>
 #include <grp.h>
-#include <atalk/logger.h>
-#include <atalk/server_ipc.h>
-#include <atalk/uuid.h>
 
 #ifdef TRU64
 #include <netdb.h>
@@ -39,6 +36,10 @@
 extern void afp_get_cmdline( int *ac, char ***av );
 #endif /* TRU64 */
 
+#include <atalk/logger.h>
+#include <atalk/server_ipc.h>
+#include <atalk/uuid.h>
+
 #include "globals.h"
 #include "auth.h"
 #include "uam_auth.h"
@@ -1006,25 +1007,20 @@ int afp_getuserinfo(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf,
             memcpy(bitmapp, &bitmap, sizeof(bitmap));
         } else {
             LOG(log_debug, logtype_afpd, "afp_getuserinfo: get UUID for \'%s\'", obj->username);
-#ifdef HAVE_ACLS
             int ret;
             atalk_uuid_t uuid;
-            char *uuidstring;
             ret = getuuidfromname( obj->username, UUID_USER, uuid);
             if (ret != 0) {
                 LOG(log_info, logtype_afpd, "afp_getuserinfo: error getting UUID !");
                 return AFPERR_NOITEM;
             }
-            if (0 == (uuid_bin2string( uuid, &uuidstring))) {
-                LOG(log_debug, logtype_afpd, "afp_getuserinfo: got UUID: %s", uuidstring);
-                free(uuidstring);
-            }
+            LOG(log_debug, logtype_afpd, "afp_getuserinfo: got UUID: %s", uuid_bin2string(uuid));
+
             memcpy(rbuf, uuid, UUID_BINSIZE);
             rbuf += UUID_BINSIZE;
             *rbuflen += UUID_BINSIZE;
         }
     }
-#endif /* HAVE_ACLS */
 
     LOG(log_debug, logtype_afpd, "END afp_getuserinfo:");
     return AFP_OK;