| nfs_nfsdkrpc.c (260229) | nfs_nfsdkrpc.c (260648) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 18 unchanged lines hidden (view full) --- 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 */ 33 34#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 18 unchanged lines hidden (view full) --- 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * 32 */ 33 34#include <sys/cdefs.h> |
| 35__FBSDID("$FreeBSD: head/sys/fs/nfsserver/nfs_nfsdkrpc.c 260229 2014-01-03 15:09:59Z mav $"); | 35__FBSDID("$FreeBSD: head/sys/fs/nfsserver/nfs_nfsdkrpc.c 260648 2014-01-14 20:18:38Z mav $"); |
| 36 37#include "opt_inet6.h" 38#include "opt_kgssapi.h" 39 40#include <fs/nfs/nfsport.h> 41 42#include <rpc/rpc.h> 43#include <rpc/rpcsec_gss.h> --- 238 unchanged lines hidden (view full) --- 282 if (nd.nd_repstat & NFSERR_AUTHERR) { 283 svcerr_auth(rqst, nd.nd_repstat & ~NFSERR_AUTHERR); 284 if (nd.nd_mreq != NULL) 285 m_freem(nd.nd_mreq); 286 } else if (!svc_sendreply_mbuf(rqst, nd.nd_mreq)) { 287 svcerr_systemerr(rqst); 288 } 289 if (rp != NULL) { | 36 37#include "opt_inet6.h" 38#include "opt_kgssapi.h" 39 40#include <fs/nfs/nfsport.h> 41 42#include <rpc/rpc.h> 43#include <rpc/rpcsec_gss.h> --- 238 unchanged lines hidden (view full) --- 282 if (nd.nd_repstat & NFSERR_AUTHERR) { 283 svcerr_auth(rqst, nd.nd_repstat & ~NFSERR_AUTHERR); 284 if (nd.nd_mreq != NULL) 285 m_freem(nd.nd_mreq); 286 } else if (!svc_sendreply_mbuf(rqst, nd.nd_mreq)) { 287 svcerr_systemerr(rqst); 288 } 289 if (rp != NULL) { |
| 290 if (rqst->rq_reply_seq != 0 || SVC_ACK(xprt, NULL)) 291 nfsrvd_sentcache(rp, rqst->rq_reply_seq); | 290 nfsrvd_sentcache(rp, (rqst->rq_reply_seq != 0 || 291 SVC_ACK(xprt, NULL)), rqst->rq_reply_seq); |
| 292 } 293 svc_freereq(rqst); 294 295out: 296 NFSEXITCODE(0); 297} 298 299/* --- 220 unchanged lines hidden --- | 292 } 293 svc_freereq(rqst); 294 295out: 296 NFSEXITCODE(0); 297} 298 299/* --- 220 unchanged lines hidden --- |