oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Token "username" should be multi-platform

Browse Source
This commit is contained in:
Nicolas Williams
2019-06-22 17:55:37 -05:00
parent 8bc5d5af10
commit dd226b6f9a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/expand_path.c
View File

@@ -307,6 +307,7 @@ _expand_euid(krb5_context context, PTYPE param, const char *postfix, char **str)
return krb5_enomem(context); return krb5_enomem(context);
return 0; return 0;
} }
#endif /* _WIN32 */
static krb5_error_code static krb5_error_code
_expand_username(krb5_context context, PTYPE param, const char *postfix, char **str) _expand_username(krb5_context context, PTYPE param, const char *postfix, char **str)
@@ -327,7 +328,6 @@ _expand_username(krb5_context context, PTYPE param, const char *postfix, char **
return 0; return 0;
} }
#endif /* _WIN32 */
/** /**
* Expand an extra token * Expand an extra token
@@ -394,8 +394,8 @@ static const struct {
{"LIBEXEC", FTYPE_SPECIAL, 0, LIBEXECDIR, _expand_path}, {"LIBEXEC", FTYPE_SPECIAL, 0, LIBEXECDIR, _expand_path},
{"SBINDIR", FTYPE_SPECIAL, 0, SBINDIR, _expand_path}, {"SBINDIR", FTYPE_SPECIAL, 0, SBINDIR, _expand_path},
{"euid", SPECIAL(_expand_euid)}, {"euid", SPECIAL(_expand_euid)},
{"username", SPECIAL(_expand_username)},
#endif #endif
{"username", SPECIAL(_expand_username)},
{"TEMP", SPECIAL(_expand_temp_folder)}, {"TEMP", SPECIAL(_expand_temp_folder)},
{"USERID", SPECIAL(_expand_userid)}, {"USERID", SPECIAL(_expand_userid)},
{"uid", SPECIAL(_expand_userid)}, {"uid", SPECIAL(_expand_userid)},