Hello community,
here is the log from the commit of package gdm
checked in at Fri Jun 9 23:38:16 CEST 2006.
--------
--- GNOME/gdm/gdm.changes 2006-06-01 01:07:03.000000000 +0200
+++ gdm/gdm.changes 2006-06-09 23:36:58.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 9 23:36:47 CEST 2006 - hpj@suse.de
+
+- Update domain entry patch to default to the currently joined
+ Active Directory domain if there was no stored preference. Fixes
+ Novell bug #167344.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.Eu5dsM/_old 2006-06-09 23:38:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Eu5dsM/_new 2006-06-09 23:38:06.000000000 +0200
@@ -22,7 +22,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.8.0.7
-Release: 66
+Release: 68
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -241,6 +241,10 @@
%endif
%changelog -n gdm
+* Fri Jun 09 2006 - hpj@suse.de
+- Update domain entry patch to default to the currently joined
+ Active Directory domain if there was no stored preference. Fixes
+ Novell bug #167344.
* Thu Jun 01 2006 - hpj@suse.de
- Don't let any user configure GDM from the login screen if a
theme with user list is in effect. Fixes Novell bug #180219.
++++++ gdm-2.8.0.7-domain-entry.patch ++++++
--- /var/tmp/diff_new_pack.Eu5dsM/_old 2006-06-09 23:38:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Eu5dsM/_new 2006-06-09 23:38:07.000000000 +0200
@@ -1,7 +1,7 @@
-diff -Nurp gdm-2.8.0.7-pre/config/gdm.conf.in gdm-2.8.0.7-post/config/gdm.conf.in
---- gdm-2.8.0.7-pre/config/gdm.conf.in 2006-02-05 20:58:31.000000000 -0600
-+++ gdm-2.8.0.7-post/config/gdm.conf.in 2006-02-05 20:58:46.000000000 -0600
-@@ -415,6 +415,9 @@ GraphicalThemeRand=false
+diff -urp gdm-2.8.0.7-pre/config/gdm.conf.in gdm-2.8.0.7-post/config/gdm.conf.in
+--- gdm-2.8.0.7-pre/config/gdm.conf.in 2006-06-08 18:38:06.000000000 -0500
++++ gdm-2.8.0.7-post/config/gdm.conf.in 2006-06-08 18:38:20.000000000 -0500
+@@ -416,6 +416,9 @@ SoundOnLogin=false
#SoundOnLoginFailure=false
#SoundOnLoginFailureFile=
@@ -11,9 +11,11 @@
# The chooser is what's displayed when a user wants an indirect XDMCP
# session, or selects Run XDMCP chooser from the system menu
[chooser]
-diff -Nurp gdm-2.8.0.7-pre/daemon/gdm.c gdm-2.8.0.7-post/daemon/gdm.c
---- gdm-2.8.0.7-pre/daemon/gdm.c 2006-02-05 20:58:31.000000000 -0600
-+++ gdm-2.8.0.7-post/daemon/gdm.c 2006-02-05 20:58:46.000000000 -0600
+Only in gdm-2.8.0.7-pre/config: gdm.conf.in.orig
+Only in gdm-2.8.0.7-pre: configure.in.orig
+diff -urp gdm-2.8.0.7-pre/daemon/gdm.c gdm-2.8.0.7-post/daemon/gdm.c
+--- gdm-2.8.0.7-pre/daemon/gdm.c 2006-06-08 18:38:06.000000000 -0500
++++ gdm-2.8.0.7-post/daemon/gdm.c 2006-06-08 18:38:20.000000000 -0500
@@ -232,6 +232,7 @@ gboolean GdmSoundOnLoginFailure = FALSE;
gchar *GdmSoundOnLoginFailureFile = NULL;
gchar *GdmConsoleCannotHandle = NULL;
@@ -55,9 +57,10 @@
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_ALLOWROOT, &GdmAllowRoot)) &&
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_ALLOWREMOTEAUTOLOGIN, &GdmAllowRemoteAutoLogin)) &&
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_AUTOMATICLOGIN_ENABLE, &GdmAutomaticLoginEnable)) &&
-diff -Nurp gdm-2.8.0.7-pre/daemon/gdm.h gdm-2.8.0.7-post/daemon/gdm.h
+Only in gdm-2.8.0.7-pre/daemon: gdm.c.orig
+diff -urp gdm-2.8.0.7-pre/daemon/gdm.h gdm-2.8.0.7-post/daemon/gdm.h
--- gdm-2.8.0.7-pre/daemon/gdm.h 2005-10-06 14:25:44.000000000 -0500
-+++ gdm-2.8.0.7-post/daemon/gdm.h 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/daemon/gdm.h 2006-06-08 18:38:20.000000000 -0500
@@ -321,6 +321,8 @@ enum {
#define GDM_KEY_GRAPHICAL_THEME_RAND "greeter/GraphicalThemeRand=false"
#define GDM_KEY_GRAPHICAL_THEME_DIR "greeter/GraphicalThemeDir=" EXPANDED_DATADIR "/gdm/themes/"
@@ -75,9 +78,10 @@
#define GDM_NOTIFY_SOUND_ON_LOGIN_READY_FILE "SoundOnLoginFile" /* <sound file> */
#define GDM_NOTIFY_SOUND_ON_LOGIN_SUCCESS_FILE "SoundOnLoginSuccessFile" /* <sound file> */
#define GDM_NOTIFY_SOUND_ON_LOGIN_FAILURE_FILE "SoundOnLoginFailureFile" /* <sound file> */
-diff -Nurp gdm-2.8.0.7-pre/daemon/verify-pam.c gdm-2.8.0.7-post/daemon/verify-pam.c
+Only in gdm-2.8.0.7-pre/daemon: slave.c.orig
+diff -urp gdm-2.8.0.7-pre/daemon/verify-pam.c gdm-2.8.0.7-post/daemon/verify-pam.c
--- gdm-2.8.0.7-pre/daemon/verify-pam.c 2005-09-29 16:06:52.000000000 -0500
-+++ gdm-2.8.0.7-post/daemon/verify-pam.c 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/daemon/verify-pam.c 2006-06-08 18:38:20.000000000 -0500
@@ -69,6 +69,8 @@ static char *tmp_PAM_USER = NULL;
/* this is another hack */
@@ -160,9 +164,9 @@
if ((pamerr = pam_authenticate (pamh, null_tok)) != PAM_SUCCESS) {
if (gdm_slave_action_pending ()) {
gdm_error (_("Couldn't authenticate user"));
-diff -Nurp gdm-2.8.0.7-pre/gui/gdmlogin.c gdm-2.8.0.7-post/gui/gdmlogin.c
+diff -urp gdm-2.8.0.7-pre/gui/gdmlogin.c gdm-2.8.0.7-post/gui/gdmlogin.c
--- gdm-2.8.0.7-pre/gui/gdmlogin.c 2005-11-22 14:43:50.000000000 -0600
-+++ gdm-2.8.0.7-post/gui/gdmlogin.c 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/gui/gdmlogin.c 2006-06-08 18:38:20.000000000 -0500
@@ -156,6 +156,7 @@ gchar *GdmExclude = NULL;
gboolean GdmIncludeAll;
gboolean GdmAllowRoot;
@@ -179,9 +183,9 @@
GdmAllowRemoteRoot = ve_config_get_bool (config, GDM_KEY_ALLOWREMOTEROOT);
GdmBrowser = ve_config_get_bool (config, GDM_KEY_BROWSER);
GdmLogo = ve_config_get_string (config, GDM_KEY_LOGO);
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter.c gdm-2.8.0.7-post/gui/greeter/greeter.c
---- gdm-2.8.0.7-pre/gui/greeter/greeter.c 2006-02-05 20:58:31.000000000 -0600
-+++ gdm-2.8.0.7-post/gui/greeter/greeter.c 2006-02-05 20:58:46.000000000 -0600
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter.c gdm-2.8.0.7-post/gui/greeter/greeter.c
+--- gdm-2.8.0.7-pre/gui/greeter/greeter.c 2006-06-08 18:38:06.000000000 -0500
++++ gdm-2.8.0.7-post/gui/greeter/greeter.c 2006-06-08 18:38:20.000000000 -0500
@@ -120,6 +120,7 @@ gchar *GdmSoundOnLoginFailureFile;
gchar *GdmSoundProgram;
gboolean GdmUseCirclesInEntry = FALSE;
@@ -383,9 +387,9 @@
gdm_common_abort ("Unexpected greeter command received: '%c'", buf[0]);
break;
}
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_canvas_item.c gdm-2.8.0.7-post/gui/greeter/greeter_canvas_item.c
---- gdm-2.8.0.7-pre/gui/greeter/greeter_canvas_item.c 2006-02-05 20:58:31.000000000 -0600
-+++ gdm-2.8.0.7-post/gui/greeter/greeter_canvas_item.c 2006-02-05 22:33:55.000000000 -0600
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter_canvas_item.c gdm-2.8.0.7-post/gui/greeter/greeter_canvas_item.c
+--- gdm-2.8.0.7-pre/gui/greeter/greeter_canvas_item.c 2006-06-08 18:38:06.000000000 -0500
++++ gdm-2.8.0.7-post/gui/greeter/greeter_canvas_item.c 2006-06-08 19:16:54.000000000 -0500
@@ -20,6 +20,8 @@
#include
@@ -406,8 +410,8 @@
static void
apply_tint (GdkPixbuf *pixbuf, guint32 tint_color)
-@@ -318,6 +324,168 @@ set_root_pixmap (GdkPixmap *pixmap)
- XFlush (display);
+@@ -320,6 +326,189 @@ set_root_pixmap (GdkPixmap *pixmap)
+ return FALSE;
}
+gboolean greeter_can_do_domain_login = FALSE;
@@ -422,8 +426,17 @@
+static void
+wbinfo_end (void)
+{
-+ gint wbinfo_status = 0;
-+ gchar *wbinfo_output;
++ GreeterItemInfo *domain_entry_item_info;
++ GtkWidget *domain_entry = NULL;
++ gint wbinfo_status = 0;
++ gchar *wbinfo_output;
++ GtkListStore *domain_list_store;
++ gchar **tokens = NULL;
++ gchar *own_domain = NULL;
++ gint select_index = 0;
++ GtkTreeIter iter;
++ const gchar *text;
++ gint i;
+
+ if (!greeter_wbinfo_is_running)
+ return;
@@ -434,38 +447,45 @@
+
+ wbinfo_output = g_string_free (greeter_wbinfo_output, FALSE);
+
-+ if (WEXITSTATUS (wbinfo_status) == 0 && wbinfo_output && *wbinfo_output) {
-+ GtkListStore *domain_list_store;
-+ GreeterItemInfo *domain_entry_item_info;
-+ GtkWidget *domain_entry = NULL;
-+ gchar **tokens;
-+ GtkTreeIter iter;
-+ gint i;
++ domain_entry_item_info = greeter_lookup_id ("domain-entry");
++ if (domain_entry_item_info && domain_entry_item_info->item &&
++ GNOME_IS_CANVAS_WIDGET (domain_entry_item_info->item)) {
++ domain_entry = GNOME_CANVAS_WIDGET (domain_entry_item_info->item)->widget;
++ } else {
++ g_free (wbinfo_output);
++ return;
++ }
++
++ /* Set up the domain store model */
++
++ domain_list_store = gtk_list_store_new (1, G_TYPE_STRING);
+
++ /* The "local login" entry */
++
++ gtk_list_store_append (domain_list_store, &iter);
++ gtk_list_store_set (domain_list_store, &iter,
++ 0, _("<Local>"),
++ -1);
++
++ /* Process wbinfo output, if any */
++
++ if (WEXITSTATUS (wbinfo_status) == 0 && wbinfo_output && *wbinfo_output) {
+ /* The first line of output should be the domain separator,
+ * and any remaining lines are trusted domains. */
+ tokens = g_strsplit_set (wbinfo_output, "\n\r", WBINFO_DOMAINS_MAX + 1);
-+ g_free (wbinfo_output);
++ }
+
-+ /* No legit output at all? We have been cheated. */
-+ if (!tokens [0]) {
-+ g_strfreev (tokens);
-+ return;
-+ }
++ g_free (wbinfo_output);
++ g_free (greeter_domain_separator);
++ greeter_domain_separator = NULL;
+
++ if (tokens && tokens [0]) {
+ greeter_can_do_domain_login = TRUE;
-+ g_free (greeter_domain_separator);
+ greeter_domain_separator = g_strdup (tokens [0]);
+
-+ /* Generate a sorted list of domains for the domain selector combo. */
-+
-+ domain_list_store = gtk_list_store_new (1, G_TYPE_STRING);
++ own_domain = tokens [1];
+
-+ /* The "local login" entry */
-+ gtk_list_store_append (domain_list_store, &iter);
-+ gtk_list_store_set (domain_list_store, &iter,
-+ 0, _("<Local>"),
-+ -1);
++ /* Generate a sorted list of domains for the domain selector combo. */
+
+ g_qsort_with_data (&tokens [1],
+ g_strv_length (tokens) - 1,
@@ -482,25 +502,30 @@
+ gtk_list_store_set (domain_list_store, &iter,
+ 0, tokens [i],
+ -1);
-+ }
-+
-+ g_strfreev (tokens);
+
-+ domain_entry_item_info = greeter_lookup_id ("domain-entry");
-+ if (domain_entry_item_info && domain_entry_item_info->item &&
-+ GNOME_IS_CANVAS_WIDGET (domain_entry_item_info->item))
-+ domain_entry = GNOME_CANVAS_WIDGET (domain_entry_item_info->item)->widget;
-+
-+ if (domain_entry) {
-+ gtk_combo_box_set_model (GTK_COMBO_BOX (domain_entry),
-+ GTK_TREE_MODEL (domain_list_store));
-+ gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (domain_entry), 0);
++ if (tokens [i] == own_domain)
++ select_index = i;
+ }
+
-+ g_object_unref (domain_list_store);
+ } else {
-+ g_free (wbinfo_output);
++ greeter_can_do_domain_login = FALSE;
+ }
++
++ if (tokens)
++ g_strfreev (tokens);
++
++ /* Assign model and default selection to widget */
++
++ gtk_combo_box_set_model (GTK_COMBO_BOX (domain_entry),
++ GTK_TREE_MODEL (domain_list_store));
++ gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (domain_entry), 0);
++
++ /* Default to our own domain, but only if the entry was empty */
++ text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (domain_entry))));
++ if (!text || !*text)
++ gtk_combo_box_set_active (GTK_COMBO_BOX (domain_entry), select_index);
++
++ g_object_unref (domain_list_store);
+}
+
+static gboolean
@@ -524,7 +549,7 @@
+static void
+wbinfo_begin (void)
+{
-+ gchar *wbinfo_args [] = { "wbinfo", "--separator", "--all-domains", NULL };
++ gchar *wbinfo_args [] = { "wbinfo", "--separator", "--own-domain", "--trusted-domains", NULL };
+ gchar *wbinfo_env [] = { NULL };
+ gint wbinfo_stdout_fd;
+
@@ -575,7 +600,7 @@
void
greeter_item_create_canvas_item (GreeterItemInfo *item)
{
-@@ -578,6 +746,48 @@ greeter_item_create_canvas_item (Greeter
+@@ -580,6 +769,48 @@ greeter_item_create_canvas_item (Greeter
break;
@@ -624,9 +649,9 @@
case GREETER_ITEM_TYPE_LIST:
/* Note a list type must be setup later and we will add the list store
* to it then, depending on the type. Likely userlist is the
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_configuration.h gdm-2.8.0.7-post/gui/greeter/greeter_configuration.h
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter_configuration.h gdm-2.8.0.7-post/gui/greeter/greeter_configuration.h
--- gdm-2.8.0.7-pre/gui/greeter/greeter_configuration.h 2005-04-18 21:57:56.000000000 -0500
-+++ gdm-2.8.0.7-post/gui/greeter/greeter_configuration.h 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/gui/greeter/greeter_configuration.h 2006-06-08 18:38:20.000000000 -0500
@@ -62,6 +62,7 @@ extern gchar *GdmSoundOnLoginFailureFile
extern gboolean GdmSoundOnLoginReady;
extern gboolean GdmSoundOnLoginSuccess;
@@ -635,9 +660,10 @@
extern gboolean GDM_IS_LOCAL;
extern gboolean DOING_GDM_DEVELOPMENT;
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter.h gdm-2.8.0.7-post/gui/greeter/greeter.h
+Only in gdm-2.8.0.7-pre/gui/greeter: greeter.c.orig
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter.h gdm-2.8.0.7-post/gui/greeter/greeter.h
--- gdm-2.8.0.7-pre/gui/greeter/greeter.h 2005-10-06 16:34:32.000000000 -0500
-+++ gdm-2.8.0.7-post/gui/greeter/greeter.h 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/gui/greeter/greeter.h 2006-06-08 18:38:20.000000000 -0500
@@ -21,12 +21,18 @@
#include
@@ -657,9 +683,9 @@
void greeter_ignore_buttons (gboolean val);
#endif
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_item.c gdm-2.8.0.7-post/gui/greeter/greeter_item.c
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter_item.c gdm-2.8.0.7-post/gui/greeter/greeter_item.c
--- gdm-2.8.0.7-pre/gui/greeter/greeter_item.c 2005-04-06 14:37:29.000000000 -0500
-+++ gdm-2.8.0.7-post/gui/greeter/greeter_item.c 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/gui/greeter/greeter_item.c 2006-06-08 18:38:20.000000000 -0500
@@ -313,6 +313,9 @@ greeter_item_is_visible (GreeterItemInfo
! (info->show_modes & GREETER_ITEM_SHOW_REMOTE))
return FALSE;
@@ -670,9 +696,9 @@
if (( ! GdmConfigAvailable || ! GdmSystemMenu || ! GdmConfiguratorFound) &&
info->show_type != NULL &&
strcmp (info->show_type, "config") == 0)
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_item.h gdm-2.8.0.7-post/gui/greeter/greeter_item.h
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter_item.h gdm-2.8.0.7-post/gui/greeter/greeter_item.h
--- gdm-2.8.0.7-pre/gui/greeter/greeter_item.h 2005-04-19 19:47:25.000000000 -0500
-+++ gdm-2.8.0.7-post/gui/greeter/greeter_item.h 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/gui/greeter/greeter_item.h 2006-06-08 18:38:20.000000000 -0500
@@ -46,7 +46,8 @@ enum _GreeterItemType {
GREETER_ITEM_TYPE_PIXMAP,
GREETER_ITEM_TYPE_LABEL,
@@ -692,9 +718,9 @@
struct {
guint8 alphas[GREETER_ITEM_STATE_MAX];
guint32 colors[GREETER_ITEM_STATE_MAX];
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_item_pam.c gdm-2.8.0.7-post/gui/greeter/greeter_item_pam.c
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter_item_pam.c gdm-2.8.0.7-post/gui/greeter/greeter_item_pam.c
--- gdm-2.8.0.7-pre/gui/greeter/greeter_item_pam.c 2005-10-06 16:34:32.000000000 -0500
-+++ gdm-2.8.0.7-post/gui/greeter/greeter_item_pam.c 2006-02-05 22:33:55.000000000 -0600
++++ gdm-2.8.0.7-post/gui/greeter/greeter_item_pam.c 2006-06-08 18:38:20.000000000 -0500
@@ -34,6 +34,7 @@
#include "vicious.h"
#include "viciousui.h"
@@ -794,9 +820,9 @@
}
messages_to_give = FALSE;
-diff -Nurp gdm-2.8.0.7-pre/gui/greeter/greeter_parser.c gdm-2.8.0.7-post/gui/greeter/greeter_parser.c
+diff -urp gdm-2.8.0.7-pre/gui/greeter/greeter_parser.c gdm-2.8.0.7-post/gui/greeter/greeter_parser.c
--- gdm-2.8.0.7-pre/gui/greeter/greeter_parser.c 2005-11-22 14:43:50.000000000 -0600
-+++ gdm-2.8.0.7-post/gui/greeter/greeter_parser.c 2006-02-05 20:58:46.000000000 -0600
++++ gdm-2.8.0.7-post/gui/greeter/greeter_parser.c 2006-06-08 18:38:20.000000000 -0500
@@ -1123,6 +1123,11 @@ parse_stock (xmlNodePtr node,
g_free (*translated_text);
*translated_text = g_strdup (_("Username:"));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org