Mailinglist Archive: opensuse-commit (1318 mails)

< Previous Next >
commit gnome-screensaver
  • From: root@xxxxxxx (h_root)
  • Date: Tue, 29 Aug 2006 16:46:53 +0200 (CEST)
  • Message-id: <20060829144653.263F69522A@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gnome-screensaver
checked in at Tue Aug 29 16:46:53 CEST 2006.

--------
--- GNOME/gnome-screensaver/gnome-screensaver.changes 2006-08-16 11:07:42.000000000 +0200
+++ gnome-screensaver/gnome-screensaver.changes 2006-08-29 16:42:13.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 29 16:41:19 CEST 2006 - rodrigo@xxxxxxx
+
+- Added patch to disable root's ability to unlock users'
+ screensaver (#186204)
+- Added missing build dependencies
+
+-------------------------------------------------------------------

New:
----
gnome-screensaver-disable-root-unlock.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.cAzFw7/_old 2006-08-29 16:46:08.000000000 +0200
+++ /var/tmp/diff_new_pack.cAzFw7/_new 2006-08-29 16:46:08.000000000 +0200
@@ -11,9 +11,9 @@
# norootforbuild

Name: gnome-screensaver
-BuildRequires: gnome-common gnome-menus-devel gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt mDNSResponder-devel pam-devel perl-XML-Parser update-desktop-files xscreensaver
+BuildRequires: dbus-1-devel dbus-1-glib-devel gnome-common gnome-menus-devel gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt mDNSResponder-devel openssl-devel pam-devel perl-XML-Parser update-desktop-files xscreensaver
Version: 2.14.0
-Release: 27
+Release: 29
URL: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPL
@@ -26,6 +26,7 @@
Patch6: gnome-screensaver-unlock-dialog-size.patch
Patch7: gnome-screensaver-configure.patch
Patch8: gnome-screensaver-dbus-api-fix-thoenig-01.patch
+Patch9: gnome-screensaver-disable-root-unlock.patch
Autoreqprov: on
Requires: /sbin/unix2_chkpwd xscreensaver
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -56,6 +57,7 @@
%patch6 -p1
%patch7
%patch8
+%patch9 -p1
rm po/no.*
sed -i "/ALL_LINGUAS=/,/^$/s/ no / /" configure.ac

@@ -113,6 +115,10 @@
/opt/gnome/share/pixmaps/gnome-logo-white.svg

%changelog -n gnome-screensaver
+* Tue Aug 29 2006 - rodrigo@xxxxxxx
+- Added patch to disable root's ability to unlock users'
+ screensaver (#186204)
+- Added missing build dependencies
* Mon Aug 14 2006 - thoenig@xxxxxxx
- Add patch gnome-screensaver-dbus-api-fix-thoenig-01.patch: Use
dbus_connection_close, not dbus_connection_disconnect

++++++ gnome-screensaver-disable-root-unlock.patch ++++++
diff -upr gnome-screensaver-2.14.0-orig/src/passwd-helper.c gnome-screensaver-2.14.0/src/passwd-helper.c
--- gnome-screensaver-2.14.0-orig/src/passwd-helper.c 2005-07-08 14:02:45.000000000 +0200
+++ gnome-screensaver-2.14.0/src/passwd-helper.c 2006-06-09 13:32:17.000000000 +0200
@@ -49,6 +49,7 @@
#include <sys/wait.h>

#include <glib.h>
+#include <gconf/gconf-client.h>

#include "passwd-helper.h"
#include "subprocs.h"
@@ -129,8 +130,15 @@ ext_passwd_valid (const char *typed_pass
res = ext_run (pw->pw_name, typed_passwd, verbose);
endpwent ();

- if (!res)
- res = ext_run ("root", typed_passwd, verbose);
+ if (!res) {
+ gboolean val;
+ GConfClient *conf_client = gconf_client_get_default ();
+
+ val = gconf_client_get_bool (conf_client, "/apps/gnome-screensaver/disable_root_unlocking", NULL);
+ g_object_unref (conf_client);
+ if (!val)
+ res = ext_run ("root", typed_passwd, verbose);
+ }

return res;
}
Only in gnome-screensaver-2.14.0/src: passwd-helper.c~
diff -upr gnome-screensaver-2.14.0-orig/src/passwd-pam.c gnome-screensaver-2.14.0/src/passwd-pam.c
--- gnome-screensaver-2.14.0-orig/src/passwd-pam.c 2005-06-16 22:53:10.000000000 +0200
+++ gnome-screensaver-2.14.0/src/passwd-pam.c 2006-06-09 13:13:55.000000000 +0200
@@ -55,6 +55,7 @@

#include <glib.h>
#include <glib/gstdio.h>
+#include <gconf/gconf-client.h>

#include "passwd-pam.h"

@@ -263,6 +264,17 @@ pam_passwd_valid (const char *typed_pass
goto DONE;
}

+ /* If unlocking as root is disabled, fail */
+ {
+ gboolean val;
+ GConfClient *conf_client = gconf_client_get_default ();
+
+ val = gconf_client_get_bool (conf_client, "/apps/gnome-screensaver/disable_root_unlocking", NULL);
+ g_object_unref (conf_client);
+ if (val)
+ goto DONE;
+ }
+
/* If that didn't work, set the user to root, and try to authenticate again.
*/
if (user)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread