Build without krb4 if it's unavailable.

[moira.git] / include / moira.h

diff --git a/include/moira.h b/include/moira.h
index 5b6955f5144ceb7f23243911f32b3ac915d838b4..2dc606ee07e69ed692d8e3ab844e99808195ed3b 100644 (file)
--- a/include/moira.h
+++ b/include/moira.h
@@ -7,14 +7,24 @@
 #ifndef _moira_h_
 #define _moira_h_
 
-/* return values from queries (and error codes) */
+#ifdef _WIN32
+#include <windows.h>
+#ifndef strcasecmp
+#define strcasecmp      stricmp
+#endif
+#ifndef snprintf
+#define snprintf      _snprintf
+#endif
+#endif /*_WIN32 */
 
+/* return values from queries (and error codes) */
+#include <stdlib.h>
 #include <sys/types.h>
 #include <com_err.h>
 #include "mr_et.h"
 #include "krb_et.h"
-#include "gdss_et.h"
 #include "ureg_err.h"
+
 #define MR_SUCCESS 0           /* Query was successful */
 
 #define MR_VERSION_1 1         /* Version in use from 7/87 to 4/88 */
@@ -38,7 +48,8 @@
 #define MR_MOTD 6
 #define MR_PROXY 7
 #define MR_SETVERSION 8
-#define MR_MAX_PROC 8
+#define MR_KRB5_AUTH 9
+#define MR_MAX_PROC 9
 
 /* values used in NFS physical flags */
 #define MR_FS_STUDENT  0x0001
@@ -81,7 +92,7 @@ char *canonicalize_hostname(char *s);
 
 /* prototypes from fixname.c */
 void FixName(char *ilnm, char *ifnm, char *last, char *first, char *middle);
-void FixCase(char *p);
+void FixCase(unsigned char *p);
 void LookForJrAndIII(char *nm, int *pends_jr, int *pends_sr,
                     int *pends_ii, int *pends_iii,
                     int *pends_iv, int *pends_v);
@@ -91,9 +102,6 @@ void TrimTrailingSpace(char *ip);
 void GetMidInit(char *nm, char *mi);
 void RemoveHyphens(char *str);
 
-/* prototypes from gdss_convert.c */
-int gdss2et(int code);
-
 /* prototypes from hash.c */
 struct hash *create_hash(int size);
 void *hash_lookup(struct hash *h, int key);
@@ -105,7 +113,10 @@ void hash_step(struct hash *h, void (*callback)(int, void *, void *),
 void hash_destroy(struct hash *h);
 
 /* prototypes from kname_unparse.c */
-char *kname_unparse(char *p, char *i, char *r);
+char *mr_kname_unparse(char *p, char *i, char *r);
+
+/* prototypes from kname_parse.c */
+int mr_kname_parse(char *np, char *ip, char *rp, char *fullname);
 
 /* prototypes from nfsparttype.c */
 char *parse_filesys_type(char *fs_type_name);
@@ -129,6 +140,7 @@ void sq_destroy(struct save_queue *sq);
 char *strtrim(char *s);
 char *uppercase(char *s);
 char *lowercase(char *s);
+
 #ifndef HAVE_STRLCPY
 size_t strlcpy(char *dst, const char *src, size_t size);
 #endif
@@ -156,7 +168,7 @@ int mr_version(int version);
 
 
 #ifdef __GNUC__
-#if __GNUC_MINOR__ < 7
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 #define __attribute__(x)
 #endif
 #else /* ! __GNUC __ */