summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/ccache
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/krb5/ccache')
-rw-r--r--src/lib/krb5/ccache/ChangeLog7
-rw-r--r--src/lib/krb5/ccache/cc_file.c22
-rw-r--r--src/lib/krb5/ccache/cc_memory.c4
-rw-r--r--src/lib/krb5/ccache/cc_stdio.c18
-rw-r--r--src/lib/krb5/ccache/ccapi/ChangeLog5
-rw-r--r--src/lib/krb5/ccache/ccapi/stdcc.c10
-rw-r--r--src/lib/krb5/ccache/ccapi/stdcc.h2
-rw-r--r--src/lib/krb5/ccache/ccapi/stdcc_util.c2
-rw-r--r--src/lib/krb5/ccache/ccapi/stdcc_util.h2
-rw-r--r--src/lib/krb5/ccache/ccapi/winccld.c2
-rw-r--r--src/lib/krb5/ccache/ccbase.c2
-rw-r--r--src/lib/krb5/ccache/ccdefault.c4
-rw-r--r--src/lib/krb5/ccache/ccfns.c22
13 files changed, 41 insertions, 61 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index d76e2a7740..227af04cbd 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05 Ken Raeburn <raeburn@mit.edu>
+
+ * cc_file.c, cc_stdio.c: Delete _MSDOS (win16) support.
+
+ * cc_memory.c, ccbase.c, ccdefault.c, ccfns.c: Don't explicitly
+ declare pointers FAR any more.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* cc_file.c, ccbase.c, cccopy.c, ccdefault.c, fcc.h, ser_cc.c:
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index e389a481a4..2334307024 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -474,12 +474,8 @@ krb5_fcc_read_keyblock(context, id, keyblock)
kret = krb5_fcc_read_int32(context, id, &int32);
CHECK(kret);
-#if defined(_MSDOS)
- int32 &= VALID_INT_BITS; /* Gradient does not write correctly */
-#else
if ((int32 & VALID_INT_BITS) != int32) /* Overflow size_t??? */
return KRB5_CC_NOMEM;
-#endif
keyblock->length = (int) int32;
if ( keyblock->length == 0 )
return KRB5_OK;
@@ -513,12 +509,8 @@ krb5_fcc_read_data(context, id, data)
kret = krb5_fcc_read_int32(context, id, &len);
CHECK(kret);
-#if defined(_MSDOS)
- len &= VALID_INT_BITS;
-#else
if ((len & VALID_INT_BITS) != len)
return KRB5_CC_NOMEM;
-#endif
data->length = (int) len;
if (data->length == 0) {
@@ -560,12 +552,8 @@ krb5_fcc_read_addr(context, id, addr)
kret = krb5_fcc_read_int32(context, id, &int32);
CHECK(kret);
-#if defined(_MSDOS)
- int32 &= VALID_INT_BITS; /* Gradient DCE does this wrong */
-#else
if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
return KRB5_CC_NOMEM;
-#endif
addr->length = (int) int32;
if (addr->length == 0)
@@ -743,12 +731,8 @@ krb5_fcc_read_authdatum(context, id, a)
a->ad_type = (krb5_authdatatype)ui2;
kret = krb5_fcc_read_int32(context, id, &int32);
CHECK(kret);
-#ifdef _MSDOS
- int32 &= VALID_INT_BITS;
-#else
if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
return KRB5_CC_NOMEM;
-#endif
a->length = (int) int32;
if (a->length == 0 )
@@ -2085,7 +2069,7 @@ krb5_cc_ops krb5_fcc_ops = {
krb5_fcc_set_flags,
};
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
/*
* krb5_change_cache should be called after the cache changes.
@@ -2112,7 +2096,7 @@ krb5_get_notification_message (void) {
return message;
}
-#else /* _MSDOS || _WIN32 */
+#else /* _WIN32 */
krb5_error_code
krb5_change_cache ()
@@ -2125,7 +2109,7 @@ krb5_get_notification_message ()
return 0;
}
-#endif /* _MSDOS || _WIN32 */
+#endif /* _WIN32 */
krb5_cc_ops krb5_cc_file_ops = {
0,
diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c
index 04b290aa95..9979a3b422 100644
--- a/src/lib/krb5/ccache/cc_memory.c
+++ b/src/lib/krb5/ccache/cc_memory.c
@@ -88,7 +88,7 @@ krb5_error_code krb5_change_cache PROTOTYPE(());
typedef struct _krb5_mcc_link {
struct _krb5_mcc_link *next;
krb5_creds *creds;
-} krb5_mcc_link, FAR *krb5_mcc_cursor;
+} krb5_mcc_link, *krb5_mcc_cursor;
typedef struct _krb5_mcc_data {
struct _krb5_mcc_data *next;
@@ -97,7 +97,7 @@ typedef struct _krb5_mcc_data {
krb5_mcc_cursor link;
} krb5_mcc_data;
-static krb5_mcc_data FAR *mcc_head = 0;
+static krb5_mcc_data *mcc_head = 0;
/*
* Modifies:
diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c
index f46e5d649c..4b82919463 100644
--- a/src/lib/krb5/ccache/cc_stdio.c
+++ b/src/lib/krb5/ccache/cc_stdio.c
@@ -517,12 +517,8 @@ krb5_scc_read_keyblock(context, id, keyblock)
kret = krb5_scc_read_int32(context, id, &int32);
CHECK(kret);
-#ifdef _MSDOS
- int32 &= VALID_INT_BITS; /* Gradient does not write correctly */
-#else
if ((int32 & VALID_INT_BITS) != int32) /* Overflow size_t??? */
return KRB5_CC_NOMEM;
-#endif
keyblock->length = int32;
if ( keyblock->length == 0 )
return KRB5_OK;
@@ -556,12 +552,8 @@ krb5_scc_read_data(context, id, data)
kret = krb5_scc_read_int32(context, id, &len);
CHECK(kret);
-#ifdef _MSDOS
- len &= VALID_INT_BITS;
-#else
if ((len & VALID_INT_BITS) != len)
return KRB5_CC_NOMEM;
-#endif
data->length = (int) len;
if (data->length == 0) {
@@ -603,12 +595,8 @@ krb5_scc_read_addr(context, id, addr)
kret = krb5_scc_read_int32(context, id, &int32);
CHECK(kret);
-#ifdef _MSDOS
- int32 &= VALID_INT_BITS; /* Gradient DCE does this wrong */
-#else
if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
return KRB5_CC_NOMEM;
-#endif
addr->length = int32;
if (addr->length == 0)
@@ -779,12 +767,8 @@ krb5_scc_read_authdatum(context, id, a)
a->ad_type = (krb5_authdatatype)ui2;
kret = krb5_scc_read_int32(context, id, &int32);
CHECK(kret);
-#ifdef _MSDOS
- int32 &= VALID_INT_BITS;
-#else
if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
return KRB5_CC_NOMEM;
-#endif
a->length = int32;
if (a->length == 0 )
@@ -1896,7 +1880,7 @@ krb5_scc_generate_new (context, id)
strcpy(((krb5_scc_data *) lid->data)->filename, scratch);
/* Make sure the file name is useable */
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(_WIN32)
f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+");
#else
f = fopen (((krb5_scc_data *) lid->data)->filename, "w+");
diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 24d04add10..973583a7f0 100644
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-05 Ken Raeburn <raeburn@mit.edu>
+
+ * stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete
+ _MSDOS support.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* stdcc.h, winccld.c: Don't use KRB5_DLLIMP.
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index b39dce9fef..9899cb706e 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -36,7 +36,7 @@
apiCB *gCntrlBlock = NULL;
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#include "winccld.h"
#endif
@@ -45,7 +45,7 @@ apiCB *gCntrlBlock = NULL;
#endif
#ifdef DEBUG
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#include <io.h>
#define SHOW_DEBUG(buf) MessageBox((HWND)NULL, (buf), "ccapi debug", MB_OK)
#endif
@@ -79,7 +79,7 @@ krb5_cc_ops krb5_cc_stdcc_ops = {
krb5_stdcc_set_flags,
};
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
/*
* cache_changed be called after the cache changes.
* A notification message is is posted out to all top level
@@ -96,13 +96,13 @@ void cache_changed()
PostMessage(HWND_BROADCAST, message, 0, 0);
}
-#else /* _MSDOS || _WIN32 */
+#else /* _WIN32 */
void cache_changed()
{
return;
}
-#endif /* _MSDOS || _WIN32 */
+#endif /* _WIN32 */
struct err_xlate
{
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index 7322c199ee..e2d1131688 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -5,7 +5,7 @@
#include "CCache2.h"
#endif
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#include "cacheapi.h"
#endif
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c
index fb0150657b..b9bc56ab42 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include <string.h>
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#include <malloc.h>
#endif
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.h b/src/lib/krb5/ccache/ccapi/stdcc_util.h
index 7d3bc93f90..30d9cafd46 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.h
@@ -7,7 +7,7 @@
#include "CCache2.h"
#endif
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#include "cacheapi.h"
#endif
diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c
index 22489c10de..39d8f12278 100644
--- a/src/lib/krb5/ccache/ccapi/winccld.c
+++ b/src/lib/krb5/ccache/ccapi/winccld.c
@@ -1,4 +1,4 @@
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
/*
* winccld.c --- routine for dynamically loading the ccache DLL if
* it's present.
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 18832e3984..7c15d50709 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -48,7 +48,7 @@ static struct krb5_cc_typelist *cc_typehead = &cc_entry;
krb5_error_code KRB5_CALLCONV
krb5_cc_register(context, ops, override)
krb5_context context;
- krb5_cc_ops FAR *ops;
+ krb5_cc_ops *ops;
krb5_boolean override;
{
struct krb5_cc_typelist *t;
diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index 2c4eea9f5d..7fde85286d 100644
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -36,7 +36,7 @@
krb5_error_code KRB5_CALLCONV
krb5_cc_default(context, ccache)
krb5_context context;
- krb5_ccache FAR *ccache;
+ krb5_ccache *ccache;
{
krb5_error_code retval;
krb5_os_context os_ctx;
@@ -65,7 +65,7 @@ krb5_cc_default(context, ccache)
krb5_error_code KRB5_CALLCONV
krb5int_cc_default(context, ccache)
krb5_context context;
- krb5_ccache FAR *ccache;
+ krb5_ccache *ccache;
{
#ifdef USE_LOGIN_LIBRARY
{
diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c
index 35a17367ed..a8715b4023 100644
--- a/src/lib/krb5/ccache/ccfns.c
+++ b/src/lib/krb5/ccache/ccfns.c
@@ -30,14 +30,14 @@
#include "k5-int.h"
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
krb5_cc_get_name (krb5_context context, krb5_ccache cache)
{
return cache->ops->get_name(context, cache);
}
krb5_error_code KRB5_CALLCONV
-krb5_cc_gen_new (krb5_context context, krb5_ccache FAR *cache)
+krb5_cc_gen_new (krb5_context context, krb5_ccache *cache)
{
return (*cache)->ops->gen_new(context, cache);
}
@@ -63,50 +63,50 @@ krb5_cc_close (krb5_context context, krb5_ccache cache)
krb5_error_code KRB5_CALLCONV
krb5_cc_store_cred (krb5_context context, krb5_ccache cache,
- krb5_creds FAR *creds)
+ krb5_creds *creds)
{
return cache->ops->store(context, cache, creds);
}
krb5_error_code KRB5_CALLCONV
krb5_cc_retrieve_cred (krb5_context context, krb5_ccache cache,
- krb5_flags flags, krb5_creds FAR *mcreds,
- krb5_creds FAR *creds)
+ krb5_flags flags, krb5_creds *mcreds,
+ krb5_creds *creds)
{
return cache->ops->retrieve(context, cache, flags, mcreds, creds);
}
krb5_error_code KRB5_CALLCONV
krb5_cc_get_principal (krb5_context context, krb5_ccache cache,
- krb5_principal FAR *principal)
+ krb5_principal *principal)
{
return cache->ops->get_princ(context, cache, principal);
}
krb5_error_code KRB5_CALLCONV
krb5_cc_start_seq_get (krb5_context context, krb5_ccache cache,
- krb5_cc_cursor FAR *cursor)
+ krb5_cc_cursor *cursor)
{
return cache->ops->get_first(context, cache, cursor);
}
krb5_error_code KRB5_CALLCONV
krb5_cc_next_cred (krb5_context context, krb5_ccache cache,
- krb5_cc_cursor FAR *cursor, krb5_creds FAR *creds)
+ krb5_cc_cursor *cursor, krb5_creds *creds)
{
return cache->ops->get_next(context, cache, cursor, creds);
}
krb5_error_code KRB5_CALLCONV
krb5_cc_end_seq_get (krb5_context context, krb5_ccache cache,
- krb5_cc_cursor FAR *cursor)
+ krb5_cc_cursor *cursor)
{
return cache->ops->end_get(context, cache, cursor);
}
krb5_error_code KRB5_CALLCONV
krb5_cc_remove_cred (krb5_context context, krb5_ccache cache, krb5_flags flags,
- krb5_creds FAR *creds)
+ krb5_creds *creds)
{
return cache->ops->remove_cred(context, cache, flags, creds);
}
@@ -117,7 +117,7 @@ krb5_cc_set_flags (krb5_context context, krb5_ccache cache, krb5_flags flags)
return cache->ops->set_flags(context, cache, flags);
}
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
krb5_cc_get_type (krb5_context context, krb5_ccache cache)
{
return cache->ops->prefix;
generated by cgit (git 2.34.1) at 2024-09-28 17:29:01 +0000