* dispatch.c (dispatch): Remove arg "portnum"; update callers.

* do_as_req.c (process_as_req): Ditto.
* do_tgs_req.c (process_tgs_req): Ditto.
* kerberos_v4.c (process_v4): Remove arg "is_secondary"; update callers.
* kdc_util.h (dispatch, process_as_req, process_tgs_req, process_v4): Update
prototypes.
* main.c (init_realm): Remove unused variable.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14585 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 33 insertions, 29 deletions

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 56fe212ff..a92869740 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,6 +1,18 @@
+2002-06-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* dispatch.c (dispatch): Remove arg "portnum"; update callers.
+	* do_as_req.c (process_as_req): Ditto.
+	* do_tgs_req.c (process_tgs_req): Ditto.
+	* kerberos_v4.c (process_v4): Remove arg "is_secondary"; update
+	callers.
+	* kdc_util.h (dispatch, process_as_req, process_tgs_req,
+	process_v4): Update prototypes.
+	* main.c (init_realm): Remove unused variable.
+
 2002-06-24  Sam Hartman  <hartmans@mit.edu>
 
-	* kdc_preauth.c (get_etype_info): We get KRB5_KDB_NO_MATCHING_KEY not ENOENT; per 5.27 of kdb_xdr.c.
+	* kdc_preauth.c (get_etype_info): We get KRB5_KDB_NO_MATCHING_KEY
+	not ENOENT; per 5.27 of kdb_xdr.c.
 
 2002-04-05  Ken Raeburn  <raeburn@mit.edu>
 
@@ -32,7 +44,8 @@
 
 2001-11-26  Sam Hartman  <hartmans@mit.edu>
 
-	* main.c (init_realm): Don't seed from current time; krb5_init_context already does that.
+	* main.c (init_realm): Don't seed from current time;
+	krb5_init_context already does that.
 
 2001-10-25  Tom Yu  <tlyu@mit.edu>
 
diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
index f7685c905..db5e72314 100644
--- a/src/kdc/dispatch.c
+++ b/src/kdc/dispatch.c
@@ -38,10 +38,9 @@
 static krb5_int32 last_usec = 0, last_os_random = 0;
 
 krb5_error_code
-dispatch(pkt, from, portnum, response)
+dispatch(pkt, from, response)
     krb5_data *pkt;
     const krb5_fulladdr *from;
-    int		portnum;
     krb5_data **response;
 {
 
@@ -72,8 +71,8 @@ dispatch(pkt, from, portnum, response)
 	if (name == 0)
 	    name = "[unknown address type]";
 	krb5_klog_syslog(LOG_INFO,
-			 "DISPATCH: repeated (retransmitted?) request from %s port %d, resending previous response",
-			 name, portnum);
+			 "DISPATCH: repeated (retransmitted?) request from %s, resending previous response",
+			 name);
 	return 0;
     }
 #endif
@@ -99,7 +98,7 @@ dispatch(pkt, from, portnum, response)
     /* try TGS_REQ first; they are more common! */
 
     if (krb5_is_tgs_req(pkt)) {
-	retval = process_tgs_req(pkt, from, portnum, response);
+	retval = process_tgs_req(pkt, from, response);
     } else if (krb5_is_as_req(pkt)) {
 	if (!(retval = decode_krb5_as_req(pkt, &as_req))) {
 	    /*
@@ -107,14 +106,14 @@ dispatch(pkt, from, portnum, response)
 	     * pointer.
 	     */
 	    if (!(retval = setup_server_realm(as_req->server))) {
-		retval = process_as_req(as_req, from, portnum, response);
+		retval = process_as_req(as_req, from, response);
 	    }
 	    krb5_free_kdc_req(kdc_context, as_req);
 	}
     }
 #ifdef KRB5_KRB4_COMPAT
     else if (pkt->data[0] == 4)		/* old version */
