summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/lib/src/auth-unix.c
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2010-08-10 02:41:54 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-08-10 02:44:22 -0700
commit0af39ff8d03173a7ba3df1b13476b7ed447131aa (patch)
tree2180ff57269b73aa8fee6a5802a8d5d4a169f624 /xlators/nfs/lib/src/auth-unix.c
parentb0304d47f67aa8fa677e4898fa46b96df88c8322 (diff)
nfs, nfs/rpc: Rename functions to prevent gfrpcsvc conflict
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1274 (nfs fails to start) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1274
Diffstat (limited to 'xlators/nfs/lib/src/auth-unix.c')
-rw-r--r--xlators/nfs/lib/src/auth-unix.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/xlators/nfs/lib/src/auth-unix.c b/xlators/nfs/lib/src/auth-unix.c
index 0eaf06866..a3e9c83ba 100644
--- a/xlators/nfs/lib/src/auth-unix.c
+++ b/xlators/nfs/lib/src/auth-unix.c
@@ -31,7 +31,7 @@
int
-auth_unix_request_init (rpcsvc_request_t *req, void *priv)
+nfs_auth_unix_request_init (rpcsvc_request_t *req, void *priv)
{
if (!req)
return -1;
@@ -42,7 +42,8 @@ auth_unix_request_init (rpcsvc_request_t *req, void *priv)
return 0;
}
-int auth_unix_authenticate (rpcsvc_request_t *req, void *priv)
+int
+nfs_auth_unix_authenticate (rpcsvc_request_t *req, void *priv)
{
int ret = RPCSVC_AUTH_REJECT;
struct authunix_parms aup;
@@ -51,8 +52,8 @@ int auth_unix_authenticate (rpcsvc_request_t *req, void *priv)
if (!req)
return ret;
- ret = xdr_to_auth_unix_cred (req->cred.authdata, req->cred.datalen,
- &aup, machname, req->auxgids);
+ ret = nfs_xdr_to_auth_unix_cred (req->cred.authdata, req->cred.datalen,
+ &aup, machname, req->auxgids);
if (ret == -1) {
ret = RPCSVC_AUTH_REJECT;
goto err;
@@ -69,23 +70,23 @@ err:
return ret;
}
-rpcsvc_auth_ops_t auth_unix_ops = {
+rpcsvc_auth_ops_t nfs_auth_unix_ops = {
.conn_init = NULL,
- .request_init = auth_unix_request_init,
- .authenticate = auth_unix_authenticate
+ .request_init = nfs_auth_unix_request_init,
+ .authenticate = nfs_auth_unix_authenticate
};
-rpcsvc_auth_t rpcsvc_auth_unix = {
+rpcsvc_auth_t nfs_rpcsvc_auth_unix = {
.authname = "AUTH_UNIX",
.authnum = AUTH_UNIX,
- .authops = &auth_unix_ops,
+ .authops = &nfs_auth_unix_ops,
.authprivate = NULL
};
rpcsvc_auth_t *
-rpcsvc_auth_unix_init (rpcsvc_t *svc, dict_t *options)
+nfs_rpcsvc_auth_unix_init (rpcsvc_t *svc, dict_t *options)
{
- return &rpcsvc_auth_unix;
+ return &nfs_rpcsvc_auth_unix;
}