diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 16:09:38 -0800 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 16:09:38 -0800 |
| commit | 03398c56c56ed427818d2ce879d45d1009f7d46b (patch) | |
| tree | 9a7bc0d7d15ac988ac9ad31ad18a769030faced7 /Linux-PAM/modules/pam_xauth | |
| parent | e78677298d54010c3a62b932baefdae152fd0fed (diff) | |
| parent | 281e859131adad49301befbc50cfc5cd282c6937 (diff) | |
merge upstream version 0.99.9.0
Diffstat (limited to 'Linux-PAM/modules/pam_xauth')
| -rw-r--r-- | Linux-PAM/modules/pam_xauth/Makefile.in | 1 | ||||
| -rw-r--r-- | Linux-PAM/modules/pam_xauth/pam_xauth.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Linux-PAM/modules/pam_xauth/Makefile.in b/Linux-PAM/modules/pam_xauth/Makefile.in index 944d6778..6e5ea64e 100644 --- a/Linux-PAM/modules/pam_xauth/Makefile.in +++ b/Linux-PAM/modules/pam_xauth/Makefile.in @@ -175,6 +175,7 @@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCONFIGDIR = @SCONFIGDIR@ SECUREDIR = @SECUREDIR@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff --git a/Linux-PAM/modules/pam_xauth/pam_xauth.c b/Linux-PAM/modules/pam_xauth/pam_xauth.c index 3772bd06..1135d4b7 100644 --- a/Linux-PAM/modules/pam_xauth/pam_xauth.c +++ b/Linux-PAM/modules/pam_xauth/pam_xauth.c @@ -63,6 +63,11 @@ #define XAUTHDEF ".Xauthority" #define XAUTHTMP ".xauthXXXXXX" +/* Hurd compatibility */ +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + /* Possible paths to xauth executable */ static const char * const xauthpaths[] = { #ifdef PAM_PATH_XAUTH @@ -573,6 +578,7 @@ pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED, "can't set environment variable '%s'", xauthority); putenv (xauthority); /* The environment owns this string now. */ + xauthority = NULL; /* Don't free environment variables. */ /* set $DISPLAY in pam handle to make su - work */ { |