diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-10-04 21:42:29 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-04 21:42:29 +0000 |
commit | 14333ef1ffc4d2c5b162d2631c52ab71d88a2641 (patch) | |
tree | 3035ae1a2d72a71eda144c7d8e2b91c35e837337 /daemon/gdm-xdmcp-display-factory.c | |
parent | dae89542cc21cd03bb0debe651b3e30b84289478 (diff) | |
download | gdm-14333ef1ffc4d2c5b162d2631c52ab71d88a2641.tar.gz |
Remove lots of obsolete code. Organize the configure checks a bit.
2007-10-04 William Jon McCann <mccann@jhu.edu>
* common/Makefile.am:
* common/gdm-common.c:
* common/gdm-common.h:
* common/ve-signal.c:
* common/ve-signal.h:
* config/Makefile.am:
* configure.ac:
* daemon/Makefile.am:
* daemon/auth.c:
* daemon/filecheck.c:
* daemon/filecheck.h:
* daemon/gdm-factory-slave.c: (get_script_environment):
* daemon/gdm-greeter-session.c: (get_greeter_environment):
* daemon/gdm-product-slave.c: (get_script_environment):
* daemon/gdm-server.c: (rotate_logs), (server_child_setup),
(gdm_server_start):
* daemon/gdm-simple-slave.c: (get_script_environment):
* daemon/gdm-xdmcp-display-factory.c: (fd_set_close_on_exec),
(open_port), (gdm_xdmcp_handle_request), (gdm_xdmcp_handle_manage):
* libgreeter/Makefile.am:
* libgreeter/gdmlanguages.c:
* libgreeter/gdmlanguages.h:
* libgreeter/gdmsession.c:
* libgreeter/gdmsession.h:
* libgreeter/gdmwm.c:
* libgreeter/gdmwm.h:
* utils/Makefile.am:
* utils/gdm-ssh-session:
* utils/gdmmktemp.c:
* utils/gdmopen.c:
* utils/gdmprefetch.c:
* utils/gdmsetup-pam:
* utils/gdmsetup-security.in:
* utils/gdmtranslate.c:
Remove lots of obsolete code. Organize the configure checks a bit.
svn path=/branches/mccann-gobject/; revision=5339
Diffstat (limited to 'daemon/gdm-xdmcp-display-factory.c')
-rw-r--r-- | daemon/gdm-xdmcp-display-factory.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c index 862ffb84..75766689 100644 --- a/daemon/gdm-xdmcp-display-factory.c +++ b/daemon/gdm-xdmcp-display-factory.c @@ -548,6 +548,20 @@ setup_multicast (GdmXdmcpDisplayFactory *factory) #endif /* ENABLE_IPV6 */ } +fd_set_close_on_exec (int fd) +{ + int flags; + + flags = fcntl (fd, F_GETFD, 0); + if (flags < 0) { + return; + } + + flags |= FD_CLOEXEC; + + fcntl (fd, F_SETFD, flags); +} + static gboolean open_port (GdmXdmcpDisplayFactory *factory) { @@ -569,7 +583,7 @@ open_port (GdmXdmcpDisplayFactory *factory) return FALSE; } - gdm_fd_set_close_on_exec (factory->priv->socket_fd); + fd_set_close_on_exec (factory->priv->socket_fd); if (factory->priv->use_multicast) { setup_multicast (factory); @@ -1987,7 +2001,7 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory, factory->priv->max_pending_displays, factory->priv->num_sessions, factory->priv->max_displays, - ve_sure_string (s)); + s != NULL ? s : ""); g_free (s); } @@ -2279,7 +2293,7 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory, g_debug ("gdm_xdmcp-handle_manage: Got display=%d, SessionID=%ld Class=%s from %s", (int)clnt_dspnum, (long)clnt_sessid, - ve_sure_string (s), + s != NULL ? s : "", host); g_free (s); |