summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 21:36:58 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 21:36:58 +0000
commit97ae4966e6e9d6d58102aaeb3e133fe7c5ff65da (patch)
tree43d5be9f9312e00e1c80a757a3bc8366592d4c7f
parent582a20b74731ac9506f5c518ffc3f94a49d39d00 (diff)
parent0a56227766bfc7ee00a3d983e594ab81fc82b72a (diff)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
-rw-r--r--auth/auth.c4
-rw-r--r--console-client/xkb/TODO1
2 files changed, 3 insertions, 2 deletions
diff --git a/auth/auth.c b/auth/auth.c
index 11db0f8f..ec738ce2 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -305,7 +305,7 @@ S_auth_user_authenticate (struct authhandle *userauth,
if (! userauth)
return EOPNOTSUPP;
- if (rendezvous == MACH_PORT_DEAD) /* Port died in transit. */
+ if (rendezvous == MACH_PORT_NULL || rendezvous == MACH_PORT_DEAD)
return EINVAL;
u.user = userauth;
@@ -382,7 +382,7 @@ S_auth_server_authenticate (struct authhandle *serverauth,
if (! serverauth)
return EOPNOTSUPP;
- if (rendezvous == MACH_PORT_DEAD) /* Port died in transit. */
+ if (rendezvous == MACH_PORT_NULL || rendezvous == MACH_PORT_DEAD)
return EINVAL;
mutex_lock (&pending_lock);
diff --git a/console-client/xkb/TODO b/console-client/xkb/TODO
index 275cbaf5..120dd486 100644
--- a/console-client/xkb/TODO
+++ b/console-client/xkb/TODO
@@ -1,5 +1,6 @@
For release:
+Use rules instead of keymaps
Indicators.
Use libihash.
Better memory handling.