X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=zephyr%2Fserver%2Fbdump.c;h=63fbe9cf17dbf80fe73a91d1fada9f0a68e8a300;hb=fa8b83c652676291f5c37ea66b0e5c18b20577bf;hp=22f3ac0b2318138afd0271f41386c7f59bac1bd6;hpb=0a8b54442e345e4c3a21ab8a61ed9eca2ed9251d;p=1ts-debian.git

diff --git a/zephyr/server/bdump.c b/zephyr/server/bdump.c
index 22f3ac0..63fbe9c 100644
--- a/zephyr/server/bdump.c
+++ b/zephyr/server/bdump.c
@@ -81,27 +81,26 @@ return 0;
 #endif
 
 
-static void close_bdump __P((void* arg));
-static Code_t bdump_send_loop __P((Server *server)),
-bdump_ask_for __P((char *inst)),
-bdump_recv_loop __P((Server *server));
-static void bdump_get_v12 __P((ZNotice_t *, int, struct sockaddr_in *,
-			       Server *));
-static Code_t get_packet __P((void *packet, int len, int *retlen));
-static Code_t extract_sin __P((ZNotice_t *notice, struct sockaddr_in *target));
-static Code_t send_done __P((void));
-static Code_t send_list __P((ZNotice_Kind_t kind, int port, char *class_name,
+static void close_bdump(void* arg);
+static Code_t bdump_send_loop(Server *server);
+static Code_t bdump_recv_loop(Server *server);
+static void bdump_get_v12(ZNotice_t *, int, struct sockaddr_in *,
+			       Server *);
+static Code_t get_packet(void *packet, int len, int *retlen);
+static Code_t extract_sin(ZNotice_t *notice, struct sockaddr_in *target);
+static Code_t send_done(void);
+static Code_t send_list(ZNotice_Kind_t kind, int port, char *class_name,
 			     char *inst, char *opcode, char *sender,
-			     char *recip, char **lyst, int num));
-static Code_t send_normal_tcp __P((ZNotice_Kind_t kind, int port,
+			     char *recip, char **lyst, int num);
+static Code_t send_normal_tcp(ZNotice_Kind_t kind, int port,
 				   char *class_name,
 				   char *inst, char *opcode, char *sender,
-				   char *recip, char *message, int len));
-static int net_read __P((FILE *f, char *buf, int len));
-static int net_write __P((FILE *f, char *buf, int len));
-static int setup_file_pointers __P((void));
-static void shutdown_file_pointers __P((void));
-static void cleanup __P((Server *server));
+				   char *recip, char *message, int len);
+static int net_read(FILE *f, char *buf, int len);
+static int net_write(FILE *f, char *buf, int len);
+static int setup_file_pointers(void);
+static void shutdown_file_pointers(void);
+static void cleanup(Server *server);
 
 #ifdef HAVE_KRB5
 static long ticket5_time;
@@ -146,8 +145,7 @@ extern int bdump_auth_proto;
  */
 
 void
