diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-08-10 02:41:54 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-08-10 02:44:22 -0700 |
| commit | 0af39ff8d03173a7ba3df1b13476b7ed447131aa (patch) | |
| tree | 2180ff57269b73aa8fee6a5802a8d5d4a169f624 /xlators/nfs/lib/src/auth-null.c | |
| parent | b0304d47f67aa8fa677e4898fa46b96df88c8322 (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-null.c')
| -rw-r--r-- | xlators/nfs/lib/src/auth-null.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/xlators/nfs/lib/src/auth-null.c b/xlators/nfs/lib/src/auth-null.c index b162db112..a98d47280 100644 --- a/xlators/nfs/lib/src/auth-null.c +++ b/xlators/nfs/lib/src/auth-null.c @@ -29,7 +29,7 @@ int -auth_null_request_init (rpcsvc_request_t *req, void *priv) +nfs_auth_null_request_init (rpcsvc_request_t *req, void *priv) { if (!req) return -1; @@ -43,29 +43,30 @@ auth_null_request_init (rpcsvc_request_t *req, void *priv) return 0; } -int auth_null_authenticate (rpcsvc_request_t *req, void *priv) +int +nfs_auth_null_authenticate (rpcsvc_request_t *req, void *priv) { /* Always succeed. */ return RPCSVC_AUTH_ACCEPT; } -rpcsvc_auth_ops_t auth_null_ops = { +rpcsvc_auth_ops_t nfs_auth_null_ops = { .conn_init = NULL, - .request_init = auth_null_request_init, - .authenticate = auth_null_authenticate + .request_init = nfs_auth_null_request_init, + .authenticate = nfs_auth_null_authenticate }; -rpcsvc_auth_t rpcsvc_auth_null = { +rpcsvc_auth_t nfs_rpcsvc_auth_null = { .authname = "AUTH_NULL", .authnum = AUTH_NULL, - .authops = &auth_null_ops, + .authops = &nfs_auth_null_ops, .authprivate = NULL }; rpcsvc_auth_t * -rpcsvc_auth_null_init (rpcsvc_t *svc, dict_t *options) +nfs_rpcsvc_auth_null_init (rpcsvc_t *svc, dict_t *options) { - return &rpcsvc_auth_null; + return &nfs_rpcsvc_auth_null; } |