Merge master

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

diff --git a/etc/afpd/uam_auth.h b/etc/afpd/uam_auth.h
index eedc600371801a862da8c32b517aee3ad87264a7..a553ffabff4aaac03c3f787c4e42b77d27c69a39 100644 (file)
--- a/etc/afpd/uam_auth.h
+++ b/etc/afpd/uam_auth.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
+/*
+ * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  *
  * interface between uam.c and auth.c
@@ -7,34 +8,35 @@
 #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;
-  struct uam_export *uam_fcn;
-  struct uam_mod *uam_prev, *uam_next;
+    void *uam_module;
+    struct uam_export *uam_fcn;
+    struct uam_mod *uam_prev, *uam_next;
 };
 
 struct uam_obj {
-  const char *uam_name; /* authentication method */
-  char *uam_path; /* where it's located */
-  int uam_count;
-  union {
-    struct {
-      int (*login) __P((void *, struct passwd **, 
-                       char *, int, char *, int *));
-      int (*logincont) __P((void *, struct passwd **, char *,
-                           int, char *, int *));
-      void (*logout) __P((void));
-    } uam_login;
-    int (*uam_changepw) __P((void *, char *, struct passwd *, char *,
-                            int, char *, int *));
-  } u;
-  struct uam_obj *uam_prev, *uam_next;
+    const char *uam_name; /* authentication method */
+    char *uam_path; /* where it's located */
+    int uam_count;
+    union {
+        struct {
+            int (*login) (void *, struct passwd **,
+                              char *, int, char *, size_t *);
+            int (*logincont) (void *, struct passwd **, char *,
+                                  int, char *, size_t *);
+            void (*logout) (void);
+            int (*login_ext) (void *, char *, struct passwd **,
+                              char *, int, char *, size_t *);
+        } uam_login;
+        int (*uam_changepw) (void *, char *, struct passwd *, char *,
+                                 int, char *, size_t *);
+    } u;
+    struct uam_obj *uam_prev, *uam_next;
 };
 
 #define uam_attach(a, b) do { \
@@ -49,15 +51,17 @@ struct uam_obj {
     (a)->uam_next->uam_prev = (a)->uam_prev; \
 } while (0)
 
-
-extern struct uam_mod *uam_load __P((const char *, const char *));
-extern void uam_unload __P((struct uam_mod *));
+extern struct uam_mod *uam_load (const char *, const char *);
+extern void uam_unload (struct uam_mod *);
 
 /* auth.c */
-int auth_load __P((const char *, const char *));
-int auth_register __P((const int, struct uam_obj *));
+int auth_load (const char *, const char *);
+int auth_register (const int, struct uam_obj *);
 #define auth_unregister(a) uam_detach(a)
-struct uam_obj *auth_uamfind __P((const int, const char *, const int));
-void auth_unload __P((void));
+struct uam_obj *auth_uamfind (const int, const char *, const int);
+void auth_unload (void);
+
+/* uam.c */
+int uam_random_string (AFPObj *,char *, int);
 
 #endif /* uam_auth.h */