-bdump_offer(who)
-    struct sockaddr_in *who;
+bdump_offer(struct sockaddr_in *who)
 {
     Code_t retval;
     char buf[512], *addr, *lyst[2];
@@ -184,7 +182,7 @@ bdump_offer(who)
 	return;
     }
     if (!bdump_sin.sin_port) {
-	int len = sizeof(bdump_sin);
+	unsigned int len = sizeof(bdump_sin);
 
 	if (getsockname(bdump_socket,
 			(struct sockaddr *) &bdump_sin, &len) < 0) {
@@ -248,12 +246,12 @@ bdump_offer(who)
  */
 
 void
-bdump_send()
+bdump_send(void)
 {
     struct sockaddr_in from;
     Server *server;
     Code_t retval;
-    int fromlen = sizeof(from);
+    unsigned int fromlen = sizeof(from);
     int on = 1;
 #ifdef _POSIX_VERSION
     struct sigaction action;
@@ -273,7 +271,6 @@ bdump_send()
     /* may be moved into kstuff.c */
     krb5_principal principal;
     krb5_data k5data;
-    krb5_ap_rep_enc_part *rep;
     krb5_keytab kt;
 #endif
 #if !defined(HAVE_KRB4) && !defined(HAVE_KRB5)
@@ -539,11 +536,10 @@ bdump_send()
 
 /*ARGSUSED*/
 static void
-bdump_get_v12 (notice, auth, who, server)
-    ZNotice_t *notice;
-    int auth;
-    struct sockaddr_in *who;
-    Server *server;
+bdump_get_v12 (ZNotice_t *notice,
+	       int auth,
+	       struct sockaddr_in *who,
+	       Server *server)
 {
     struct sockaddr_in from;
     Code_t retval;
@@ -828,13 +824,12 @@ bdump_get_v12 (notice, auth, who, server)
 }
 
 void
-bdump_get(notice, auth, who, server)
-    ZNotice_t *notice;
-    int auth;
-    struct sockaddr_in *who;
-    Server *server;
+bdump_get(ZNotice_t *notice,
+	  int auth,
+	  struct sockaddr_in *who,
+	  Server *server)
 {
-    void (*proc) __P((ZNotice_t *, int, struct sockaddr_in *, Server *));
+    void (*proc)(ZNotice_t *, int, struct sockaddr_in *, Server *);
 
     proc = NULL;
 
@@ -862,12 +857,15 @@ bdump_get(notice, auth, who, server)
  */
 
 Code_t
-bdump_send_list_tcp(kind, addr, class_name, inst, opcode, sender, recip, lyst,
-		    num)
-    ZNotice_Kind_t kind;
-    struct sockaddr_in *addr;
-    int num;
-    char *class_name, *inst, *opcode, *sender, *recip, **lyst;
+bdump_send_list_tcp(ZNotice_Kind_t kind,
+		    struct sockaddr_in *addr,
+		    char *class_name,
+		    char *inst,
+		    char *opcode,
+		    char *sender,
+		    char *recip,
+		    char **lyst,
+		    int num)
 {
     ZNotice_t notice;
     char *pack, addrbuf[100];
@@ -953,7 +951,8 @@ bdump_send_list_tcp(kind, addr, class_name, inst, opcode, sender, recip, lyst,
 }
 
 static void
-shutdown_file_pointers() {
+shutdown_file_pointers(void)
+{
     if (input) {
 	fclose(input);
 	input = 0;
@@ -974,8 +973,7 @@ shutdown_file_pointers() {
 }
 
 static void
-cleanup(server)
-    Server *server;
+cleanup(Server *server)
 {
 #ifdef _POSIX_VERSION
     struct sigaction action;
@@ -1004,16 +1002,12 @@ cleanup(server)
 
 #ifdef HAVE_KRB4
 int
-get_tgt()
+get_tgt(void)
 {
     /* MIT Kerberos 4 get_svc_in_tkt() requires instance to be writable and
      * at least INST_SZ bytes long. */
     static char buf[INST_SZ + 1] = SERVER_INSTANCE;
     int retval = 0;
-    CREDENTIALS cred;
-#ifndef NOENCRYPTION
-    Sched *s;
-#endif
     
     /* have they expired ? */
     if (ticket_time < NOW - tkt_lifetime(TKTLIFETIME) + (15L * 60L)) {
@@ -1039,7 +1033,7 @@ get_tgt()
 #ifndef NOENCRYPTION
 	retval = read_service_key(SERVER_SERVICE, SERVER_INSTANCE,
 				  ZGetRealm(), 0 /*kvno*/,
-				  srvtab_file, serv_key);
+				  srvtab_file, (char *)serv_key);
 	if (retval != KSUCCESS) {
 	    syslog(LOG_ERR, "get_tgt: read_service_key: %s",
 		   krb_get_err_text(retval));
@@ -1106,8 +1100,7 @@ get_tgt()
  
 /*ARGSUSED*/
 static void
-close_bdump(arg)
-    void * arg;
+close_bdump(void *arg)
 {
     if (bdump_socket >= 0) {
 	FD_CLR(bdump_socket, &interesting);
@@ -1130,8 +1123,7 @@ close_bdump(arg)
  */
  
 static Code_t
-bdump_recv_loop(server)
-    Server *server;
+bdump_recv_loop(Server *server)
 {
     ZNotice_t notice;
     ZPacket_t packet;
@@ -1140,7 +1132,7 @@ bdump_recv_loop(server)
     Client *client = NULL;
     struct sockaddr_in who;
 #ifdef HAVE_KRB5
-    char buf[512];
+    unsigned char buf[512];
     int blen;
 #endif
 #if defined(HAVE_KRB4) || defined(HAVE_KRB5)    
@@ -1270,7 +1262,7 @@ bdump_recv_loop(server)
 					serv_ksched.s, DES_DECRYPT);
 		    }
 		} else if (*cp == 'Z') { /* Zcode! Long live the new flesh! */
-		    retval = ZReadZcode(cp, buf, sizeof(buf), &blen);
+		    retval = ZReadZcode((unsigned char *)cp, buf, sizeof(buf), &blen);
 		    if (retval != ZERR_NONE) {
 			syslog(LOG_ERR,"brl bad cblk read: %s (%s)",
 			       error_message(retval), cp);
@@ -1331,7 +1323,7 @@ bdump_recv_loop(server)
 			   error_message(retval));
 		    return retval;
 		}
-	    } /* else 
+	    } /* else */
 		 /* Other side tried to send us subs for a realm we didn't
 		    know about, and so we drop them silently */
 	
@@ -1347,8 +1339,7 @@ bdump_recv_loop(server)
  */
 
 static Code_t
-bdump_send_loop(server)
-    Server *server;
+bdump_send_loop(Server *server)
 {
     Code_t retval;
 
@@ -1373,7 +1364,7 @@ bdump_send_loop(server)
  */
 
 static Code_t
-send_done()
+send_done(void)
 {
     Code_t retval;
  
@@ -1391,10 +1382,15 @@ send_done()
  */
 
 static Code_t
-send_list(kind, port, class_name, inst, opcode, sender, recip, lyst, num)
-    ZNotice_Kind_t kind;
-    int port, num;
-    char *class_name, *inst, *opcode, *sender, *recip, **lyst;
+send_list(ZNotice_Kind_t kind,
+	  int port,
+	  char *class_name,
+	  char *inst,
+	  char *opcode,
+	  char *sender,
+	  char *recip,
+	  char **lyst,
+	  int num)
 {
     ZNotice_t notice;
     char *pack;
@@ -1431,11 +1427,15 @@ send_list(kind, port, class_name, inst, opcode, sender, recip, lyst, num)
  */
 
 static Code_t
-send_normal_tcp(kind, port, class_name, inst, opcode, sender, recip,
-		message, len)
-    ZNotice_Kind_t kind;
-    int port, len;
-    char *class_name, *inst, *opcode, *sender, *recip, *message;
+send_normal_tcp(ZNotice_Kind_t kind,
+		int port,
+		char *class_name,
+		char *inst,
+		char *opcode,
+		char *sender,
+		char *recip,
+		char *message,
+		int len)
 {
     ZNotice_t notice;
     char *pack;
@@ -1522,10 +1522,7 @@ send_normal_tcp(kind, port, class_name, inst, opcode, sender, recip,
  */
 
 static Code_t
-get_packet(packet, len, retlen)
-    void *packet;
-    int len;
-    int *retlen;
+get_packet(void *packet, int len, int *retlen)
 {
     u_short length;
     int result;
@@ -1558,9 +1555,7 @@ get_packet(packet, len, retlen)
 }
 
 static Code_t
-extract_sin(notice, target)
-    ZNotice_t *notice;
-    struct sockaddr_in *target;
+extract_sin(ZNotice_t *notice, struct sockaddr_in *target)
 {
     char *cp = notice->z_message;
     char *buf;
@@ -1587,10 +1582,7 @@ extract_sin(notice, target)
 }
 
 static int
-net_read(f, buf, len)
-    FILE *f;
-    char *buf;
-    int len;
+net_read(FILE *f, char *buf, int len)
 {
     int cc, len2 = 0;
  
@@ -1614,10 +1606,7 @@ net_read(f, buf, len)
 }
 
 static int
-net_write(f, buf, len)
-    FILE *f;
-    char *buf;
-    int len;
+net_write(FILE *f, char *buf, int len)
 {
     int cc;
     int wrlen = len;
@@ -1632,7 +1621,7 @@ net_write(f, buf, len)
 }
 
 static int
-setup_file_pointers ()
+setup_file_pointers (void)
 {
     int fd;