Fix autologin Pam service name. Fixes bug #344191. Fix warnings.

2006-06-09  Brian Cameron  <brian.cameron@sun.com>

        * daemon/verify-pam.c: Fix autologin Pam service name.  Fixes bug
          #344191.
        * daemon/gdmconfig.c, gui/gdmconfig.c, gui/gdmdynamic.c,
          gui/gdmsetup.c, gui/greeter/greeter.c,
          gui/greeter/greeter_canvas_item.c, gui/greeter/greeter_geometry.c
          gui/greeter/greeter_item_pam.c, gui/greeter/greeter_parser.c,
          gui/greeter/greeter_system.c, utils/prefetch.c: Fix warnings.

13 files changed, 63 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index d7bede7d..80af0b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-09  Brian Cameron  <brian.cameron@sun.com>
+
+	* daemon/verify-pam.c: Fix autologin Pam service name.  Fixes bug
+	  #344191.
+	* daemon/gdmconfig.c, gui/gdmconfig.c, gui/gdmdynamic.c, 
+	  gui/gdmsetup.c, gui/greeter/greeter.c, 
+	  gui/greeter/greeter_canvas_item.c, gui/greeter/greeter_geometry.c
+	  gui/greeter/greeter_item_pam.c, gui/greeter/greeter_parser.c,
+	  gui/greeter/greeter_system.c, utils/prefetch.c: Fix warnings.
+
 2006-06-07  Brian Cameron  <brian.cameron@sun.com>
 
         * Release 2.15.4:
diff --git a/daemon/gdmconfig.c b/daemon/gdmconfig.c
index 02878701..61d356ab 100644
--- a/daemon/gdmconfig.c
+++ b/daemon/gdmconfig.c
@@ -107,18 +107,15 @@ static gchar *GdmRemoteGreeter = NULL;
 static gchar *GdmGtkModulesList = NULL;
 static gchar *GdmChooser = NULL;
 static gchar *GdmLogDir = NULL;
-static gchar *GdmDisplayInit = NULL;
+static gchar *GdmDisplayInitDir = NULL;
 static gchar *GdmPostLogin = NULL;
 static gchar *GdmPreSession = NULL;
 static gchar *GdmPostSession = NULL;
 static gchar *GdmFailsafeXserver = NULL;
 static gchar *GdmXKeepsCrashing = NULL;
 static gchar *GdmHalt = NULL;
-static gchar *GdmHaltReal = NULL;
 static gchar *GdmReboot = NULL;
-static gchar *GdmRebootReal = NULL;
 static gchar *GdmSuspend = NULL;
-static gchar *GdmSuspendReal = NULL;
 static gchar *GdmServAuthDir = NULL;
 static gchar *GdmMulticastAddr;
 static gchar *GdmUserAuthDir = NULL;
@@ -198,31 +195,29 @@ static gboolean GdmConsoleNotify = TRUE;
 
 /* Config options used by slave */
 /* ---------------------------- */
-static gchar *GdmInitDir;
-static gchar *GdmGtkRc;
-static gchar *GdmGtkThemesToAllow;
-static gchar *GdmInclude;
-static gchar *GdmExclude;
-static gchar *GdmDefaultFace;
-static gchar *GdmLocaleFile;
-static gchar *GdmLogo;
-static gchar *GdmChooserButtonLogo;
-static gchar *GdmWelcome;
-static gchar *GdmRemoteWelcome;
-static gchar *GdmBackgroundProgram;
-static gchar *GdmBackgroundImage;
-static gchar *GdmBackgroundColor;
-static gchar *GdmGraphicalTheme;
-static gchar *GdmInfoMsgFile;
-static gchar *GdmInfoMsgFont;
-static gchar *GdmHost;
-static gchar *GdmHostImageDir;
-static gchar *GdmHosts;
-static gchar *GdmGraphicalThemeColor;
-static gchar *GdmGraphicalThemeDir;
-static gchar *GdmGraphicalThemes;
-static gchar *GdmPreFetchProgram;
-static gchar *GdmUse24Clock;
+static gchar *GdmGtkThemesToAllow = NULL;
+static gchar *GdmInclude = NULL;
+static gchar *GdmExclude = NULL;
+static gchar *GdmDefaultFace = NULL;
+static gchar *GdmLocaleFile = NULL;
+static gchar *GdmLogo = NULL;
+static gchar *GdmChooserButtonLogo = NULL;
+static gchar *GdmWelcome = NULL;
+static gchar *GdmRemoteWelcome = NULL;
+static gchar *GdmBackgroundProgram = NULL;
+static gchar *GdmBackgroundImage = NULL;
+static gchar *GdmBackgroundColor = NULL;
+static gchar *GdmGraphicalTheme = NULL;
+static gchar *GdmInfoMsgFile = NULL;
+static gchar *GdmInfoMsgFont = NULL;
+static gchar *GdmHost = NULL;
+static gchar *GdmHostImageDir = NULL;
+static gchar *GdmHosts = NULL;
+static gchar *GdmGraphicalThemeColor = NULL;
+static gchar *GdmGraphicalThemeDir = NULL;
+static gchar *GdmGraphicalThemes = NULL;
+static gchar *GdmPreFetchProgram = NULL;
+static gchar *GdmUse24Clock = NULL;
 
 static gint GdmPositionX;
 static gint GdmPositionY;
