comerr: Fix a couple of libtool problems

[openafs.git] / src / aklog / aklog.h

diff --git a/src/aklog/aklog.h b/src/aklog/aklog.h
index 0b6b947..311828d 100644 (file)
--- a/src/aklog/aklog.h
+++ b/src/aklog/aklog.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * $Id$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology
@@ -8,14 +8,10 @@
 #ifndef __AKLOG_H__
 #define __AKLOG_H__
 
-#if !defined(lint) && !defined(SABER)
-static char *rcsid_aklog_h = "$Id$";
-#endif /* lint || SABER */
+#include <afsconfig.h>
 
 #include <krb5.h>
-#include <kerberosIV/krb.h>
 #include "linked_list.h"
-#include <afsconfig.h>
 
 #ifdef __STDC__
 #define ARGS(x) x
@@ -23,50 +19,59 @@ static char *rcsid_aklog_h = "$Id$";
 #define ARGS(x) ()
 #endif /* __STDC__ */
 
-typedef struct {
-    int (*readlink)ARGS((char *, char *, size_t));
-    int (*isdir)ARGS((char *, unsigned char *));
-    char *(*getwd)ARGS((char *));
-    int (*get_cred)ARGS((krb5_context, char *, char *, char *, CREDENTIALS *,
-               krb5_creds **));
-    int (*get_user_realm)ARGS((krb5_context, char *));
-    void (*pstderr)ARGS((char *));
-    void (*pstdout)ARGS((char *));
-    void (*exitprog)ARGS((char));
-} aklog_params;
-
 void aklog ARGS((int, char *[]));
-void aklog_init_params ARGS((aklog_params *));
 
-#ifdef WINDOWS
 /*
- * Complete server info for one cell.
- *
- * Normally this is defined in afs/cellconfig.h, but the Windows header
- * files and API don't use this structure. So, I'll include it here so
- * I don't have to rewrite large chunks of code.
+ * If we have krb.h, use the definition of CREDENTIAL from there.  Otherwise,
+ * inline it.  When we inline it we're using the inline definition from the
+ * Heimdal sources (since Heimdal doesn't include a definition of struct
+ * credentials with the sources
  */
-#define MAXCELLCHARS    64
-#define MAXHOSTCHARS    64
-#define MAXHOSTSPERCELL  8
 
-struct afsconf_cell {
-    char name[MAXCELLCHARS];        /* Cell name */
-    short numServers;               /* Num active servers for the cell*/
-    short flags;                    /* useful flags */
-    struct sockaddr_in hostAddr[MAXHOSTSPERCELL];
-                                   /* IP addresses for cell's servers*/
-    char hostName[MAXHOSTSPERCELL][MAXHOSTCHARS];       
-                                    /* Names for cell's servers */
-    char *linkedCell;               /* Linked cell name, if any */
-};
+#ifdef HAVE_KERBEROSIV_KRB_H
+#include <kerberosIV/krb.h>
+#else /* HAVE_KERBEROSIV_KRB_H */
+
+#ifndef MAX_KTXT_LEN
+#define MAX_KTXT_LEN 1250
+#endif /* MAX_KTXT_LEN */
+#ifndef ANAME_SZ
+#define ANAME_SZ 40
+#endif /* ANAME_SZ */
+#ifndef REALM_SZ
+#define REALM_SZ 40
+#endif /* REALM_SZ */
+#ifndef SNAME_SZ
+#define SNAME_SZ 40
+#endif /* SNAME_SZ */
+#ifndef INST_SZ
+#define INST_SZ 40
+#endif /* INST_SZ */
 
-/* Windows krb5 libraries don't seem to have this call */
-#define krb5_xfree(p)  free(p)
+#ifndef u_int32_t
+#define u_int32_t uint32_t
+#endif
 
-/* Title for dialog boxes */
-#define AKLOG_DIALOG_NAME              "aklog"
+struct ktext {
+    unsigned int length;
+    unsigned char dat[MAX_KTXT_LEN];
+    afs_uint32 mbz;
+};
+
+struct credentials {
+    char    service[ANAME_SZ];
+    char    instance[INST_SZ];
+    char    realm[REALM_SZ];
+    char    session[8];
+    int     lifetime;
+    int     kvno;
+    struct ktext ticket_st;
+    int32_t    issue_date;
+    char    pname[ANAME_SZ];
+    char    pinst[INST_SZ];
+};
 
-#endif /* WINDOWS */
+typedef struct credentials CREDENTIALS;
+#endif /* ! HAVE_KERBEROSIV_KRB_H */
 
 #endif /* __AKLOG_H__ */