-	retval = process_v4(pkt, from, portnum, response);
+	retval = process_v4(pkt, from, response);
 #endif
     else
 	retval = KRB5KRB_AP_ERR_MSG_TYPE;
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 45ef81178..4cb982c58 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -50,10 +50,9 @@ static krb5_error_code prepare_error_as (krb5_kdc_req *, int, krb5_data *,
 
 /*ARGSUSED*/
 krb5_error_code
-process_as_req(request, from, portnum, response)
+process_as_req(request, from, response)
     krb5_kdc_req *request;
     const krb5_fulladdr *from;	/* who sent it ? */
-    int	portnum;
     krb5_data **response;	/* filled in with a response packet */
 {
 
@@ -413,10 +412,10 @@ process_as_req(request, from, portnum, response)
 
     rep_etypes2str(rep_etypestr, sizeof(rep_etypestr), &reply);
     krb5_klog_syslog(LOG_INFO,
-		     "AS_REQ (%s) %s(%d): ISSUE: authtime %d, "
+		     "AS_REQ (%s) %s: ISSUE: authtime %d, "
 		     "%s, %s for %s",
 		     ktypestr,
-	             fromstring, portnum, authtime,
+	             fromstring, authtime,
 		     rep_etypestr,
 		     cname, sname);
 
@@ -431,9 +430,9 @@ process_as_req(request, from, portnum, response)
 
 errout:
     if (status)
-        krb5_klog_syslog(LOG_INFO, "AS_REQ (%s) %s(%d): %s: %s for %s%s%s",
+        krb5_klog_syslog(LOG_INFO, "AS_REQ (%s) %s: %s: %s for %s%s%s",
 			 ktypestr,
-	       fromstring, portnum, status, 
+	       fromstring, status, 
 	       cname ? cname : "<unknown client>",
 	       sname ? sname : "<unknown server>",
 	       errcode ? ", " : "",
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index ce1047947..ed33226dc 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -53,10 +53,9 @@ static krb5_error_code prepare_error_tgs (krb5_kdc_req *, krb5_ticket *,
 
 /*ARGSUSED*/
 krb5_error_code
-process_tgs_req(pkt, from, portnum, response)
+process_tgs_req(pkt, from, response)
     krb5_data *pkt;
     const krb5_fulladdr *from;	/* who sent it ? */
-    int	portnum;
     krb5_data **response;	/* filled in with a response packet */
 {
     krb5_keyblock * subkey;
@@ -540,9 +539,9 @@ tgt_again:
 		if ((errcode = krb5_unparse_name(kdc_context, client2, &tmp)))
 			tmp = 0;
 		krb5_klog_syslog(LOG_INFO,
-				 "TGS_REQ %s(%d): 2ND_TKT_MISMATCH: "
+				 "TGS_REQ %s: 2ND_TKT_MISMATCH: "
 				 "authtime %d, %s for %s, 2nd tkt client %s",
-				 fromstring, portnum, authtime,
+				 fromstring, authtime,
 				 cname ? cname : "<unknown client>",
 				 sname ? sname : "<unknown server>",
 				 tmp ? tmp : "<unknown>");
@@ -648,10 +647,10 @@ cleanup:
 	if (!errcode)
 	    rep_etypes2str(rep_etypestr, sizeof(rep_etypestr), &reply);
         krb5_klog_syslog(LOG_INFO,
-			 "TGS_REQ (%s) %s(%d): %s: authtime %d, "
+			 "TGS_REQ (%s) %s: %s: authtime %d, "
 			 "%s%s %s for %s%s%s",
 			 ktypestr,
-			 fromstring, portnum, status, authtime,
+			 fromstring, status, authtime,
 			 !errcode ? rep_etypestr : "",
 			 !errcode ? "," : "",
 			 cname ? cname : "<unknown client>",
diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
index 0877d7f70..c54f1da43 100644
--- a/src/kdc/kdc_util.h
+++ b/src/kdc/kdc_util.h
@@ -107,18 +107,15 @@ rep_etypes2str(char *s, size_t len, krb5_kdc_rep *rep);
 /* do_as_req.c */
 krb5_error_code process_as_req (krb5_kdc_req *,
 					  const krb5_fulladdr *,
-					  int,
 					  krb5_data ** );
 
 /* do_tgs_req.c */
 krb5_error_code process_tgs_req (krb5_data *,
 					   const krb5_fulladdr *,
-					   int, 
 					   krb5_data ** );
 /* dispatch.c */
 krb5_error_code dispatch (krb5_data *,
 				    const krb5_fulladdr *,
-				    int,
 				    krb5_data **);
 
 /* main.c */
@@ -181,7 +178,6 @@ extern void sockaddr2p (const struct sockaddr *, char *, size_t, int *);
 #ifdef KRB5_KRB4_COMPAT
 krb5_error_code process_v4 (const krb5_data *,
 				      const krb5_fulladdr *,
-				      int is_secondary,
 				      krb5_data **);
 void process_v4_mode (const char *, const char *);
 #else
diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index 67f62dc07..d584b9811 100644
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -212,10 +212,9 @@ void process_v4_mode(program_name, string)
 }
 
 krb5_error_code
-process_v4( pkt, client_fulladdr, is_secondary, resp)
+process_v4( pkt, client_fulladdr, resp)
 const krb5_data *pkt;
 const krb5_fulladdr *client_fulladdr;
-int	is_secondary;
 krb5_data **resp;
 {
     struct sockaddr_in client_sockaddr;
diff --git a/src/kdc/main.c b/src/kdc/main.c
index 1d9c264df..a8d36cdde 100644
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -462,7 +462,6 @@ init_realm(progname, rdp, realm, def_dbname, def_mpname,
     }
 
     if (!rkey_init_done) {
-	krb5_timestamp now;
 	krb5_data seed;
 #ifdef KRB5_KRB4_COMPAT
 	krb5_keyblock temp_key;
diff --git a/src/kdc/network.c b/src/kdc/network.c
index 6bf13c915..cf4cf20c8 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -320,7 +320,7 @@ void process_packet(port_fd, prog, portnum)
 	break;
     }
     /* this address is in net order */
-    if ((retval = dispatch(&request, &faddr, portnum, &response))) {
+    if ((retval = dispatch(&request, &faddr, &response))) {
 	com_err(prog, retval, "while dispatching");
 	return;
     }