evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

turning callback off for krb5p

Browse source 
sspi requires strict ordering of messages. we can't have more than 1 outstanding rpc thus, hold the lock over send and receive and turn off callbacks.
This commit is contained in:
Olga Kornievskaia 2011-02-03 13:13:10 -05:00
parent 67ae1eddaf
commit 47b0ccda9c
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.vc10/daemon.vcxproj
View file

@ -119,7 +119,7 @@
<AdditionalOptions>/Wall /wd4100 /wd4127 /wd4255 /wd4574 /wd4619 /wd4668 /wd4710 /wd4711 /wd4820 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Wall /wd4100 /wd4127 /wd4255 /wd4574 /wd4619 /wd4668 /wd4710 /wd4711 /wd4820 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\sys;..\xdr;..\dll;..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\sys;..\xdr;..\dll;..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;STANDALONE_NFSD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;STANDALONE_NFSD;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling> <ExceptionHandling>
</ExceptionHandling> </ExceptionHandling>

2
build.vc10/libtirpc.vcxproj
View file

@ -115,7 +115,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

4
daemon/nfs41_rpc.c
View file

@ -129,6 +129,10 @@ int nfs41_rpc_clnt_create(
status = GetLastError(); status = GetLastError();
goto out; goto out;
} }
#ifdef NO_CB_4_KRB5P
if (sec_flavor == RPCSEC_AUTHGSS_KRB5P)
needcb = 0;
#endif
rpc->needcb = needcb; rpc->needcb = needcb;
rpc->cond = CreateEvent(NULL, TRUE, FALSE, "rpc_recovery_cond"); rpc->cond = CreateEvent(NULL, TRUE, FALSE, "rpc_recovery_cond");
if (rpc->cond == NULL) { if (rpc->cond == NULL) {

5
daemon/nfs41_session.c
View file

@ -279,8 +279,13 @@ int nfs41_session_create(
} }
AcquireSRWLockShared(&client->exid_lock); AcquireSRWLockShared(&client->exid_lock);
#ifdef NO_CB_4_KRB5P
if ((client->roles & (EXCHGID4_FLAG_USE_PNFS_MDS |
EXCHGID4_FLAG_USE_NON_PNFS)) && client->rpc->needcb)
#else
if (client->roles & (EXCHGID4_FLAG_USE_PNFS_MDS | if (client->roles & (EXCHGID4_FLAG_USE_PNFS_MDS |
EXCHGID4_FLAG_USE_NON_PNFS)) EXCHGID4_FLAG_USE_NON_PNFS))
#endif
session->flags |= CREATE_SESSION4_FLAG_CONN_BACK_CHAN; session->flags |= CREATE_SESSION4_FLAG_CONN_BACK_CHAN;
ReleaseSRWLockShared(&client->exid_lock); ReleaseSRWLockShared(&client->exid_lock);

23
libtirpc/src/clnt_vc.c
View file

@ -549,19 +549,26 @@ call_again:
return(ct->ct_error.re_status); return(ct->ct_error.re_status);
} }
release_fd_lock(ct->ct_fd, mask); #ifdef NO_CB_4_KRB5P
if (cl->cb_thread != INVALID_HANDLE_VALUE)
release_fd_lock(ct->ct_fd, mask);
#endif
/* /*
* Keep receiving until we get a valid transaction id * Keep receiving until we get a valid transaction id
*/ */
while (TRUE) { while (TRUE) {
mutex_lock(&clnt_fd_lock); #ifdef NO_CB_4_KRB5P
while ((vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] && if (cl->cb_thread != INVALID_HANDLE_VALUE) {
vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] != GetCurrentThreadId()) || mutex_lock(&clnt_fd_lock);
(ct->reply_msg.rm_xid && ct->reply_msg.rm_xid != x_id)) while ((vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] &&
cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(ct->ct_fd)], &clnt_fd_lock); vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] != GetCurrentThreadId()) ||
vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] = GetCurrentThreadId(); (ct->reply_msg.rm_xid && ct->reply_msg.rm_xid != x_id))
mutex_unlock(&clnt_fd_lock); cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(ct->ct_fd)], &clnt_fd_lock);
vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] = GetCurrentThreadId();
mutex_unlock(&clnt_fd_lock);
}
#endif
xdrs->x_op = XDR_DECODE; xdrs->x_op = XDR_DECODE;
ct->reply_msg.acpted_rply.ar_verf = _null_auth; ct->reply_msg.acpted_rply.ar_verf = _null_auth;