Several small changes to get the PC working without warnings

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index ea3a2260b44fc3d2664a292fda275f55faf6393f..ecd9ba27fb866db8bcc9f21d5d1c7e8d83961cc0 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 25 15:39:31 1995 Keith Vetter (keithv@fusion.com)
+
+       * los-proto.h: moved in the prototype for krb5_make_fulladdr.
+
 Tue May 23 15:33:00 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * k5-config.h, k5-sockets.h: Move the sockets specific setup out

diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 7f9a74f373d9b2b616a40e0fc3b44cd95ce63b75..154537377cec6d7d78885f70daff473381e47475 100644 (file)
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -125,4 +125,10 @@ void krb5_os_free_context
 krb5_error_code krb5_find_config_files
         PROTOTYPE(());
 
+krb5_error_code krb5_make_fulladdr
+    PROTOTYPE((krb5_context,
+              krb5_address *,
+              krb5_address *,
+              krb5_address *));
+
 #endif /* KRB5_LIBOS_PROTO__ */

diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 894b4015f83c4eb768fc5d51dffd4cd67d72bbaf..5a0286b4b72887362a0ebec4ed80c7f4359c0661 100644 (file)
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 25 15:37:39 1995 Keith Vetter (keithv@fusion.com)
+
+       * fcc_maybe.c: the NEED_SOCKETS has to be before the #include line.
+
 Tue May 23 16:28:07 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * fcc_maybe.c: Rearrange #include files so that krb5.h gets

diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c
index 6f4cfd0931193789ee18fd4303aebbb376f6c36a..13a2139775116eceaf8d419726f0674ceed0422e 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_maybe.c
+++ b/src/lib/krb5/ccache/file/fcc_maybe.c
@@ -24,9 +24,10 @@
  * This file contains the source code for conditional open/close calls.
  */
 
+#define NEED_SOCKETS    /* Only for ntohs, etc. */
+#define NEED_LOWLEVEL_IO
 #include "k5-int.h"
 
-#define NEED_SOCKETS    /* Only for ntohs, etc. */
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 298da86c59df10d134cb57887a6f2bf9d6bce85b..a659b80f446ffe8edc9581cd13187f67b4264115 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,11 @@
+Thu May 25 15:33:45 1995 Keith Vetter (keithv@fusion.com)
+
+       * os-proto.h: moved prototype for krb5_make_fulladdr to
+          los-proto.h since it's needed by the krb directory.
+       * ktdefnam.c: fixed signed/unsigned mismatch.
+       * read_pwd.c: pc stub didn't track changes to the real routines
+          parameter list (const was added).
+
 Tue May 23 16:29:24 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * t_std_conf.c, timeofday.c, unlck_file.c: Rearrange #include

diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index fdb685b20ec41e7009d77a2def89ab2971d3d601..d911b996d33e0be79c93332cbfe5a7be74fe5a8a 100644 (file)
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -39,7 +39,7 @@ krb5_kt_default_name(context, name, namesize)
     cp = getenv("KRB5_KTNAME");
     if (cp) {
        strncpy(name, cp, namesize);
-       if (strlen(cp) >= namesize)
+       if (strlen(cp) >= (size_t) namesize)
            return KRB5_CONFIG_NOTENUFSPACE;
     } else {
        strncpy(name, krb5_defkeyname, namesize);

diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h
index 7b6fe4c6c31ab4fd64ee518071c9f01e8c318ec4..32471f8f2dbcb8496536f22a64f633c422fcb08a 100644 (file)
--- a/src/lib/krb5/os/os-proto.h
+++ b/src/lib/krb5/os/os-proto.h
@@ -49,12 +49,6 @@ krb5_error_code krb5_make_full_ipaddr
                                           int */
               krb5_address **));
 
-krb5_error_code krb5_make_fulladdr
-    PROTOTYPE((krb5_context,
-              krb5_address *,
-              krb5_address *,
-              krb5_address *));
-
 #endif /* KRB5_USE_INET */
 
 #endif /* KRB5_LIBOS_INT_PROTO__ */

diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 7107f119ed166e3550cb9d08ec46fd85fa4da015..1b7da37ad384f2e4cb089e4d6a931ca7f953d7e6 100644 (file)
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -254,8 +254,8 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
 krb5_error_code
 krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
     krb5_context context;
-    char *prompt;
-    char *prompt2;
+    const char *prompt;
+    const char *prompt2;
     char *return_pwd;
     int *size_return;
 {