* krb524d.c: Provide prototypes for local functions

	* test.c: Declare local functions static.

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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 78ce8ca57822816736e4dc8b70fdb4bb5adc23d0..72d9080468c49d81f0a81b3fd24736e04457ddf8 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-12  Ezra Peisach  <epeisach@mit.edu>
+
+       * krb524d.c: Provide prototypes for local functions.
+
+       * test.c: Declare local functions static.
+
 2001-02-05  Tom Yu  <tlyu@mit.edu>
 
        * cnv_tkt_skey.c (krb524_convert_tkt_skey): Avoid double-free;

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 737818e3c6e1fc5e24c5d4d1eb4f7174876818d2..ab3d038b927622e1171586e56ff652b6c6b2bafc 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -51,17 +51,25 @@ int use_keytab, use_master;
 char *keytab = NULL;
 krb5_keytab kt;
 
-void init_keytab(), init_master(), cleanup_and_exit();
-krb5_error_code do_connection(), lookup_service_key(), kdc_get_server_key();
-
-void usage(context)
+void init_keytab(krb5_context), 
+    init_master(krb5_context, kadm5_config_params *),
+    cleanup_and_exit(int, krb5_context);
+krb5_error_code do_connection(int, krb5_context);
+krb5_error_code lookup_service_key(krb5_context, krb5_principal, 
+                                  krb5_enctype, krb5_kvno, 
+                                  krb5_keyblock *, krb5_kvno *);
+krb5_error_code  kdc_get_server_key(krb5_context, krb5_principal, 
+                                   krb5_keyblock *, krb5_kvno *,
+                                   krb5_enctype, krb5_kvno);
+
+static void usage(context)
      krb5_context context;
 {
      fprintf(stderr, "Usage: %s [-k[eytab]] [-m[aster] [-r realm]] [-nofork]\n", whoami);
      cleanup_and_exit(1, context);
 }
 
-RETSIGTYPE request_exit(signo)
+static RETSIGTYPE request_exit(signo)
      int signo;
 {
      signalled = 1;

diff --git a/src/krb524/test.c b/src/krb524/test.c
index a69248922c8bcd12435b85f54b78996b3c495af6..36832c2421a83d18f6a045d7aeae11638a842925 100644 (file)
--- a/src/krb524/test.c
+++ b/src/krb524/test.c
@@ -43,6 +43,7 @@
 void do_local PROTOTYPE((krb5_creds *, krb5_keyblock *)),
      do_remote PROTOTYPE((krb5_context, krb5_creds *, char *, krb5_keyblock *));
 
+static 
 void print_key(msg, key)
      char *msg;
      char *key;
@@ -52,6 +53,7 @@ void print_key(msg, key)
      printf("\n");
 }
 
+static
 void print_time(msg, t)
      char *msg;
      int t;
@@ -59,6 +61,7 @@ void print_time(msg, t)
      printf("%s: %d, %s", msg, t, ctime((time_t *) &t));
 }
 
+static
 void krb5_print_times(msg, t)
      char *msg;
      krb5_ticket_times *t;
@@ -73,6 +76,7 @@ void krb5_print_times(msg, t)
            ctime((time_t *) &t->renew_till));
 }
 
+static
 void krb5_print_keyblock(msg, key)
      char *msg;
      krb5_keyblock *key;
@@ -84,6 +88,7 @@ void krb5_print_keyblock(msg, key)
      printf("\n");
 }
 
+static
 void krb5_print_ticket(context, ticket_data, key)
      krb5_context context;
      krb5_data *ticket_data;
@@ -119,6 +124,7 @@ void krb5_print_ticket(context, ticket_data, key)
      krb5_free_ticket(context, tkt);
 }
 
+static
 void krb5_print_creds(context, creds, secret_key)
      krb5_context context;
      krb5_creds *creds;
@@ -141,6 +147,7 @@ void krb5_print_creds(context, creds, secret_key)
      /* krb5_print_ticket(context, &creds->second_ticket, secret_key); */
 }
 
+static
 void krb4_print_ticket(ticket, secret_key)
      KTEXT ticket;
      krb5_keyblock *secret_key;
@@ -177,6 +184,7 @@ void krb4_print_ticket(ticket, secret_key)
                                                             &issue_time));
 }
 
+static
 void krb4_print_creds(creds, secret_key)
      CREDENTIALS *creds;
      krb5_keyblock *secret_key;
@@ -192,6 +200,7 @@ void krb4_print_creds(creds, secret_key)
      krb4_print_ticket(&creds->ticket_st, secret_key);
 }
 
+static
 void usage()
 {
      fprintf(stderr, "Usage: test [-remote server] client service\n");