diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-07-12 20:21:33 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-07-12 20:21:33 +0000 |
| commit | eaf289d6ffc3f33c7bea1929b91891d6b32bff0e (patch) | |
| tree | 66a2f55cea58c8dca0c506686b63ed592327fab4 /src/krb524 | |
| parent | 38ed7ece76d09197b334eabc2bd934da8542749a (diff) | |
| download | krb5-eaf289d6ffc3f33c7bea1929b91891d6b32bff0e.tar.gz krb5-eaf289d6ffc3f33c7bea1929b91891d6b32bff0e.tar.xz krb5-eaf289d6ffc3f33c7bea1929b91891d6b32bff0e.zip | |
Don't install port-sockets.h, and don't include it from <kerberosIV/krb.h>.
Instead, include it in the source files that need it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14627 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524')
| -rw-r--r-- | src/krb524/ChangeLog | 6 | ||||
| -rw-r--r-- | src/krb524/conv_creds.c | 6 | ||||
| -rw-r--r-- | src/krb524/krb524.h | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 2bc238cbe4..92141f0b78 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,9 @@ +2002-07-12 Ken Raeburn <raeburn@mit.edu> + + * conv_creds.c: Include port-sockets.h instead of winsock.h or + netinet/in.h. + * krb524.h: Forward-declare struct types sockaddr, sockaddr_in. + 2002-07-09 Ken Raeburn <raeburn@mit.edu> * krb524.h: Put # for cpp directives in first column. diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c index 01e91bb449..b4ebc1c407 100644 --- a/src/krb524/conv_creds.c +++ b/src/krb524/conv_creds.c @@ -24,11 +24,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#ifdef _WIN32 -#include <winsock.h> -#else -#include <netinet/in.h> -#endif +#include "port-sockets.h" #if TARGET_OS_MAC #include <Kerberos/krb.h> #include <Kerberos/krb524.h> diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h index 486f8a71ab..cd46ae83c6 100644 --- a/src/krb524/krb524.h +++ b/src/krb524/krb524.h @@ -61,6 +61,9 @@ KRB524INT_BEGIN_DECLS #if KRB524_PRIVATE extern int krb524_debug; +struct sockaddr; +struct sockaddr_in; + int krb524_convert_tkt_skey (krb5_context context, krb5_ticket *v5tkt, KTEXT_ST *v4tkt, krb5_keyblock *v5_skey, krb5_keyblock *v4_skey, |