import zephyr 3.0~rc2544

[1ts-debian.git] / zephyr / server / zserver.h

diff --git a/zephyr/server/zserver.h b/zephyr/server/zserver.h
index 36cfc2ab5e979e35f2ddaea7bb6947fc48579b59..d6f9464288a08cf2e397c2c01c8c82a2f8116afe 100644 (file)
--- a/zephyr/server/zserver.h
+++ b/zephyr/server/zserver.h
@@ -5,19 +5,17 @@
  *
  *     Created by:     John T. Kohl
  *
- *     $Id: zserver.h 2422 2009-04-14 12:57:11Z kcr@ATHENA.MIT.EDU $
+ *     $Id: zserver.h 2525 2009-08-09 18:42:31Z kcr@ATHENA.MIT.EDU $
  *
  *     Copyright (c) 1987,1988,1991 by the Massachusetts Institute of Technology.
  *     For copying and distribution information, see the file
- *     "mit-copyright.h". 
+ *     "mit-copyright.h".
  */
 
 #include <zephyr/mit-copyright.h>
 
 #include <internal.h>
 
-#include <com_err.h>
-
 #include <arpa/inet.h>
 
 #include "zsrv_err.h"
@@ -36,7 +34,6 @@
 extern krb5_keyblock *__Zephyr_keyblock;
 #define ZGetSession() (__Zephyr_keyblock)
 void ZSetSession(krb5_keyblock *keyblock);
-Code_t ZFormatAuthenticNoticeV5(ZNotice_t*, char*, int, int*, krb5_keyblock *);
 krb5_error_code Z_krb5_init_keyblock(krb5_context, krb5_enctype, size_t,
         krb5_keyblock **);
 #endif
@@ -106,7 +103,7 @@ struct _ZRealm {
     int idx;                           /* which server we are connected to */
     Destlist *subs;                     /* what their clients sub to */
     Destlist *remsubs;                  /* our subs on their end */
-    Client *client;                     
+    Client *client;
     int child_pid;
     int have_tkt;
     ZRealm_state state;
@@ -222,7 +219,7 @@ struct _Statistic {
        (*head) = (elem);                                       \
        (elem)->prev_p = (head);                                \
     }
-       
+
 #define MAKE_LIST_DELETE(type) inline static void type##_delete(type *elem) \
     {\
        *(elem)->prev_p = (elem)->next;                         \
@@ -231,10 +228,10 @@ struct _Statistic {
 
 MAKE_LIST_INSERT(Destlist);
 MAKE_LIST_DELETE(Destlist);
-MAKE_LIST_INSERT(Client);      
-MAKE_LIST_DELETE(Client);      
-MAKE_LIST_INSERT(Triplet);     
-MAKE_LIST_DELETE(Triplet);     
+MAKE_LIST_INSERT(Client);
+MAKE_LIST_DELETE(Client);
+MAKE_LIST_INSERT(Triplet);
+MAKE_LIST_DELETE(Triplet);
 MAKE_LIST_INSERT(Unacked);
 MAKE_LIST_DELETE(Unacked);
 
@@ -256,10 +253,10 @@ int ZDest_eq(Destination *d1, Destination *d2);
 Code_t triplet_register(Client *client, Destination *dest, ZRealm *realm);
 Code_t triplet_deregister(Client *client, Destination *dest,
                               ZRealm *realm);
-Code_t class_restrict(char *class, Acl *acl);
-Code_t class_setup_restricted(char *class, Acl *acl);
+Code_t class_restrict(char *class_name, Acl *acl);
+Code_t class_setup_restricted(char *class_name, Acl *acl);
 Client **triplet_lookup(Destination *dest);
-Acl *class_get_acl(String *class);
+Acl *class_get_acl(String *class_name);
 int dest_eq(Destination *d1, Destination *d2);
 int order_dest_strings(Destination *d1, Destination *d2);
 void triplet_dump_subs(FILE *fp);
@@ -277,6 +274,7 @@ Code_t client_send_clients(void);
 char *strsave(const char *str);
 unsigned long hash (const char *);
 void dump_quote(char *p, FILE *fp);
+void notice_extract_address(ZNotice_t *notice, struct sockaddr_in *addr);
 
 /* found in dispatch.c */
 void handle_packet(void);
@@ -295,7 +293,7 @@ Code_t xmit_frag(ZNotice_t *notice, char *buf, int len, int waitforack);
 void hostm_shutdown(void);
 
 /* found in kstuff.c */
-Code_t ZCheckRealmAuthentication(ZNotice_t *, struct sockaddr_in *, char *);
+Code_t ZCheckSrvAuthentication(ZNotice_t *notice, struct sockaddr_in *from, char *realm);
 #if defined(HAVE_KRB4) || defined(HAVE_KRB5)
 Code_t ReadKerberosData(int, int *, char **, int *);
 void sweep_ticket_hash_table(void *);
@@ -308,7 +306,7 @@ Code_t SendKerberosData (int, KTEXT, char *, char *);
 Code_t SendKrb5Data(int, krb5_data *);
 Code_t GetKrb5Data(int, krb5_data *);
 #endif
-    
+
 /* found in server.c */
 void server_timo(void *which);
 void server_dump_servers(FILE *fp);