Date: Fri, 14 Nov 2008 12:31:05 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184972 - user/dfr/gssapi/6/sys/nfsserver Message-ID: <200811141231.mAECV5nv092411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Fri Nov 14 12:31:05 2008 New Revision: 184972 URL: http://svn.freebsd.org/changeset/base/184972 Log: Fix module build. Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c ============================================================================== --- user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Fri Nov 14 12:09:32 2008 (r184971) +++ user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Fri Nov 14 12:31:05 2008 (r184972) @@ -379,22 +379,22 @@ nfssvc_program(struct svc_req *rqst, SVC if (port >= IPPORT_RESERVED && nd.nd_procnum != NFSPROC_NULL) { #ifdef INET6 - char b6[INET6_ADDRSTRLEN]; #if defined(KLD_MODULE) + char b6[INET6_ADDRSTRLEN]; /* Do not use ip6_sprintf: the nfs module should work without INET6. */ -#define ip6_sprintf(buf, a) \ - (sprintf((buf), "%x:%x:%x:%x:%x:%x:%x:%x", \ +#define ip6_sprintf(a) \ + (sprintf(b6, "%x:%x:%x:%x:%x:%x:%x:%x", \ (a)->s6_addr16[0], (a)->s6_addr16[1], \ (a)->s6_addr16[2], (a)->s6_addr16[3], \ (a)->s6_addr16[4], (a)->s6_addr16[5], \ (a)->s6_addr16[6], (a)->s6_addr16[7]), \ - (buf)) + b6) #endif #endif printf("NFS request from unprivileged port (%s:%d)\n", #ifdef INET6 sin->sin_family == AF_INET6 ? - ip6_sprintf(b6, &satosin6(sin)->sin6_addr) : + ip6_sprintf(&satosin6(sin)->sin6_addr) : #if defined(KLD_MODULE) #undef ip6_sprintf #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811141231.mAECV5nv092411>