* kname_parse.c (k_isrealm, k_isname, k_isrealm): Add

        KRB5_DLLIMP/KRB5_CALLCONV definitions for function with exported
        prototype in krb.h.

        * g_cnffile.c (krb__get_srvtabname, krb__v5_get_file): Declare
        argument as const.

        * g_svc_in_tkt.c, put_svc_key.c, rd_req.c, rd_svc_key.c: Get rid
        of krb__get_srvtabname() prototype - in krb.h now.

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

7 files changed, 22 insertions, 16 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 17c0be0d38..cb2a0a7d02 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,17 @@
+
+2001-06-20  Ezra Peisach  <epeisach@mit.edu>
+
+	* kname_parse.c (k_isrealm, k_isname, k_isrealm): Add
+	KRB5_DLLIMP/KRB5_CALLCONV definitions for function with exported
+	prototype in krb.h.
+
+	* g_cnffile.c (krb__get_srvtabname, krb__v5_get_file): Declare
+	argument as const.
+
+	* g_svc_in_tkt.c, put_svc_key.c, rd_req.c, rd_svc_key.c: Get rid
+	of krb__get_srvtabname() prototype - in krb.h now.
+
+
 2001-06-18  Ezra Peisach  <epeisach@mit.edu>
 
 	* kparse.c (strutol): Cast argument to isupper()/tolower() to int.
diff --git a/src/lib/krb4/g_cnffile.c b/src/lib/krb4/g_cnffile.c
index 9b7b070523..83654b83f5 100644
--- a/src/lib/krb4/g_cnffile.c
+++ b/src/lib/krb4/g_cnffile.c
@@ -23,7 +23,7 @@ krb5_context krb5__krb4_context = 0;
 
 static FILE*
 krb__v5_get_file(s)
-     char *s;
+     const char *s;
 {
 	FILE *cnffile = 0;
 	const char* names[3];
@@ -50,7 +50,7 @@ krb__v5_get_file(s)
 
 char *
 krb__get_srvtabname(default_srvtabname)
-	char *default_srvtabname;
+	const char *default_srvtabname;
 {
 	const char* names[3];
 	char **full_name = 0, **cpp;
diff --git a/src/lib/krb4/g_svc_in_tkt.c b/src/lib/krb4/g_svc_in_tkt.c
index afee27ab98..7d4baf6ddd 100644
--- a/src/lib/krb4/g_svc_in_tkt.c
+++ b/src/lib/krb4/g_svc_in_tkt.c
@@ -16,8 +16,6 @@
 #define NULL 0
 #endif
 
-extern char *krb__get_srvtabname();
-
 /*
  * This file contains two routines: srvtab_to_key(), which gets
  * a server's key from a srvtab file, and krb_get_svc_in_tkt() which
diff --git a/src/lib/krb4/kname_parse.c b/src/lib/krb4/kname_parse.c
index 2c310c6872..18da8aec5f 100644
--- a/src/lib/krb4/kname_parse.c
+++ b/src/lib/krb4/kname_parse.c
@@ -174,9 +174,9 @@ kname_parse(np, ip, rp, fullname)
  * Kerberos name; returns 0 if it's not.
  */
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 k_isname(s)
-    char *s;
+    char FAR *s;
 {
     register char c;
     int backslash = 0;
@@ -213,9 +213,9 @@ k_isname(s)
  * We now allow periods in instance names -- they are unambiguous.
  */
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 k_isinst(s)
-    char *s;
+    char FAR *s;
 {
     register char c;
     int backslash = 0;
@@ -244,9 +244,9 @@ k_isinst(s)
  * Kerberos realm; returns 0 if it's not.
  */
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 k_isrealm(s)
-    char *s;
+    char FAR *s;
 {
     register char c;
     int backslash = 0;
diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c
index e2eb24d84d..a9264545fb 100644
--- a/src/lib/krb4/put_svc_key.c
+++ b/src/lib/krb4/put_svc_key.c
@@ -32,8 +32,6 @@
 #include <unistd.h>
 #endif
 
-extern char *krb__get_srvtabname();
-
 #define KEYSZ sizeof(C_Block)
 /* strict put_svc_key.
    The srvtab must already exist;
diff --git a/src/lib/krb4/rd_req.c b/src/lib/krb4/rd_req.c
index 89be3b5fea..e8119b85c7 100644
--- a/src/lib/krb4/rd_req.c
+++ b/src/lib/krb4/rd_req.c
@@ -33,8 +33,6 @@
 
 extern int krb_ap_req_debug;
 
-extern char *krb__get_srvtabname();
-
 /* declared in krb.h */
 int krb_ignore_ip_address = 0;
 
diff --git a/src/lib/krb4/rd_svc_key.c b/src/lib/krb4/rd_svc_key.c
index 15d0f463c6..f59aac6b7a 100644
--- a/src/lib/krb4/rd_svc_key.c
+++ b/src/lib/krb4/rd_svc_key.c
@@ -18,8 +18,6 @@
 #include <krb54proto.h>
 #include "prot.h"
 
-extern char *krb__get_srvtabname();
-
 /*
  * The private keys for servers on a given host are stored in a
  * "srvtab" file (typically "/etc/srvtab").  This routine extracts