Commit 792a9fc5 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Use "reboot" instead of "restart". Fixes bug #327583.

2006-01-18  Brian Cameron  <brian.cameron@sun.com>

        * daemon/gdm.c, daemon/slave.c, gui/greeter/greeter.c, gui/greeter/greeter_system.c:
          Use "reboot" instead of "restart".  Fixes bug #327583.
parent 188302ce
2006-01-18 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.c, daemon/slave.c, gui/greeter/greeter.c, gui/greeter/greeter_system.c:
Use "reboot" instead of "restart". Fixes bug #327583.
2006-01-17 Brian Cameron <brian.cameron@sun.com>
* docs/C/gdm.xml: Added docs for "secure remote" feature. Patch
......
......@@ -599,7 +599,7 @@ suspend_machine (void)
#ifdef __linux__
static void
change_to_first_and_clear (gboolean reboot)
change_to_first_and_clear (gboolean restart)
{
gdm_change_vt (1);
VE_IGNORE_EINTR (close (0));
......@@ -618,8 +618,8 @@ change_to_first_and_clear (gboolean reboot)
/* clear screen and set to red */
printf ("\033[H\033[J\n\n\033[1m---\n\033[1;31m ");
if (reboot)
printf (_("System is rebooting, please wait ..."));
if (restart)
printf (_("System is restarting, please wait ..."));
else
printf (_("System is shutting down, please wait ..."));
/* set to black */
......@@ -638,7 +638,7 @@ halt_machine (void)
VE_IGNORE_EINTR (g_chdir ("/"));
#ifdef __linux__
change_to_first_and_clear (FALSE /* reboot */);
change_to_first_and_clear (FALSE);
#endif /* __linux */
argv = ve_split (gdm_get_value_string (GDM_KEY_HALT));
......@@ -650,24 +650,24 @@ halt_machine (void)
}
static void
reboot_machine (void)
restart_machine (void)
{
char **argv;
gdm_info (_("Master rebooting..."));
gdm_info (_("Restarting computer..."));
gdm_final_cleanup ();
VE_IGNORE_EINTR (g_chdir ("/"));
#ifdef __linux__
change_to_first_and_clear (TRUE /* reboot */);
change_to_first_and_clear (TRUE);
#endif /* __linux */
argv = ve_split (gdm_get_value_string (GDM_KEY_REBOOT));
if (argv != NULL && argv[0] != NULL)
VE_IGNORE_EINTR (execv (argv[0], argv));
gdm_error (_("%s: Reboot failed: %s"),
gdm_error (_("%s: Restart failed: %s"),
"gdm_child_action", strerror (errno));
}
......@@ -768,7 +768,7 @@ gdm_cleanup_children (void)
status == DISPLAY_REBOOT ||
status == DISPLAY_SUSPEND ||
status == DISPLAY_HALT)) {
gdm_info (_("Reboot or Halt request when there is no system menu from display %s"), d->name);
gdm_info (_("Restart GDM, Restart machine, Suspend, or Halt request when there is no system menu from display %s"), d->name);
status = DISPLAY_REMANAGE;
}
......@@ -777,7 +777,7 @@ gdm_cleanup_children (void)
status == DISPLAY_REBOOT ||
status == DISPLAY_SUSPEND ||
status == DISPLAY_HALT)) {
gdm_info (_("Restart, Reboot or Halt request from a non-static display %s"), d->name);
gdm_info (_("Restart GDM, Restart machine, Suspend or Halt request from a non-static display %s"), d->name);
status = DISPLAY_REMANAGE;
}
......@@ -855,8 +855,8 @@ start_autopsy:
gdm_start_first_unborn_local (3 /* delay */);
break;
case DISPLAY_REBOOT: /* Reboot machine */
reboot_machine ();
case DISPLAY_REBOOT: /* Restart machine */
restart_machine ();
status = DISPLAY_REMANAGE;
goto start_autopsy;
......@@ -1029,7 +1029,7 @@ gdm_do_logout_action (GdmLogoutAction logout_action)
break;
case GDM_LOGOUT_ACTION_REBOOT:
reboot_machine ();
restart_machine ();
break;
case GDM_LOGOUT_ACTION_SUSPEND:
......
......@@ -4288,11 +4288,11 @@ gdm_slave_session_stop (gboolean run_post_session,
}
#ifdef __linux__
/* If on linux and the runlevel is 0 or 6 and not the runlevel that
we were started in, then we are rebooting or halting.
Probably the user selected halt or reboot from the logout
/* If on Linux and the runlevel is 0 or 6 and not the runlevel that
we were started in, then we are restarting or halting the machine.
Probably the user selected halt or restart from the logout
menu. In this case we can really just sleep for a few seconds and
basically wait to be killed. I'll set the default for 30 seconds
basically wait to be killed. I will set the default for 30 seconds
and let people yell at me if this breaks something. It shouldn't.
In fact it should fix things so that the login screen is not brought
up again and then whacked. Waiting is safer then DISPLAY_ABORT,
......@@ -4311,7 +4311,7 @@ gdm_slave_session_stop (gboolean run_post_session,
/* this is a stupid loop, but we may be getting signals,
so we don't want to just do sleep (30) */
time_t c = time (NULL);
gdm_info (_("GDM detected a halt or reboot "
gdm_info (_("GDM detected a halt or restart "
"in progress."));
pclose (fp);
while (c + 30 >= time (NULL)) {
......
This diff is collapsed.
......@@ -147,6 +147,15 @@
<para>Refer to the "Security" section for information about security concerns when using XDMCP.</para>
</sect2>
<sect2 id="secureremote">
<title>Securing Remote Connection Through SSH</title>
<para>As explained in the "Security" section, XDMCP does not use any kind of encryption and as such is inherently insecure. As XDMCP uses UDP as a network transport layer, it is not possible to simply secure it through an SSH tunnel.</para>
<para>To remedy this problem, gdm can be configured at compilation-time with the option --enable-secureremote, in which case gdm proposes as a built-in session a session called "Secure Remote Connection". Starting such a session allows the user to enter the name or the address of the host on which to connect; provided the said host runs an SSH server, the user then gets connected to the server on which the default X session is started and displayed on the local host.</para>
<para>Using this session allows a much more secure network connection and only necessitates to have an SSH server running on the remote host.</para>
</sect2>
<sect2 id="gtkgreeter">
<title>El interfaz GTK+</title>
......@@ -279,6 +288,8 @@
<para>XDMCP is primarily useful for running thin clients such as in terminal labs. Those thin clients will only ever need the network to access the server, and so it seems like the best security policy to have those thin clients on a separate network that cannot be accessed by the outside world, and can only connect to the server. The only point from which you need to access outside is the server.</para>
<para>The above sections "X Server Authentication Scheme" and "Firewall Security" also contain important information about using XDMCP securely. The next section also discusses how to set up XDMCP access control.</para>
<para>To workaround the inherent insecurity of XDMCP, gdm proposes a default built-in session that uses SSH to encrypt the remote connection. See the section "Securing remote connection through SSH" above.</para>
</sect2>
<sect2 id="xdmcpaccess">
......@@ -417,11 +428,11 @@ PostSession/
<para>Los siguientes caracteres de control se reconocen dentro del nombre especificado:</para>
<para>the `' character</para>
<para>&percnt;&percnt;&mdash; the `&percnt;' character</para>
<para>d nombre del display</para>
<para>&percnt;d &mdash; display's name</para>
<para>h nombre de host del display</para>
<para>&percnt;h &mdash; display's hostname</para>
<para>Alternatively, the name may end with a vertical bar |, the pipe symbol. The name is then used as a application to execute which returns the desired username on standard output. If an empty or otherwise invalid username is returned, automatic login is not performed. This feature is typically used when several remote displays are used as internet kiosks, with a specific user to automatically login for each display.</para>
</listitem>
......@@ -1375,7 +1386,7 @@ PostSession/
<varlistentry>
<term>RemoteWelcome</term>
<listitem>
<synopsis>RemoteWelcome=Welcome to n</synopsis>
<synopsis>RemoteWelcome=Welcome to &percnt;n</synopsis>
<para>Controls which text to display next to the logo image in the greeter for remote XDMCP sessions. The same expansion is done here as in the <filename>Welcome</filename> string. This string can use the same special character sequences as explained in the "Text Node" section of the "Themed Greeter" chapter. chapter.</para>
</listitem>
</varlistentry>
......@@ -1525,19 +1536,19 @@ PostSession/
<synopsis>Welcome=Welcome</synopsis>
<para>Controls which text to display next to the logo image in the standard greeter. The following control chars are supported:</para>
<para>the `' character</para>
<para>&percnt;&percnt;&mdash; the `&percnt;' character</para>
<para>d display's hostname</para>
<para>&percnt;d &mdash; display's hostname</para>
<para>h Fully qualified hostname</para>
<para>&percnt;h &mdash; Fully qualified hostname</para>
<para>m machine (processor type)</para>
<para>&percnt;m &mdash; machine (processor type)</para>
<para>n Nodename (i.e. hostname without .domain)</para>
<para>&percnt;n &mdash; Nodename (i.e. hostname without .domain)</para>
<para>r release (OS version)</para>
<para>&percnt;r &mdash; release (OS version)</para>
<para>s sysname (i.e. OS)</para>
<para>&percnt;s &mdash; sysname (i.e. OS)</para>
<para>This string is only used for local logins. For remote XDMCP logins we use <filename>RemoteWelcome</filename>.</para>
......
......@@ -622,7 +622,7 @@ verify_gdm_version (void)
g_free (msg);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Reboot"),
_("Restart Machine"),
RESPONSE_REBOOT,
GTK_STOCK_CLOSE,
RESPONSE_CLOSE,
......@@ -671,9 +671,9 @@ verify_gdm_version (void)
g_free (msg);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Restart"),
_("Restart GDM"),
RESPONSE_RESTART,
_("Reboot"),
_("Restart Machine"),
RESPONSE_REBOOT,
GTK_STOCK_CLOSE,
RESPONSE_CLOSE,
......
......@@ -65,7 +65,7 @@ static void
query_greeter_restart_handler (void)
{
if (gdm_common_warn (_("Are you sure you want to restart the computer?"), "",
_("_Reboot"), NULL, TRUE) == GTK_RESPONSE_YES) {
_("_Restart"), NULL, TRUE) == GTK_RESPONSE_YES) {
closelog ();
_exit (DISPLAY_REBOOT);
......@@ -184,14 +184,14 @@ greeter_system_append_system_menu (GtkWidget *menu)
}
if (GdmRebootFound) {
w = gtk_menu_item_new_with_mnemonic (_("_Reboot"));
w = gtk_menu_item_new_with_mnemonic (_("_Restart"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
gtk_widget_show (GTK_WIDGET (w));
g_signal_connect (G_OBJECT (w), "activate",
G_CALLBACK (query_greeter_restart_handler),
NULL);
gtk_tooltips_set_tip (tooltips, GTK_WIDGET (w),
_("Reboot your computer"),
_("Restart your computer"),
NULL);
}
......@@ -316,10 +316,10 @@ greeter_system_handler (GreeterItemInfo *info,
if (group_radio != NULL)
radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (group_radio));
restart_radio = gtk_radio_button_new_with_mnemonic (radio_group,
_("_Reboot the computer"));
_("_Restart the computer"));
group_radio = restart_radio;
gtk_tooltips_set_tip (tooltips, GTK_WIDGET (restart_radio),
_("Reboot your computer"),
_("Restart your computer"),
NULL);
g_signal_connect (G_OBJECT(restart_radio), "button_press_event",
G_CALLBACK(radio_button_press_event), NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment