summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
Diffstat (limited to 'daemon')
-rw-r--r--daemon/auth.c16
-rw-r--r--daemon/display.c4
-rw-r--r--daemon/errorgui.c9
-rw-r--r--daemon/gdm.c20
-rw-r--r--daemon/server.c27
-rw-r--r--daemon/slave.c39
-rw-r--r--daemon/xdmcp.c94
7 files changed, 138 insertions, 71 deletions
diff --git a/daemon/auth.c b/daemon/auth.c
index 27af302d..6a314d11 100644
--- a/daemon/auth.c
+++ b/daemon/auth.c
@@ -434,7 +434,9 @@ try_user_add_again:
authfd = g_mkstemp (d->userauth);
if (authfd == -1) {
- gdm_error (_("gdm_auth_user_add: Could not open cookie file %s"), d->userauth);
+ gdm_error (_("%s: Could not open cookie file %s"),
+ "gdm_auth_user_add",
+ d->userauth);
g_free (d->userauth);
d->userauth = NULL;
@@ -451,7 +453,9 @@ try_user_add_again:
/* FIXME: Better implement my own locking. The libXau one is not kosher */
if (XauLockAuth (d->userauth, 3, 3, 0) != LOCK_SUCCESS) {
- gdm_error (_("gdm_auth_user_add: Could not lock cookie file %s"), d->userauth);
+ gdm_error (_("%s: Could not lock cookie file %s"),
+ "gdm_auth_user_add",
+ d->userauth);
g_free (d->userauth);
d->userauth = NULL;
@@ -468,7 +472,9 @@ try_user_add_again:
if (!af) {
/* Really no need to clean up here - this process is a goner anyway */
- gdm_error (_("gdm_auth_user_add: Could not open cookie file %s"), d->userauth);
+ gdm_error (_("%s: Could not open cookie file %s"),
+ "gdm_auth_user_add",
+ d->userauth);
if (locked)
XauUnlockAuth (d->userauth);
g_free (d->userauth);
@@ -571,7 +577,9 @@ gdm_auth_user_remove (GdmDisplay *d, uid_t user)
TRUE, GdmUserMaxFile, GdmRelaxPerms)) {
g_free (authdir);
g_free (authfile);
- gdm_error (_("gdm_auth_user_remove: Ignoring suspiciously looking cookie file %s"), d->userauth);
+ gdm_error (_("%s: Ignoring suspiciously looking cookie file %s"),
+ "gdm_auth_user_remove",
+ d->userauth);
return;
}
diff --git a/daemon/display.c b/daemon/display.c
index 99f7f97f..afca73cd 100644
--- a/daemon/display.c
+++ b/daemon/display.c
@@ -270,7 +270,9 @@ gdm_display_manage (GdmDisplay *d)
case -1:
d->slavepid = 0;
- gdm_error (_("gdm_display_manage: Failed forking gdm slave process for %s"), d->name);
+ gdm_error (_("%s: Failed forking gdm slave process for %s"),
+ "gdm_display_manage",
+ d->name);
return FALSE;
diff --git a/daemon/errorgui.c b/daemon/errorgui.c
index 7de951a1..c6393375 100644
--- a/daemon/errorgui.c
+++ b/daemon/errorgui.c
@@ -280,7 +280,8 @@ gdm_error_box_full (GdmDisplay *d, GtkMessageType type, const char *error,
} else if (pid > 0) {
gdm_wait_for_extra (NULL);
} else {
- gdm_error (_("gdm_error_box: Cannot fork to display error/info box"));
+ gdm_error (_("%s: Cannot fork to display error/info box"),
+ "gdm_error_box");
}
}
@@ -432,7 +433,8 @@ gdm_failsafe_question (GdmDisplay *d,
}
close (p[0]);
} else {
- gdm_error (_("gdm_failsafe_question: Cannot fork to display error/info box"));
+ gdm_error (_("%s: Cannot fork to display error/info box"),
+ "gdm_failsafe_question");
}
return NULL;
}
@@ -554,7 +556,8 @@ gdm_failsafe_yesno (GdmDisplay *d,
}
close (p[0]);
} else {
- gdm_error (_("gdm_failsafe_question: Cannot fork to display error/info box"));
+ gdm_error (_("%s: Cannot fork to display error/info box"),
+ "gdm_failsafe_question");
}
return FALSE;
}
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 5ea5af17..6e5bdedf 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -882,8 +882,10 @@ deal_with_x_crashes (GdmDisplay *d)
/* Yay we have a failsafe */
if ( ! ve_string_empty (bin) &&
access (bin, X_OK) == 0) {
- gdm_info (_("deal_with_x_crashes: Trying failsafe X "
- "server %s"), GdmFailsafeXServer);
+ gdm_info (_("%s: Trying failsafe X "
+ "server %s"),
+ "deal_with_x_crashes",
+ GdmFailsafeXServer);
g_free (bin);
g_free (d->command);
d->command = g_strdup (GdmFailsafeXServer);
@@ -898,8 +900,9 @@ deal_with_x_crashes (GdmDisplay *d)
access (GdmXKeepsCrashing, X_OK|R_OK) == 0) {
pid_t pid;
- gdm_info (_("deal_with_x_crashes: Running the "
- "XKeepsCrashing script"));
+ gdm_info (_("%s: Running the "
+ "XKeepsCrashing script"),
+ "deal_with_x_crashes");
pid = gdm_fork_extra ();
@@ -1147,7 +1150,8 @@ start_autopsy:
switch (status) {
case DISPLAY_ABORT: /* Bury this display for good */
- gdm_info (_("gdm_child_action: Aborting display %s"), d->name);
+ gdm_info (_("%s: Aborting display %s"),
+ "gdm_child_action", d->name);
if (gdm_restart_mode)
gdm_safe_restart ();
@@ -1167,7 +1171,8 @@ start_autopsy:
argv = ve_split (GdmRebootReal);
execv (argv[0], argv);
- gdm_error (_("gdm_child_action: Reboot failed: %s"), strerror (errno));
+ gdm_error (_("%s: Reboot failed: %s"),
+ "gdm_child_action", strerror (errno));
status = DISPLAY_REMANAGE;
goto start_autopsy;
@@ -1182,7 +1187,8 @@ start_autopsy:
argv = ve_split (GdmHaltReal);
execv (argv[0], argv);
- gdm_error (_("gdm_child_action: Halt failed: %s"), strerror (errno));
+ gdm_error (_("%s: Halt failed: %s"),
+ "gdm_child_action", strerror (errno));
status = DISPLAY_REMANAGE;
goto start_autopsy;
diff --git a/daemon/server.c b/daemon/server.c
index 12eba886..2ec17089 100644
--- a/daemon/server.c
+++ b/daemon/server.c
@@ -965,7 +965,8 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg)
dup2 (logfd, 1);
dup2 (logfd, 2);
} else {
- gdm_error (_("gdm_server_spawn: Could not open logfile for display %s!"), d->name);
+ gdm_error (_("%s: Could not open logfile for display %s!"),
+ "gdm_server_spawn", d->name);
}
@@ -975,15 +976,18 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg)
sigemptyset (&ign_signal.sa_mask);
if (sigaction (SIGUSR1, &ign_signal, NULL) < 0) {
- gdm_error (_("gdm_server_spawn: Error setting USR1 to SIG_IGN"));
+ gdm_error (_("%s: Error setting %s to %s"),
+ "gdm_server_spawn", "USR1", "SIG_IGN");
_exit (SERVER_ABORT);
}
if (sigaction (SIGTTIN, &ign_signal, NULL) < 0) {
- gdm_error (_("gdm_server_spawn: Error setting TTIN to SIG_IGN"));
+ gdm_error (_("%s: Error setting %s to %s"),
+ "gdm_server_spawn", "TTIN", "SIG_IGN");
_exit (SERVER_ABORT);
}
if (sigaction (SIGTTOU, &ign_signal, NULL) < 0) {
- gdm_error (_("gdm_server_spawn: Error setting TTOU to SIG_IGN"));
+ gdm_error (_("%s: Error setting %s to %s"),
+ "gdm_server_spawn", "TTOU", "SIG_IGN");
_exit (SERVER_ABORT);
}
@@ -993,11 +997,13 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg)
sigemptyset (&dfl_signal.sa_mask);
if (sigaction (SIGHUP, &dfl_signal, NULL) < 0) {
- gdm_error (_("gdm_server_spawn: Error setting HUP to SIG_DFL"));
+ gdm_error (_("%s: Error setting %s to %s"),
+ "gdm_server_spawn", "HUP", "SIG_DFL");
_exit (SERVER_ABORT);
}
if (sigaction (SIGTERM, &dfl_signal, NULL) < 0) {
- gdm_error (_("gdm_server_spawn: Error setting TERM to SIG_DFL"));
+ gdm_error (_("%s: Error setting %s to %s"),
+ "gdm_server_spawn", "TERM", "SIG_DFL");
_exit (SERVER_ABORT);
}
@@ -1089,14 +1095,16 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg)
execv (argv[0], argv);
- gdm_error (_("gdm_server_spawn: Xserver not found: %s"), command);
+ gdm_error (_("%s: Xserver not found: %s"),
+ "gdm_server_spawn", command);
_exit (SERVER_ABORT);
case -1:
g_strfreev (argv);
g_free (command);
- gdm_error (_("gdm_server_spawn: Can't fork Xserver process!"));
+ gdm_error (_("%s: Can't fork Xserver process!"),
+ "gdm_server_spawn");
d->servpid = 0;
d->servstat = SERVER_DEAD;
@@ -1105,7 +1113,8 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg)
default:
g_strfreev (argv);
g_free (command);
- gdm_debug ("gdm_server_spawn: Forked server on pid %d", (int)pid);
+ gdm_debug ("%s: Forked server on pid %d",
+ "gdm_server_spawn", (int)pid);
break;
}
}
diff --git a/daemon/slave.c b/daemon/slave.c
index 50427e09..2d54326b 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -795,7 +795,7 @@ focus_first_x_window (const char *class_res_name)
pid = fork ();
if (pid < 0) {
- gdm_error (_("focus_first_x_window: cannot fork"));
+ gdm_error (_("%s: cannot fork"), "focus_first_x_window");
return;
}
/* parent */
@@ -819,7 +819,8 @@ focus_first_x_window (const char *class_res_name)
disp = XOpenDisplay (d->name);
if (disp == NULL) {
- gdm_error (_("focus_first_x_window: cannot open display %s"),
+ gdm_error (_("%s: cannot open display %s"),
+ "focus_first_x_window",
d->name);
_exit (0);
}
@@ -1656,13 +1657,15 @@ gdm_slave_greeter (void)
gchar *modules = g_strdup_printf("--gtk-module=%s", GdmGtkModulesList);
execl (argv[0], argv[0], modules, NULL);
/* Something went wrong */
- gdm_error (_("gdm_slave_greeter: Cannot start greeter with gtk modules: %s. Trying without modules"),
- GdmGtkModulesList);
+ gdm_error (_("%s: Cannot start greeter with gtk modules: %s. Trying without modules"),
+ "gdm_slave_greeter",
+ GdmGtkModulesList);
g_free(modules);
}
execv (argv[0], argv);
- gdm_error (_("gdm_slave_greeter: Cannot start greeter trying default: %s"),
+ gdm_error (_("%s: Cannot start greeter trying default: %s"),
+ "gdm_slave_greeter",
EXPANDED_BINDIR "/gdmlogin");
gnome_setenv ("GDM_WHACKED_GREETER_CONFIG", "true", TRUE);
@@ -2492,7 +2495,8 @@ session_child_run (struct passwd *pwent,
&sessexec);
if (sesspath == NULL) {
/* yaikes */
- gdm_error (_("gdm_slave_session_start: gnome-session not found for a failsafe gnome session, trying xterm"));
+ gdm_error (_("%s: gnome-session not found for a failsafe gnome session, trying xterm"),
+ "gdm_slave_session_start");
session = GDM_SESSION_FAILSAFE_XTERM;
gdm_error_box
(d, GTK_MESSAGE_ERROR,
@@ -2572,12 +2576,14 @@ session_child_run (struct passwd *pwent,
if (strcmp (shell, "/sbin/nologin") == 0 ||
strcmp (shell, "/bin/false") == 0 ||
strcmp (shell, "/bin/true") == 0) {
- gdm_error (_("gdm_slave_session_start: User not allowed to log in"));
+ gdm_error (_("%s: User not allowed to log in"),
+ "gdm_slave_session_start");
gdm_error_box (d, GTK_MESSAGE_ERROR,
_("The system administrator has\n"
"disabled your account."));
} else if (access (sessexec != NULL ? sessexec : sesspath, X_OK) != 0) {
- gdm_error (_("gdm_slave_session_start: Could not find/run session `%s'"), sesspath);
+ gdm_error (_("%s: Could not find/run session `%s'"),
+ "gdm_slave_session_start", sesspath);
/* if we can't read and exec the session, then make a nice
* error dialog */
gdm_error_box
@@ -2617,7 +2623,8 @@ session_child_run (struct passwd *pwent,
/* nutcase fallback */
execl ("/bin/sh", "-sh", "-c", exec, NULL);
- gdm_error (_("gdm_slave_session_start: Could not start session `%s'"), sesspath);
+ gdm_error (_("%s: Could not start session `%s'"),
+ "gdm_slave_session_start", sesspath);
gdm_error_box
(d, GTK_MESSAGE_ERROR,
_("Cannot start your shell. It could be that the\n"
@@ -3276,7 +3283,8 @@ gdm_slave_xioerror_handler (Display *disp)
gdm_slave_session_stop (d->logged_in && login != NULL);
- gdm_error (_("gdm_slave_xioerror_handler: Fatal X error - Restarting %s"), d->name);
+ gdm_error (_("%s: Fatal X error - Restarting %s"),
+ "gdm_slave_xioerror_handler", d->name);
if ((d->type == TYPE_LOCAL ||
d->type == TYPE_FLEXI) &&
@@ -3760,7 +3768,8 @@ gdm_parse_enriched_login (const gchar *s, GdmDisplay *display)
if(str->len > 0 && str->str[str->len - 1] == '|') {
g_string_truncate(str, str->len - 1);
if (pipe (pipe1) < 0) {
- gdm_error (_("gdm_parse_enriched_login: Failed creating pipe"));
+ gdm_error (_("%s: Failed creating pipe"),
+ "gdm_parse_enriched_login");
} else {
pid = gdm_fork_extra ();
@@ -3788,12 +3797,14 @@ gdm_parse_enriched_login (const gchar *s, GdmDisplay *display)
argv = ve_split (str->str);
execv (argv[0], argv);
- gdm_error (_("gdm_parse_enriched_login: Failed executing: %s"),
- str->str);
+ gdm_error (_("%s: Failed executing: %s"),
+ "gdm_parse_enriched_login",
+ str->str);
_exit (EXIT_SUCCESS);
case -1:
- gdm_error (_("gdm_parse_enriched_login: Can't fork script process!"));
+ gdm_error (_("%s: Can't fork script process!"),
+ "gdm_parse_enriched_login");
close (pipe1[0]);
close (pipe1[1]);
break;
diff --git a/daemon/xdmcp.c b/daemon/xdmcp.c
index 18ca82b7..a09c599a 100644
--- a/daemon/xdmcp.c
+++ b/daemon/xdmcp.c
@@ -241,7 +241,8 @@ gdm_xdmcp_init (void)
/* Fetch and store local hostname in XDMCP friendly format */
hostbuf[1023] = '\0';
if (gethostname (hostbuf, 1023) != 0) {
- gdm_error (_("gdm_xdmcp_init: Could not get server hostname: %s!"), strerror (errno));
+ gdm_error (_("%s: Could not get server hostname: %s!"),
+ "gdm_xdmcp_init", strerror (errno));
strcmp (hostbuf, "localhost.localdomain");
}
@@ -261,7 +262,7 @@ gdm_xdmcp_init (void)
gdm_xdmcpfd = socket (AF_INET, SOCK_DGRAM, 0); /* UDP */
if (gdm_xdmcpfd < 0) {
- gdm_error (_("gdm_xdmcp_init: Could not create socket!"));
+ gdm_error (_("%s: Could not create socket!"), "gdm_xdmcp_init");
GdmXdmcp = FALSE;
return FALSE;
}
@@ -271,7 +272,7 @@ gdm_xdmcp_init (void)
serv_sa.sin_addr.s_addr = htonl (INADDR_ANY);
if (bind (gdm_xdmcpfd, (struct sockaddr*) &serv_sa, sizeof (serv_sa)) == -1) {
- gdm_error (_("gdm_xdmcp_init: Could not bind to XDMCP socket!"));
+ gdm_error (_("%s: Could not bind to XDMCP socket!"), "gdm_xdmcp_init");
gdm_xdmcp_close ();
GdmXdmcp = FALSE;
return FALSE;
@@ -330,18 +331,21 @@ gdm_xdmcp_decode_packet (GIOChannel *source, GIOCondition cond, gpointer data)
};
if (!XdmcpFill (gdm_xdmcpfd, &buf, (XdmcpNetaddr)&clnt_sa, &sa_len)) {
- gdm_error (_("gdm_xdmcp_decode: Could not create XDMCP buffer!"));
+ gdm_error (_("%s: Could not create XDMCP buffer!"),
+ "gdm_xdmcp_decode_packet");
return TRUE;
}
if (!XdmcpReadHeader (&buf, &header)) {
- gdm_error (_("gdm_xdmcp_decode: Could not read XDMCP header!"));
+ gdm_error (_("%s: Could not read XDMCP header!"),
+ "gdm_xdmcp_decode_packet");
return TRUE;
}
if (header.version != XDM_PROTOCOL_VERSION &&
header.version != GDM_XDMCP_PROTOCOL_VERSION) {
- gdm_error (_("gdm_xdmcp_decode: Incorrect XDMCP version!"));
+ gdm_error (_("%s: Incorrect XDMCP version!"),
+ "gdm_xdmcp_decode_packet");
return TRUE;
}
@@ -394,7 +398,8 @@ gdm_xdmcp_decode_packet (GIOChannel *source, GIOCondition cond, gpointer data)
break;
default:
- gdm_error (_("gdm_xdmcp_decode_packet: Unknown opcode from host %s"),
+ gdm_error (_("%s: Unknown opcode from host %s"),
+ "gdm_xdmcp_decode_packet",
inet_ntoa (clnt_sa.sin_addr));
break;
}
@@ -413,7 +418,8 @@ gdm_xdmcp_handle_query (struct sockaddr_in *clnt_sa, gint len, gint type)
/* Extract array of authentication names from Xdmcp packet */
if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_authlist)) {
- gdm_error (_("gdm_xdmcp_handle_query: Could not extract authlist from packet"));
+ gdm_error (_("%s: Could not extract authlist from packet"),
+ "gdm_xdmcp_handle_query");
return;
}
@@ -425,7 +431,8 @@ gdm_xdmcp_handle_query (struct sockaddr_in *clnt_sa, gint len, gint type)
}
if (len != explen) {
- gdm_error (_("gdm_xdmcp_handle_query: Error in checksum"));
+ gdm_error (_("%s: Error in checksum"),
+ "gdm_xdmcp_handle_query");
XdmcpDisposeARRAYofARRAY8 (&clnt_authlist);
return;
}
@@ -668,14 +675,16 @@ gdm_xdmcp_handle_forward_query (struct sockaddr_in *clnt_sa, gint len)
/* Read display address */
if (! XdmcpReadARRAY8 (&buf, &clnt_addr)) {
- gdm_error (_("gdm_xdmcp_handle_forward_query: Could not read display address"));
+ gdm_error (_("%s: Could not read display address"),
+ "gdm_xdmcp_handle_forward_query");
return;
}
/* Read display port */
if (! XdmcpReadARRAY8 (&buf, &clnt_port)) {
XdmcpDisposeARRAY8 (&clnt_addr);
- gdm_error (_("gdm_xdmcp_handle_forward_query: Could not read display port number"));
+ gdm_error (_("%s: Could not read display port number"),
+ "gdm_xdmcp_handle_forward_query");
return;
}
@@ -683,7 +692,8 @@ gdm_xdmcp_handle_forward_query (struct sockaddr_in *clnt_sa, gint len)
if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_authlist)) {
XdmcpDisposeARRAY8 (&clnt_addr);
XdmcpDisposeARRAY8 (&clnt_port);
- gdm_error (_("gdm_xdmcp_handle_forward_query: Could not extract authlist from packet"));
+ gdm_error (_("%s: Could not extract authlist from packet"),
+ "gdm_xdmcp_handle_forward_query");
return;
}
@@ -699,13 +709,15 @@ gdm_xdmcp_handle_forward_query (struct sockaddr_in *clnt_sa, gint len)
}
if (len != explen) {
- gdm_error (_("gdm_xdmcp_handle_forward_query: Error in checksum"));
+ gdm_error (_("%s: Error in checksum"),
+ "gdm_xdmcp_handle_forward_query");
goto out;
}
if (clnt_port.length != 2 ||
clnt_addr.length != 4) {
- gdm_error (_("gdm_xdmcp_handle_forward_query: Bad address"));
+ gdm_error (_("%s: Bad address"),
+ "gdm_xdmcp_handle_forward_query");
goto out;
}
@@ -959,33 +971,38 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len)
/* Check with tcp_wrappers if client is allowed to access */
if (! gdm_xdmcp_host_allow (clnt_sa)) {
- gdm_error (_("gdm_xdmcp_handle_request: Got REQUEST from banned host %s"),
+ gdm_error (_("%s: Got REQUEST from banned host %s"),
+ "gdm_xdmcp_handle_request",
inet_ntoa (clnt_sa->sin_addr));
return;
}
/* Remote display number */
if (! XdmcpReadCARD16 (&buf, &clnt_dspnum)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Display Number"));
+ gdm_error (_("%s: Could not read Display Number"),
+ "gdm_xdmcp_handle_request");
return;
}
/* We don't care about connection type. Address says it all */
if (! XdmcpReadARRAY16 (&buf, &clnt_conntyp)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Connection Type"));
+ gdm_error (_("%s: Could not read Connection Type"),
+ "gdm_xdmcp_handle_request");
return;
}
/* This is TCP/IP - we don't care */
if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_addr)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Client Address"));
+ gdm_error (_("%s: Could not read Client Address"),
+ "gdm_xdmcp_handle_request");
XdmcpDisposeARRAY16 (&clnt_conntyp);
return;
}
/* Read authentication type */
if (! XdmcpReadARRAY8 (&buf, &clnt_authname)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Authentication Names"));
+ gdm_error (_("%s: Could not read Authentication Names"),
+ "gdm_xdmcp_handle_request");
XdmcpDisposeARRAYofARRAY8 (&clnt_addr);
XdmcpDisposeARRAY16 (&clnt_conntyp);
return;
@@ -993,7 +1010,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len)
/* Read authentication data */
if (! XdmcpReadARRAY8 (&buf, &clnt_authdata)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Authentication Data"));
+ gdm_error (_("%s: Could not read Authentication Data"),
+ "gdm_xdmcp_handle_request");
XdmcpDisposeARRAYofARRAY8 (&clnt_addr);
XdmcpDisposeARRAY16 (&clnt_conntyp);
XdmcpDisposeARRAY8 (&clnt_authname);
@@ -1002,7 +1020,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len)
/* Read and select from supported authorization list */
if (! XdmcpReadARRAYofARRAY8 (&buf, &clnt_authorization)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Authorization List"));
+ gdm_error (_("%s: Could not read Authorization List"),
+ "gdm_xdmcp_handle_request");
XdmcpDisposeARRAY8 (&clnt_authdata);
XdmcpDisposeARRAYofARRAY8 (&clnt_addr);
XdmcpDisposeARRAY16 (&clnt_conntyp);
@@ -1017,7 +1036,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len)
/* Manufacturer ID */
if (! XdmcpReadARRAY8 (&buf, &clnt_manufacturer)) {
- gdm_error (_("gdm_xdmcp_handle_request: Could not read Manufacturer ID"));
+ gdm_error (_("%s: Could not read Manufacturer ID"),
+ "gdm_xdmcp_handle_request");
XdmcpDisposeARRAY8 (&clnt_authname);
XdmcpDisposeARRAY8 (&clnt_authdata);
XdmcpDisposeARRAYofARRAY8 (&clnt_addr);
@@ -1040,7 +1060,8 @@ gdm_xdmcp_handle_request (struct sockaddr_in *clnt_sa, gint len)
explen += 2+clnt_manufacturer.length;
if (explen != len) {
- gdm_error (_("gdm_xdmcp_handle_request: Failed checksum from %s"),
+ gdm_error (_("%s: Failed checksum from %s"),
+ "gdm_xdmcp_handle_request",
inet_ntoa (clnt_sa->sin_addr));
XdmcpDisposeARRAY8 (&clnt_authname);
XdmcpDisposeARRAY8 (&clnt_authdata);
@@ -1207,20 +1228,23 @@ gdm_xdmcp_handle_manage (struct sockaddr_in *clnt_sa, gint len)
/* Check with tcp_wrappers if client is allowed to access */
if (! gdm_xdmcp_host_allow (clnt_sa)) {
- gdm_error (_("gdm_xdmcp_handle_manage: Got Manage from banned host %s"),
+ gdm_error (_("%s: Got Manage from banned host %s"),
+ "gdm_xdmcp_handle_manage",
inet_ntoa (clnt_sa->sin_addr));
return;
}
/* SessionID */
if (! XdmcpReadCARD32 (&buf, &clnt_sessid)) {
- gdm_error (_("gdm_xdmcp_handle_manage: Could not read Session ID"));
+ gdm_error (_("%s: Could not read Session ID"),
+ "gdm_xdmcp_handle_manage");
return;
}
/* Remote display number */
if (! XdmcpReadCARD16 (&buf, &clnt_dspnum)) {
- gdm_error (_("gdm_xdmcp_handle_manage: Could not read Display Number"));
+ gdm_error (_("%s: Could not read Display Number"),
+ "gdm_xdmcp_handle_manage");
return;
}
@@ -1229,7 +1253,8 @@ gdm_xdmcp_handle_manage (struct sockaddr_in *clnt_sa, gint len)
/* Display Class */
if (! XdmcpReadARRAY8 (&buf, &clnt_dspclass)) {
- gdm_error (_("gdm_xdmcp_handle_manage: Could not read Display Class"));
+ gdm_error (_("%s: Could not read Display Class"),
+ "gdm_xdmcp_handle_manage");
return;
}
@@ -1442,20 +1467,23 @@ gdm_xdmcp_handle_keepalive (struct sockaddr_in *clnt_sa, gint len)
/* Check with tcp_wrappers if client is allowed to access */
if (! gdm_xdmcp_host_allow (clnt_sa)) {
- gdm_error (_("gdm_xdmcp_handle_keepalive: Got KEEPALIVE from banned host %s"),
+ gdm_error (_("%s: Got KEEPALIVE from banned host %s"),
+ "gdm_xdmcp_handle_keepalive",
inet_ntoa (clnt_sa->sin_addr));
return;
}
/* Remote display number */
if (! XdmcpReadCARD16 (&buf, &clnt_dspnum)) {
- gdm_error (_("gdm_xdmcp_handle_keepalive: Could not read Display Number"));
+ gdm_error (_("%s: Could not read Display Number"),
+ "gdm_xdmcp_handle_keepalive");
return;
}
/* SessionID */
if (! XdmcpReadCARD32 (&buf, &clnt_sessid)) {
- gdm_error (_("gdm_xdmcp_handle_keepalive: Could not read Session ID"));
+ gdm_error (_("%s: Could not read Session ID"),
+ "gdm_xdmcp_handle_keepalive");
return;
}
@@ -1658,20 +1686,20 @@ gdm_xdmcp_displays_check (void)
int
gdm_xdmcp_init (void)
{
- gdm_error (_("gdm_xdmcp_init: No XDMCP support"));
+ gdm_error (_("%s: No XDMCP support"), "gdm_xdmcp_init");
return FALSE;
}
void
gdm_xdmcp_run (void)
{
- gdm_error (_("gdm_xdmcp_run: No XDMCP support"));
+ gdm_error (_("%s: No XDMCP support"), "gdm_xdmcp_run");
}
void
gdm_xdmcp_close (void)
{
- gdm_error (_("gdm_xdmcp_close: No XDMCP support"));
+ gdm_error (_("%s: No XDMCP support"), "gdm_xdmcp_close");
}
#endif /* HAVE_LIBXDMCP */
View Lorry Controller Status