Use krb5_error_code for return value of krb5 library functions.

[moira.git] / include / moira.h

diff --git a/include/moira.h b/include/moira.h
index 0e2391e3d0006c35852645614d0dd1b6fdc3e57f..6cb898329bd00db6a16866d19d51ed897911843f 100644 (file)
--- a/include/moira.h
+++ b/include/moira.h
@@ -7,14 +7,23 @@
 #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 <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 */
@@ -37,7 +46,9 @@
 #define MR_DO_UPDATE 5
 #define MR_MOTD 6
 #define MR_PROXY 7
-#define MR_MAX_PROC 7
+#define MR_SETVERSION 8
+#define MR_KRB5_AUTH 9
+#define MR_MAX_PROC 9
 
 /* values used in NFS physical flags */
 #define MR_FS_STUDENT  0x0001
@@ -90,9 +101,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);
@@ -128,6 +136,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
@@ -138,15 +147,16 @@ size_t strlcat(char *dst, const char *src, size_t size);
 /* mr_ functions */
 int mr_access(char *handle, int argc, char **argv);
 int mr_auth(char *prog);
-int mr_proxy(char *principal, char *orig_authtype);
 int mr_connect(char *server);
 int mr_disconnect(void);
 int mr_do_update(void);
 int mr_host(char *host, int size);
 int mr_motd(char **motd);
 int mr_noop(void);
+int mr_proxy(char *principal, char *orig_authtype);
 int mr_query(char *handle, int argc, char **argv,
             int (*callback)(int, char **, void *), void *callarg);
+int mr_version(int version);
 
 /* error-name backward compatibility */
 #define MR_INGRES_ERR          MR_DBMS_ERR