mirror of
https://git.openafs.org/openafs.git
synced 2025-01-21 00:10:15 +00:00
Import of code from heimdal
This commit updates the code imported from heimdal to 8ce821c38744b30e226ff024f675668b991b984d (switch-from-svn-to-git-1998-g8ce821c) Upstream changes are: Asanka C. Herath (2): Revert use of backslash as an escape for double quote in config strings Condition roken's ssize_t definition for compatibility Love Hornquist Astrand (1): don't undefined SLIST Change-Id: I8855e060e88008f95eb2b24b029843081702fc04 Reviewed-on: http://gerrit.openafs.org/3761 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
parent
962a95c21c
commit
29ef47dfab
2
src/external/heimdal-last
vendored
2
src/external/heimdal-last
vendored
@ -1 +1 @@
|
||||
42f9c644cf00be752f09d85a9664bf2e3502101c
|
||||
8ce821c38744b30e226ff024f675668b991b984d
|
||||
|
7
src/external/heimdal/krb5/config_file.c
vendored
7
src/external/heimdal/krb5/config_file.c
vendored
@ -877,12 +877,7 @@ next_component_string(char * begin, char * delims, char **state)
|
||||
|
||||
end = begin;
|
||||
while (*end == '"') {
|
||||
char * t;
|
||||
while ((t = strchr(end + 1, '"')) != NULL && *(t - 1) == '\\') {
|
||||
--t;
|
||||
memmove(t, t + 1, strlen(t));
|
||||
end = t;
|
||||
}
|
||||
char * t = strchr(end + 1, '"');
|
||||
|
||||
if (t)
|
||||
end = ++t;
|
||||
|
5
src/external/heimdal/roken/roken-common.h
vendored
5
src/external/heimdal/roken/roken-common.h
vendored
@ -150,11 +150,6 @@
|
||||
|
||||
#endif /* !_WIN32 */
|
||||
|
||||
/* Minimize conflict with WinNT.h */
|
||||
#ifdef SLIST_ENTRY
|
||||
#undef SLIST_ENTRY
|
||||
#endif
|
||||
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX MAX_PATH
|
||||
#endif
|
||||
|
8
src/external/heimdal/roken/roken.h.in
vendored
8
src/external/heimdal/roken/roken.h.in
vendored
@ -262,12 +262,18 @@ struct sockaddr_dl;
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_SSIZE_T
|
||||
#ifndef SSIZE_T_DEFINED
|
||||
#ifdef ssize_t
|
||||
#undef ssize_t
|
||||
#endif
|
||||
#ifdef _WIN64
|
||||
typedef __int64 ssize_t;
|
||||
#else
|
||||
typedef int ssize_t;
|
||||
#endif
|
||||
#endif
|
||||
#define SSIZE_T_DEFINED
|
||||
#endif /* SSIZE_T_DEFINED */
|
||||
#endif /* HAVE_SSIZE_T */
|
||||
|
||||
#include <roken-common.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user