Hello community, here is the log from the commit of package pam for openSUSE:11.4 checked in at Sun Feb 27 13:11:32 CET 2011.
-------- --- old-versions/11.4/all/pam/pam.changes 2010-10-28 16:27:30.000000000 +0200 +++ 11.4/pam/pam.changes 2011-02-23 13:46:27.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Feb 23 12:45:03 UTC 2011 - [email protected] + +- bnc#673826 rework + * manpage is left intact, as it was + * correct parsing of "quiet" option + +------------------------------------------------------------------- + +Wed Feb 23 10:00:22 UTC 2011 - [email protected] + +- fix for bnc#673826 (pam_listfile) + * removed unnecessary logging when listfile is missing and quiet +option is specified + * manpage is also updated, to reflect that all option +require values + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- pam_listfile-quiet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.y0EiLV/_old 2011-02-27 13:10:50.000000000 +0100 +++ /var/tmp/diff_new_pack.y0EiLV/_new 2011-02-27 13:10:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pam (Version 1.1.3) +# spec file for package pam # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,7 @@ %endif # Version: 1.1.3 -Release: 1 +Release: 4.<RELEASE2> Summary: A Security Tool that Provides Authentication for Applications Source: Linux-PAM-%{version}.tar.bz2 Source1: Linux-PAM-%{version}-docs.tar.bz2 @@ -50,7 +50,9 @@ Source7: common-session.pamd Source8: etc.environment Source9: baselibs.conf -Patch: pam_tally-deprecated.diff +Patch0: pam_tally-deprecated.diff +# fix for bnc#673826 (pam_listfile logging) +Patch1: pam_listfile-quiet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -99,7 +101,8 @@ %prep %setup -q -n Linux-PAM-%{version} -b 1 -%patch -p0 +%patch0 -p0 +%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" \ ++++++ pam_listfile-quiet.patch ++++++ diff -u -r Linux-PAM-1.1.3.orig/modules/pam_listfile/pam_listfile.c Linux-PAM-1.1.3/modules/pam_listfile/pam_listfile.c --- Linux-PAM-1.1.3.orig/modules/pam_listfile/pam_listfile.c 2009-12-08 15:41:41.000000000 +0100 +++ Linux-PAM-1.1.3/modules/pam_listfile/pam_listfile.c 2011-02-23 13:27:04.356265509 +0100 @@ -78,8 +78,14 @@ { const char *junk; + /* option quiet has no value */ + if(!strcmp(argv[i],"quiet")) { + quiet = 1; + continue; + } + memset(mybuf,'\0',sizeof(mybuf)); - memset(myval,'\0',sizeof(mybuf)); + memset(myval,'\0',sizeof(myval)); junk = strchr(argv[i], '='); if((junk == NULL) || (junk - argv[i]) >= (int) sizeof(mybuf)) { pam_syslog(pamh,LOG_ERR, "Bad option: \"%s\"", @@ -142,8 +148,6 @@ apply_type=APPLY_TYPE_USER; strncpy(apply_val,myval,sizeof(apply_val)-1); } - } else if (!strcmp(mybuf,"quiet")) { - quiet = 1; } else { free(ifname); pam_syslog(pamh,LOG_ERR, "Unknown option: %s",mybuf); @@ -283,7 +287,8 @@ ifname, citem, citemp, sense); #endif if(lstat(ifname,&fileinfo)) { - pam_syslog(pamh,LOG_ERR, "Couldn't open %s",ifname); + if(!quiet) + pam_syslog(pamh,LOG_ERR, "Couldn't open %s",ifname); free(ifname); return onerr; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
