diff --git a/kdc/config.c b/kdc/config.c
index 585f8a81a..f02fa5441 100644
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -37,7 +37,7 @@
 
 RCSID("$Id$");
 
-static char *config_file;	/* location of kdc config file */
+static const char *config_file;	/* location of kdc config file */
 
 int require_preauth = -1;	/* 1 == require preauth for all principals */
 
@@ -51,7 +51,7 @@ struct dbinfo *databases;
 HDB **db;
 int num_db;
 
-char *port_str;
+const char *port_str;
 
 int enable_http = -1;
 krb5_boolean encode_as_rep_as_tgs_rep; /* bug compatibility */
@@ -130,9 +130,9 @@ usage(int ret)
 static void
 get_dbinfo(krb5_config_section *cf)
 {
-    krb5_config_binding *top_binding = NULL;
-    krb5_config_binding *db_binding;
-    krb5_config_binding *default_binding = NULL;
+    const krb5_config_binding *top_binding = NULL;
+    const krb5_config_binding *db_binding;
+    const krb5_config_binding *default_binding = NULL;
     struct dbinfo *di, **dt;
     const char *default_dbname = HDB_DEFAULT_DB;
     const char *default_mkey = HDB_DB_DIR "/m-key";
@@ -140,7 +140,7 @@ get_dbinfo(krb5_config_section *cf)
 
     databases = NULL;
     dt = &databases;
-    while((db_binding = (krb5_config_binding *)
+    while((db_binding = (const krb5_config_binding *)
 	   krb5_config_get_next(context, cf, &top_binding, 
 				krb5_config_list, 
 				"kdc", 
diff --git a/kdc/hprop.c b/kdc/hprop.c
index 4dbb5635e..315cfe371 100644
--- a/kdc/hprop.c
+++ b/kdc/hprop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -37,8 +37,8 @@ RCSID("$Id$");
 
 static int version_flag;
 static int help_flag;
-static char *ktname = HPROP_KEYTAB;
-static char *database;
+static const char *ktname = HPROP_KEYTAB;
+static const char *database;
 static char *mkeyfile;
 static int to_stdout;
 static int verbose_flag;
diff --git a/kdc/hpropd.c b/kdc/hpropd.c
index e3abe9abd..7352cc94a 100644
--- a/kdc/hpropd.c
+++ b/kdc/hpropd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -163,7 +163,7 @@ static int inetd_flag = -1;
 static int help_flag;
 static int version_flag;
 static int print_dump;
-static char *database = HDB_DEFAULT_DB;
+static const char *database = HDB_DEFAULT_DB;
 static int from_stdin;
 static char *local_realm;
 #ifdef KRB4
diff --git a/kdc/string2key.c b/kdc/string2key.c
index 2552b3a29..ceb8af8be 100644
--- a/kdc/string2key.c
+++ b/kdc/string2key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998, 1999, 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -42,7 +42,7 @@ int afs;
 char *principal;
 char *cell;
 char *password;
-char *keytype_str = "des-cbc-md5";
+const char *keytype_str = "des-cbc-md5";
 int version;
 int help;