@@ -439,7 +434,7 @@ gdm_config_init (void)
    gdm_config_add_hash (GDM_KEY_X_KEEPS_CRASHING, &GdmXKeepsCrashing, &string_type);
    gdm_config_add_hash (GDM_KEY_BASE_XSESSION, &GdmBaseXsession, &string_type);
    gdm_config_add_hash (GDM_KEY_REMOTE_GREETER, &GdmRemoteGreeter, &string_type);
-   gdm_config_add_hash (GDM_KEY_DISPLAY_INIT_DIR, &GdmInitDir, &string_type);
+   gdm_config_add_hash (GDM_KEY_DISPLAY_INIT_DIR, &GdmDisplayInitDir, &string_type);
    gdm_config_add_hash (GDM_KEY_AUTOMATIC_LOGIN, &GdmAutomaticLogin, &string_type);
    gdm_config_add_hash (GDM_KEY_GTK_MODULES_LIST, &GdmGtkModulesList, &string_type);
    gdm_config_add_hash (GDM_KEY_REBOOT, &GdmReboot, &string_type);
@@ -458,7 +453,7 @@ gdm_config_init (void)
    gdm_config_add_hash (GDM_KEY_MULTICAST_ADDR, &GdmMulticastAddr, &string_type);
    gdm_config_add_hash (GDM_KEY_USER, &GdmUser, &string_type);
    gdm_config_add_hash (GDM_KEY_GROUP, &GdmGroup, &string_type);
-   gdm_config_add_hash (GDM_KEY_GTKRC, &GdmGtkRc, &string_type);
+   gdm_config_add_hash (GDM_KEY_GTKRC, &GdmGtkRC, &string_type);
    gdm_config_add_hash (GDM_KEY_GTK_THEME, &GdmGtkTheme, &string_type);
    gdm_config_add_hash (GDM_KEY_TIMED_LOGIN, &GdmTimedLogin, &string_type);
    gdm_config_add_hash (GDM_KEY_WILLING, &GdmWilling, &string_type);
@@ -620,10 +615,10 @@ gdm_get_custom_config (struct stat *statbuf)
  * This is always the custom config file name with the display
  * appended, and never gdm.conf.
  */
-gchar *
+static gchar *
 gdm_get_per_display_custom_config_file (gchar *display)
 {
-  g_strdup_printf ("%s%s", custom_config_file, display);
+  return g_strdup_printf ("%s%s", custom_config_file, display);
 }
  
 /**
@@ -1295,7 +1290,7 @@ gdm_set_value_bool (gchar *key, gboolean value)
    _gdm_set_value_bool (key, value, TRUE);
 }
 
-void
+static void
 _gdm_set_value_int (gchar *key, gint value, gboolean doing_update)
 {
    gint *setting     = gdm_config_hash_lookup (val_hash, key);
@@ -1638,7 +1633,7 @@ gdm_update_config (gchar* key)
    struct stat statbuf, custom_statbuf;
    VeConfig *cfg;
    VeConfig *custom_cfg = NULL;
-   gboolean rc;
+   gboolean rc = FALSE;
 
    /*
     * Do not allow these keys to be updated, since GDM would need
@@ -1698,7 +1693,7 @@ gdm_update_config (gchar* key)
       ve_config_destroy (cfg);
       if (custom_cfg != NULL)
          ve_config_destroy (custom_cfg);
-      return rc;
+      return TRUE;
    }
 
    type = gdm_config_hash_lookup (type_hash, key);
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index e09fcfbd..2d1f52af 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -1199,6 +1199,7 @@ gdm_verify_setup_user (GdmDisplay *d, const gchar *login, const gchar *display,
     const void *p;
     char *passreq;
     char *pam_stack = NULL;
+    char *pam_service_name = NULL;
     int null_tok = 0;
     gboolean credentials_set;
     const char *after_login;
@@ -1228,13 +1229,16 @@ gdm_verify_setup_user (GdmDisplay *d, const gchar *login, const gchar *display,
      * authentication mechanism than another display.
      */
     pam_stack = gdm_get_value_string_per_display (display, GDM_KEY_PAM_STACK);
