Merge master

[netatalk.git] / etc / afpd / uam_auth.h

diff --git a/etc/afpd/uam_auth.h b/etc/afpd/uam_auth.h
index 07669b0fcb950536331ec0c8695e42d3ca2e680e..a553ffabff4aaac03c3f787c4e42b77d27c69a39 100644 (file)
--- a/etc/afpd/uam_auth.h
+++ b/etc/afpd/uam_auth.h
@@ -1,6 +1,4 @@
 /*
- * $Id: uam_auth.h,v 1.6 2009-10-13 22:55:37 didg Exp $
- *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  *
@@ -10,11 +8,10 @@
 #ifndef AFPD_UAM_AUTH_H
 #define AFPD_UAM_AUTH_H 1
 
-#include <sys/cdefs.h>
 #include <pwd.h>
 
 #include <atalk/uam.h>
-#include "globals.h"
+#include <atalk/globals.h>
 
 struct uam_mod {
     void *uam_module;
@@ -29,15 +26,15 @@ struct uam_obj {
     union {
         struct {
             int (*login) (void *, struct passwd **,
-                              char *, int, char *, int *);
+                              char *, int, char *, size_t *);
             int (*logincont) (void *, struct passwd **, char *,
-                                  int, char *, int *);
+                                  int, char *, size_t *);
             void (*logout) (void);
             int (*login_ext) (void *, char *, struct passwd **,
-                              char *, int, char *, int *);
+                              char *, int, char *, size_t *);
         } uam_login;
         int (*uam_changepw) (void *, char *, struct passwd *, char *,
-                                 int, char *, int *);
+                                 int, char *, size_t *);
     } u;
     struct uam_obj *uam_prev, *uam_next;
 };