X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/f3c08a60789d528abb0502e5dcfb2b2cf22ee53c..5eaef52092da48d922a6b37cf48bb7c5104d0841:/server/mr_server.h

diff --git a/server/mr_server.h b/server/mr_server.h
index 1505719a..0821036d 100644
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -16,11 +16,12 @@
 #include <krb.h>
 #include <com_err.h>
 #include <stdlib.h>
+#include <stdarg.h>
 
 typedef struct returned_tuples {
-	struct returned_tuples *next;
-	OPERATION op;
-	mr_params *retval;
+  struct returned_tuples *next;
+  OPERATION op;
+  mr_params *retval;
 } returned_tuples;
 
 /*
@@ -28,9 +29,9 @@ typedef struct returned_tuples {
  */
 
 struct krbname {
-	char name[ANAME_SZ];
-	char inst[INST_SZ];
-	char realm[REALM_SZ];
+  char name[ANAME_SZ];
+  char inst[INST_SZ];
+  char realm[REALM_SZ];
 };
 
 /*
@@ -39,19 +40,19 @@ struct krbname {
  */
 
 typedef struct _client {
-	OPERATION pending_op;	/* Primary pending operation */
-	CONNECTION con;		/* Connection to the client */
-	int action;		/* what action is pending? */
-	mr_params *args, reply;
-	int id;			/* Unique id of client */
-	struct sockaddr_in haddr; /* IP address of client */
-	char clname[MAX_K_NAME_SZ];/* Name client authenticated to */
-	struct krbname kname; 	/* Parsed version of the above */
-	int users_id;		/* MR internal ID of authenticated user */
-	int client_id;		/* MR internal ID of client for modby field */
-	returned_tuples *first, *last;
-	time_t last_time_used;  /* Last time connection used */
-	char entity[9];		/* entity on other end of the connection */
+  OPERATION pending_op;		/* Primary pending operation */
+  CONNECTION con;		/* Connection to the client */
+  int action;			/* what action is pending? */
+  mr_params *args, reply;
+  int id;			/* Unique id of client */
+  struct sockaddr_in haddr; 	/* IP address of client */
+  char clname[MAX_K_NAME_SZ];	/* Name client authenticated to */
+  struct krbname kname; 	/* Parsed version of the above */
+  int users_id;			/* MR internal ID of authenticated user */
+  int client_id;		/* MR internal ID of client for modby field */
+  returned_tuples *first, *last;
+  time_t last_time_used;	/* Last time connection used */
+  char entity[9];		/* entity on other end of the connection */
 } client;
 
 /*
@@ -118,7 +119,7 @@ extern time_t inc_started, now;
 int gdb_init(void);
 int gdb_debug(int flag);
 void start_accepting_client(CONNECTION, OPERATION, CONNECTION *,
-			     char *, int*, TUPLE *);
+			     char *, int *, TUPLE *);
 int initialize_operation(OPERATION, int (*init_function)(), char *,
 			 int (*cancel_function)());
 int reset_operation(OPERATION);
@@ -188,6 +189,6 @@ void do_shutdown(client *cl);
 /* prototypes from mr_util.c */
 char *requote(char *buf, char *cp, int len);
 void log_args(char *tag, int version, int argc, char **argv);
-void mr_com_err(char *whoami, int code, char *fmt, caddr_t pvar);
+void mr_com_err(const char *whoami, long code, const char *fmt, va_list pvar);
 int mr_trim_args(int argc, char **argv);
 char **mr_copy_args(char **argv, int argc);