summaryrefslogtreecommitdiff
path: root/nfs/rpc.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:12:43 +0000
commit13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch)
tree1e1463b03838a6f36868a4dafc7e652358a51857 /nfs/rpc.c
parent1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff)
parent7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff)
Merge branch 'master' into xkb
Conflicts: config.make.in configure.in
Diffstat (limited to 'nfs/rpc.c')
-rw-r--r--nfs/rpc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nfs/rpc.c b/nfs/rpc.c
index f5e19066..0b0444d0 100644
--- a/nfs/rpc.c
+++ b/nfs/rpc.c
@@ -75,7 +75,7 @@ generate_xid ()
credential structure with UID, GID, and SECOND_GID; any of these
may be -1 to indicate that it does not apply, however, exactly zero
or two of UID and GID must be -1. The returned address is a pointer
- to the start of the payload. If NULL is returned, an error occured
+ to the start of the payload. If NULL is returned, an error occurred
and the code is set in errno. */
int *
initialize_rpc (int program, int version, int rpc_proc,