* k5-int.h [!NEED_SOCKETS]: Declare (but do not define) struct sockaddr if

SOCK_DGRAM hasn't been defined yet.
(krb5_locate_srv_conf, krb5_locate_srv_dns): Declare.
(struct krb5_keytypes, struct krb5_cksumtypes): enc, hash, and keyhash provider
structures pointed to are now const.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 01fb1b44ab20ab05c66a867aae4564b4cb5ce78b..850100e2bf27cee22f6cd326be5412f41e526784 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,11 @@
+2000-01-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * k5-int.h [!NEED_SOCKETS]: Declare (but do not define) struct
+       sockaddr if SOCK_DGRAM hasn't been defined yet.
+       (krb5_locate_srv_conf, krb5_locate_srv_dns): Declare.
+       (struct krb5_keytypes, struct krb5_cksumtypes): enc, hash, and
+       keyhash provider structures pointed to are now const.
+
 1999-11-23  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5.hin (krb5_secure_config_files): Delete declaration.

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 303a5b5441c28487aea6446f5e3626ef63603942..419946d6c085fc41b8c0af52b0f6abc1fbbb75e6 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -203,6 +203,10 @@ typedef unsigned char      u_char;
 
 #ifdef NEED_SOCKETS
 #include "port-sockets.h"
+#else
+#ifndef SOCK_DGRAM
+struct sockaddr;
+#endif
 #endif
 
 /* krb5/krb5.h includes many other .h files in the krb5 subdirectory.
@@ -541,6 +545,23 @@ void krb5_os_free_context
 krb5_error_code krb5_find_config_files
         KRB5_PROTOTYPE(());
 
+krb5_error_code krb5_locate_srv_conf
+       KRB5_PROTOTYPE((krb5_context,
+                       const krb5_data *,
+                       const char *,
+                       struct sockaddr **,
+                       int *,
+                       int *,
+                       int *));
+
+/* no context? */
+krb5_error_code krb5_locate_srv_dns
+       KRB5_PROTOTYPE((const krb5_data *,
+                       const char *,
+                       const char *,
+                       struct sockaddr **,
+                       int *));
+
 #endif /* KRB5_LIBOS_PROTO__ */
 
 /* new encryption provider api */
@@ -613,8 +634,8 @@ struct krb5_keytypes {
     krb5_enctype etype;
     char *in_string;
     char *out_string;
-    struct krb5_enc_provider *enc;
-    struct krb5_hash_provider *hash;
+    const struct krb5_enc_provider *enc;
+    const struct krb5_hash_provider *hash;
     krb5_encrypt_length_func encrypt_len;
     krb5_crypt_func encrypt;
     krb5_crypt_func decrypt;
@@ -636,8 +657,8 @@ struct krb5_cksumtypes {
        then HMAC/hash with derived keys is used if the relevant flag
        is set.  Otherwise, a non-keyed hash is computed.  This is all
        kind of messy, but so is the krb5 api. */
-    struct krb5_keyhash_provider *keyhash;
-    struct krb5_hash_provider *hash;
+    const struct krb5_keyhash_provider *keyhash;
+    const struct krb5_hash_provider *hash;
 };
 
 #define KRB5_CKSUMFLAG_DERIVE          0x0001