From ac16f380e349fa39ec7e26bccb5456cb300006a5 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 14 Sep 1997 17:50:06 +0000
Subject: Pull in sources from zephyr locker.  See /mit/zephyr/repository for
 detailed change information.

---
 server/access.h | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

(limited to 'server/access.h')

diff --git a/server/access.h b/server/access.h
index df1201d..32507e3 100644
--- a/server/access.h
+++ b/server/access.h
@@ -17,36 +17,28 @@
 
 #include <zephyr/mit-copyright.h>
 
-#include <zephyr/acl.h>
+#include "acl.h"
 #include "zstring.h"
-#include "unix.h"
-
-typedef	enum _ZAccess_t {
-	TRANSMIT,			/* use transmission acl */
-	SUBSCRIBE,			/* use subscription acl */
-	INSTWILD,			/* use instance wildcard acl */
-	INSTUID				/* use instance UID identity acl */
-} ZAccess_t;
-
-typedef struct _ZAcl_t {
-  char *acl_filename;
-  int	acl_types;	/* Flag field indcating which acls
-			   are present.  Used ONLY in access.c */
-} ZAcl_t;
-
-#ifdef __STDC__
-# define        P(s) s
-#else
-# define P(s) ()
-#endif
+
+typedef	enum _Access {
+    TRANSMIT,			/* use transmission acl */
+    SUBSCRIBE,			/* use subscription acl */
+    INSTWILD,			/* use instance wildcard acl */
+    INSTUID				/* use instance UID identity acl */
+} Access;
+
+typedef struct _Acl {
+    char *acl_filename;
+    int	acl_types;		/* Internal; access fields present. */
+} Acl;
 
 /* found in access.c */
-extern void access_init P((void)), access_reinit P((void));
+void access_init __P((void));
+void access_reinit __P((void));
 
 /* found in acl_files.c */
-extern int acl_load P((char *));
-
-#undef P
+int acl_load __P((char *));
 
 /* external data relevant */
 extern int zdebug;
+
-- 
cgit v1.2.3