From 144e487040d14f8208281ac0b6a0e986d66ad9442766a737106f92d447ed3046 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 7 Nov 2008 14:38:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam?expand=0&rev=20 --- pam.changes | 6 ++++++ pam.spec | 17 ++++++++++------ pam_xauth-XAUTHLOCALHOSTNAME.diff | 32 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 pam_xauth-XAUTHLOCALHOSTNAME.diff diff --git a/pam.changes b/pam.changes index a432f7a..f4661e0 100644 --- a/pam.changes +++ b/pam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 4 13:42:03 CET 2008 - mc@suse.de + +- pam_xauth: put XAUTHLOCALHOSTNAME into new enviroment + (bnc#441314) + ------------------------------------------------------------------- Fri Oct 17 14:02:31 CEST 2008 - kukuk@suse.de diff --git a/pam.spec b/pam.spec index 9c0bee6..a3b1dcc 100644 --- a/pam.spec +++ b/pam.spec @@ -35,7 +35,7 @@ License: BSD 3-Clause; GPL v2 or later Group: System/Libraries AutoReqProv: on Version: 1.0.2 -Release: 10 +Release: 11 Summary: A Security Tool that Provides Authentication for Applications Source: Linux-PAM-%{version}.tar.bz2 Source1: Linux-PAM-%{version}-SUSE-docs.tar.bz2 @@ -60,6 +60,7 @@ Patch9: pam_pwhistory-0.1.diff Patch10: pam_lastlog.diff Patch11: pam_tally2.diff Patch12: pam_cracklib-no-pwhistory.diff +Patch13: pam_xauth-XAUTHLOCALHOSTNAME.diff %description PAM (Pluggable Authentication Modules) is a system security tool that @@ -116,6 +117,7 @@ chmod 755 modules/pam_pwhistory/tst-pam_pwhistory %patch11 -p1 chmod 755 modules/pam_tally2/tst-pam_tally2 %patch12 -p0 +%patch13 -p0 %build aclocal -I m4 --install --force @@ -324,6 +326,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libpam_misc.so %changelog +* Tue Nov 04 2008 mc@suse.de +- pam_xauth: put XAUTHLOCALHOSTNAME into new enviroment + (bnc#441314) * Fri Oct 17 2008 kukuk@suse.de - Add pam_tally2 - Regenerate Documentation @@ -481,7 +486,7 @@ rm -rf $RPM_BUILD_ROOT - Add all services to pam_listfile * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Jan 14 2006 kukuk@suse.de +* Fri Jan 13 2006 kukuk@suse.de - Update to Linux-PAM 0.99.3.0 release candiate tar balls (new translations) * Mon Jan 09 2006 kukuk@suse.de @@ -581,7 +586,7 @@ rm -rf $RPM_BUILD_ROOT * Sun Jan 18 2004 meissner@suse.de - We no longer have pam in the buildsystem, so we need some buildroot magic flags for the dlopen tests. -* Fri Jan 16 2004 kukuk@suse.de +* Thu Jan 15 2004 kukuk@suse.de - Cleanup neededforbuild * Fri Dec 05 2003 kukuk@suse.de - Add manual pages from SLES8 @@ -638,14 +643,14 @@ rm -rf $RPM_BUILD_ROOT - Fix to not own /usr/shar/man/man3 * Wed Mar 13 2002 kukuk@suse.de - Add /usr/include/security to pam-devel filelist -* Tue Feb 12 2002 ro@suse.de +* Mon Feb 11 2002 ro@suse.de - tar option for bz2 is "j" * Fri Jan 25 2002 kukuk@suse.de - Fix last pam_securetty patch * Thu Jan 24 2002 kukuk@suse.de - Use reentrant getpwnam functions for most modules - Fix unresolved symbols in pam_access and pam_userdb -* Mon Jan 21 2002 kukuk@suse.de +* Sun Jan 20 2002 kukuk@suse.de - libpam_misc: Don't handle Ctrl-D as error. * Wed Jan 16 2002 kukuk@suse.de - Remove SuSEconfig.pam @@ -686,7 +691,7 @@ rm -rf $RPM_BUILD_ROOT - pam_unix2: Create temp files with permission 0600 * Tue Feb 06 2001 ro@suse.de - pam_issue.c: include time.h to make it compile -* Sat Jan 06 2001 kukuk@suse.de +* Fri Jan 05 2001 kukuk@suse.de - Don't print error message about failed initialization from pam_limits with kernel 2.2 [Bug #5198] * Thu Jan 04 2001 kukuk@suse.de diff --git a/pam_xauth-XAUTHLOCALHOSTNAME.diff b/pam_xauth-XAUTHLOCALHOSTNAME.diff new file mode 100644 index 0000000..c12ac41 --- /dev/null +++ b/pam_xauth-XAUTHLOCALHOSTNAME.diff @@ -0,0 +1,32 @@ +--- modules/pam_xauth/pam_xauth.c ++++ modules/pam_xauth/pam_xauth.c 2008/11/04 10:59:23 +@@ -600,6 +600,29 @@ + free (d); + } + ++ /* set XAUTHLOCALHOSTNAME to make sure that su - work under gnome */ ++ if (getenv("XAUTHLOCALHOSTNAME") != NULL) { ++ char *d, *xauthlocalhostname; ++ ++ xauthlocalhostname = strdup(getenv("XAUTHLOCALHOSTNAME")); ++ ++ if (asprintf(&d, "XAUTHLOCALHOSTNAME=%s", xauthlocalhostname) < 0) ++ { ++ pam_syslog(pamh, LOG_DEBUG, "out of memory"); ++ free(xauthlocalhostname); ++ xauthlocalhostname = NULL; ++ retval = PAM_SESSION_ERR; ++ goto cleanup; ++ } ++ ++ if (pam_putenv (pamh, d) != PAM_SUCCESS) ++ pam_syslog (pamh, LOG_DEBUG, ++ "can't set environment variable '%s'", d); ++ free (d); ++ free(xauthlocalhostname); ++ xauthlocalhostname = NULL; ++ } ++ + /* Merge the cookie we read before into the new file. */ + if (debug) { + pam_syslog(pamh, LOG_DEBUG,