diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-06-12 05:11:08 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-06-12 05:11:08 +0000 |
| commit | 1d96142ea915b48adfbfd23b5d870df03bd64528 (patch) | |
| tree | de056b9ed0f16842f004edfc1bed455c9470b45d /src | |
| parent | 4573b8613c55224c674f17ae8cbdedbd14682b23 (diff) | |
| download | krb5-1d96142ea915b48adfbfd23b5d870df03bd64528.tar.gz krb5-1d96142ea915b48adfbfd23b5d870df03bd64528.tar.xz krb5-1d96142ea915b48adfbfd23b5d870df03bd64528.zip | |
sendauth.c (krb5_sendauth): If ECCONABORTED is not defined, try using
the Winsock equivalent (WSAECONNABORTED).
parse.c (krb5_parse_name): Change use of _WINDOWS to _MSDOS, and add
check for _WIN32.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8315 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 10 | ||||
| -rw-r--r-- | src/lib/krb5/krb/parse.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/sendauth.c | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 55a12e3cb..df4c1e5d8 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,13 @@ +Wed Jun 12 01:10:09 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * sendauth.c (krb5_sendauth): If ECCONABORTED is not defined, try + using the Winsock equivalent (WSAECONNABORTED). + +Mon Jun 10 21:47:21 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * parse.c (krb5_parse_name): Change use of _WINDOWS to _MSDOS, and + add check for _WIN32. + Thu Jun 6 00:06:18 1996 Theodore Y. Ts'o <tytso@mit.edu> * get_creds.c (krb5_get_credentials_core): A static function must diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index e2ee12cc1..dbe9356fb 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -186,7 +186,7 @@ krb5_parse_name(context, name, nprincipal) else krb5_princ_component(context, principal, i)->length = size; if (i + 1 != components) { -#if !defined(_WINDOWS) && !defined(_MACINTOSH) +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) fprintf(stderr, "Programming error in krb5_parse_name!"); exit(1); diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index 3ec5b34f8..d77afdc9b 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -88,6 +88,9 @@ krb5_sendauth(context, auth_context, * Now, read back a byte: 0 means no error, 1 means bad sendauth * version, 2 means bad application version */ +#ifndef ECONNABORTED +#define ECONNABORTED WSAECONNABORTED +#endif if ((len = krb5_net_read(context, *((int *) fd), (char *)&result, 1)) != 1) return((len < 0) ? errno : ECONNABORTED); if (result == 1) |