+    pam_service_name = g_strdup_printf ("%s-autologin", pam_stack);
 
-    if ( ! create_pamh (d, pam_stack, login, &standalone_pamc,
+    if ( ! create_pamh (d, pam_service_name, login, &standalone_pamc,
 			display, &pamerr)) {
             g_free (pam_stack);
+            g_free (pam_service_name);
 	    goto setup_pamerr;
     }
     g_free (pam_stack);
+    g_free (pam_service_name);
 
     passreq = gdm_read_default ("PASSREQ=");
     if ((passreq != NULL) &&
diff --git a/gui/gdmconfig.c b/gui/gdmconfig.c
index 6493221b..12e1dbcd 100644
--- a/gui/gdmconfig.c
+++ b/gui/gdmconfig.c
@@ -526,7 +526,7 @@ gdm_config_get_int (gchar *key)
  * socket command.  It stores the value in a hash so subsequent
  * access is faster.
  */
-gboolean
+static gboolean
 _gdm_config_get_bool (gchar *key, gboolean reload, gboolean *changed)
 {
 	gboolean *hashretval = NULL;
diff --git a/gui/gdmdynamic.c b/gui/gdmdynamic.c
index 7d71b83c..4cda664a 100644
--- a/gui/gdmdynamic.c
+++ b/gui/gdmdynamic.c
@@ -79,7 +79,6 @@ main (int argc, char *argv[])
     int background        = 0;
     gboolean error        = TRUE;
     gboolean conn_failed  = FALSE;
-    gboolean gdm_running;
 
     myname  = basename (argv[0]);
     argv[0] = myname;
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 7de9be66..99acc360 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -328,7 +328,7 @@ update_key (const char *key)
 	}
 }
 
-void 
+static void 
 gdm_setup_config_set_bool (const char *key, gboolean val)
 {
 	VeConfig *cfg        = ve_config_get (config_file);
@@ -346,7 +346,7 @@ gdm_setup_config_set_bool (const char *key, gboolean val)
 	update_key (key);
 }
 
-void 
+static void 
 gdm_setup_config_set_int (const char *key, int val)
 {
 	VeConfig *cfg        = ve_config_get (config_file);
@@ -364,7 +364,7 @@ gdm_setup_config_set_int (const char *key, int val)
 	update_key (key);
 }
 
-void 
+static void 
 gdm_setup_config_set_string (const char *key, gchar *val)
 {
 	VeConfig *cfg        = ve_config_get (config_file);
@@ -2616,6 +2616,7 @@ setup_greeter_untranslate_entry (const char *name,
 	g_free (val);
 }
 
+#ifdef HAVE_LIBXDMCP
 static void
 xdmcp_button_clicked (void)
 {
@@ -2649,6 +2650,7 @@ xdmcp_button_clicked (void)
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_hide (dialog);
 }
+#endif
 
 static void
 vt_spinbutton_activate (GtkWidget * widget,
@@ -4287,7 +4289,7 @@ xserver_entry_timeout (GtkWidget *entry)
 	GSList *li;
 	const char *key  = g_object_get_data (G_OBJECT (entry), "key");
 	const char *text = gtk_entry_get_text (GTK_ENTRY (entry));
-	gchar *string_old;
+	gchar *string_old = NULL;
 	gchar *section;
 
 	mod_combobox    = glade_helper_get (xml_xservers, "xserver_mod_combobox",
@@ -4337,7 +4339,7 @@ xserver_toggle_timeout (GtkWidget *toggle)
 	GtkWidget *mod_combobox;
 	const char *key = g_object_get_data (G_OBJECT (toggle), "key");
 	GSList     *li;
-	gboolean   val;
+	gboolean   val = FALSE;
 	gchar      *section;
 
 	mod_combobox    = glade_helper_get (xml_xservers, "xserver_mod_combobox",
diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c
index 0dd3e234..a0244b59 100644
--- a/gui/greeter/greeter.c
+++ b/gui/greeter/greeter.c
@@ -541,10 +541,10 @@ greeter_setup_items (void)
   greeter_item_timed_setup ();
   greeter_item_register_action_callback ("ok_button",
 					 greeter_ok_handler,
-					 window);
+					 (gpointer) window);
   greeter_item_register_action_callback ("cancel_button",
 					 greeter_cancel_handler,
-					 window);
+					 (gpointer) window);
   greeter_item_register_action_callback ("language_button",
 					 greeter_language_handler,
 					 NULL);
@@ -1044,7 +1044,6 @@ main (int argc, char *argv[])
   GIOChannel *ctrlch;
   GError *error;
   GreeterItemInfo *root;
-  const gchar *theme_name;
   char *theme_file;
   char *theme_dir;
   gchar *gdm_graphical_theme;
diff --git a/gui/greeter/greeter_canvas_item.c b/gui/greeter/greeter_canvas_item.c
index 16f72c69..ddd5341d 100644
--- a/gui/greeter/greeter_canvas_item.c
+++ b/gui/greeter/greeter_canvas_item.c
@@ -227,7 +227,7 @@ greeter_options_handler (GreeterItemInfo *item, GtkWidget *menubar)
 			item, 0, gtk_get_current_event_time());
 }
 
-void
+static void
 greeter_item_run_button_action_callback (GtkButton *button, const char *id)
 {
         greeter_item_run_action_callback (id);
diff --git a/gui/greeter/greeter_geometry.c b/gui/greeter/greeter_geometry.c
index 8c810006..1b38225e 100644
--- a/gui/greeter/greeter_geometry.c
+++ b/gui/greeter/greeter_geometry.c
@@ -566,7 +566,6 @@ greeter_item_size_request (GreeterItemInfo *item,
 #define ITEM_BUTTON_MIN_RECOMMANDED_WIDTH_OFFSET 15      
 #define ITEM_BUTTON_MIN_RECOMMANDED_HEIGHT_OFFSET 10
       PangoLayout *layout;
-      PangoFontDescription *font_desc;
       int pango_width, pango_height;
       int pix_width, pix_height;
       
diff --git a/gui/greeter/greeter_item_pam.c b/gui/greeter/greeter_item_pam.c
index bf1a185e..5a502a1c 100644
--- a/gui/greeter/greeter_item_pam.c
+++ b/gui/greeter/greeter_item_pam.c
@@ -47,7 +47,7 @@ gboolean require_quarter = FALSE;
 
 extern gboolean greeter_probably_login_prompt;
 
-gboolean
+static gboolean
 greeter_item_pam_error_set (gboolean display)
 {
   GreeterItemInfo *info;
diff --git a/gui/greeter/greeter_parser.c b/gui/greeter/greeter_parser.c
index afe713cc..9bbd59a9 100644
--- a/gui/greeter/greeter_parser.c
+++ b/gui/greeter/greeter_parser.c
@@ -502,7 +502,6 @@ parse_gtkbutton (xmlNodePtr node,
   xmlNodePtr child;
   char *translated_text  = NULL;
   gint translation_score = 1000;
-  int i;
 
   child = node->children;
 
diff --git a/gui/greeter/greeter_system.c b/gui/greeter/greeter_system.c
index 76d5aaa1..157b526d 100644
--- a/gui/greeter/greeter_system.c
+++ b/gui/greeter/greeter_system.c
@@ -28,6 +28,7 @@
 #include "greeter_configuration.h"
 #include "greeter_system.h"
 #include "greeter_item.h"
+#include "greeter_item_ulist.h"
 #include "gdm.h"
 #include "gdmcommon.h"
 #include "gdmconfig.h"
diff --git a/utils/gdmprefetch.c b/utils/gdmprefetch.c
index 155a37d3..3e385b7f 100644
--- a/utils/gdmprefetch.c
+++ b/utils/gdmprefetch.c
@@ -21,6 +21,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <fcntl.h>
@@ -31,7 +32,7 @@
 
 int out = 0;
 
-int
+static int
 doout(char *s)
 {
 	int fd;
@@ -54,14 +55,14 @@ doout(char *s)
 
 #define SIZE 1024*128
 
-int
+static int
 doin (char *s)
 {
 	int fd;
 	char buffer[SIZE];
 	
 	if ((fd = open(s, O_RDONLY)) < 0) {
-		fprintf (stderr, "fopen: %s %s\n", strerror(errno), s);
+		fprintf (stderr, "fopen: %s %s\n", strerror (errno), s);
 		return (-1);
 	}
 
@@ -80,7 +81,6 @@ main (int argc, char *argv[])
 	int c, errflg = 0;
 	extern int optind, optopt;
 	extern char *optarg;
-	int i;
 
 	while ((c = getopt (argc, argv, "o:")) != -1) {
 		switch (c) {