rovema.kpaste.net RSS- diff --git a/daemon/from_kernel.h b/daemon/from_kernel.h
- index c14c398..221ee3b 100644
- --- a/daemon/from_kernel.h
- +++ b/daemon/from_kernel.h
- @@ -152,6 +152,7 @@ typedef struct _FILE_BOTH_DIR_INFORMATION {
- WCHAR FileName[1];
- } FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION;
- +#ifdef FIXME_OLD_DDK
- typedef struct _FILE_FULL_DIR_INFO {
- ULONG NextEntryOffset;
- ULONG FileIndex;
- @@ -166,6 +167,7 @@ typedef struct _FILE_FULL_DIR_INFO {
- ULONG EaSize;
- WCHAR FileName[1];
- } FILE_FULL_DIR_INFO, *PFILE_FULL_DIR_INFO;
- +#endif /* FIXME_OLD_DDK */
- typedef struct _FILE_ID_FULL_DIR_INFO {
- ULONG NextEntryOffset;
- diff --git a/daemon/idmap.c b/daemon/idmap.c
- index f38ec71..0dfa8ef 100644
- --- a/daemon/idmap.c
- +++ b/daemon/idmap.c
- @@ -275,7 +275,7 @@ static int config_find_option(
- /* find the config_option by key */
- for (i = 0; i < count; i++) {
- - if (stricmp(pair->key, g_options[i].key) == 0) {
- + if (_stricmp(pair->key, g_options[i].key) == 0) {
- *option = &g_options[i];
- status = NO_ERROR;
- break;
- diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c
- index f7e3d65..217900a 100644
- --- a/daemon/nfs41_compound.c
- +++ b/daemon/nfs41_compound.c
- @@ -362,7 +362,7 @@ retry:
- saved_sec_flavor = session->client->rpc->sec_flavor;
- saved_auth = session->client->rpc->rpc->cl_auth;
- if (op == OP_LOOKUP || op == OP_OPEN) {
- - const nfs41_component *name;
- + const nfs41_component *name = NULL;
- nfs41_path_fh tmp = { 0 };
- nfs41_getfh_res *getfh;
- nfs41_lookup_args *largs;
- diff --git a/dirs b/dirs
- index ae5014a..b50059f 100644
- --- a/dirs
- +++ b/dirs
- @@ -1 +1 @@
- -DIRS = dll sys mount install
- +DIRS = dll sys mount install libtirpc daemon
- diff --git a/install/sources b/install/sources
- index d5bc6c2..71c5e6b 100644
- --- a/install/sources
- +++ b/install/sources
- @@ -1,15 +1,15 @@
- -TARGETTYPE=PROGRAM
- -TARGETNAME=nfs_install
- -SOURCES=nfs_install.c nfsreginst.c
- -UMTYPE=console
- -USE_MSVCRT=1
- -INCLUDES=..\sys
- -
- -!IF 0
- -/W3 is default level
- -bump to /Wall, but suppress warnings generated by system includes,
- -as well as the following warnings:
- -4100 - unused function call arguments (we have lots of stubs)
- -4127 - constant conditional (I like to use if(0) or if(1))
- -!ENDIF
- -MSC_WARNING_LEVEL=/Wall /wd4668 /wd4619 /wd4820 /wd4255 /wd4100 /wd4127 /wd4201 /wd4214 /wd4711
- +TARGETTYPE=PROGRAM
- +TARGETNAME=nfs_install
- +SOURCES=nfs_install.c nfsreginst.c
- +UMTYPE=console
- +USE_MSVCRT=1
- +INCLUDES=..\sys
- +
- +!IF 0
- +/W3 is default level
- +bump to /Wall, but suppress warnings generated by system includes,
- +as well as the following warnings:
- +4100 - unused function call arguments (we have lots of stubs)
- +4127 - constant conditional (I like to use if(0) or if(1))
- +!ENDIF
- +MSC_WARNING_LEVEL=/Wall /wd4668 /wd4619 /wd4820 /wd4255 /wd4100 /wd4127 /wd4201 /wd4214 /wd4711
- diff --git a/libtirpc/src/auth_unix.c b/libtirpc/src/auth_unix.c
- index 4757aaa..ca8c908 100644
- --- a/libtirpc/src/auth_unix.c
- +++ b/libtirpc/src/auth_unix.c
- @@ -375,8 +375,14 @@ marshal_new_auth(auth)
- XDR_DESTROY(xdrs);
- }
- -static bool_t
- -authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq)
- +static int
- +authunix_wrap(struct __auth *auth, XDR *xdrs, xdrproc_t func, caddr_t args)
- +{
- + return ((*func)(xdrs, args));
- +}
- +
- +static int
- +authunix_unwrap(struct __auth *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq)
- {
- return ((*func)(xdrs, args));
- }
- @@ -397,7 +403,7 @@ authunix_ops()
- ops.ah_refresh = authunix_refresh;
- ops.ah_destroy = authunix_destroy;
- ops.ah_wrap = authunix_wrap;
- - ops.ah_unwrap = authunix_wrap;
- + ops.ah_unwrap = authunix_unwrap;
- }
- mutex_unlock(&ops_lock);
- return (&ops);
- diff --git a/libtirpc/src/clnt_dg.c b/libtirpc/src/clnt_dg.c
- index a567b22..1ece8ad 100644
- --- a/libtirpc/src/clnt_dg.c
- +++ b/libtirpc/src/clnt_dg.c
- @@ -55,6 +55,10 @@
- //#include <err.h>
- #include "rpc_com.h"
- +#ifdef _WIN32
- +#undef IP_RECVERR
- +#endif
- +
- #ifdef IP_RECVERR
- #include <asm/types.h>
- #include <linux/errqueue.h>
- diff --git a/libtirpc/src/sources b/libtirpc/src/sources
- index 80a6ae2..87249b5 100644
- --- a/libtirpc/src/sources
- +++ b/libtirpc/src/sources
- @@ -81,7 +81,7 @@ DLLBASE=0x1010000
- #USE_NTDLL=1
- #USE_MSVCRT=1
- USE_LIBCMT=1
- -NET_C_DEFINES=-DUNICODE -DINET6 -D_WIN32 -DPORTMAP
- +NET_C_DEFINES=-DUNICODE -DFD_SETSIZE=128 -DINET6 -DNO_CB_4_KRB5P -DPORTMAP
- INCLUDES=..\sys; \
- ..\tirpc; \
- @@ -90,6 +90,7 @@ INCLUDES=..\sys; \
- TARGETLIBS=$(SDK_LIB_PATH)\user32.lib \
- $(SDK_LIB_PATH)\kernel32.lib \
- $(SDK_LIB_PATH)\ws2_32.lib \
- + $(SDK_LIB_PATH)\secur32.lib \
- $(SDK_LIB_PATH)\Advapi32.lib
- diff --git a/libtirpc/src/xdr_rec.c b/libtirpc/src/xdr_rec.c
- index cd8e987..567f574 100644
- --- a/libtirpc/src/xdr_rec.c
- +++ b/libtirpc/src/xdr_rec.c
- @@ -421,7 +421,7 @@ xdrrec_getoutbase(xdrs)
- switch (xdrs->x_op) {
- case XDR_ENCODE:
- - buf = rstrm->out_base;
- + buf = (int32_t *)rstrm->out_base;
- break;
- case XDR_DECODE:
- diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h
- index a2ed188..2789e0a 100644
- --- a/libtirpc/tirpc/wintirpc.h
- +++ b/libtirpc/tirpc/wintirpc.h
- @@ -45,7 +45,7 @@
- #include <process.h>
- #include <basetsd.h>
- -#define snprintf _snprintf
- +//#define snprintf _snprintf
- //#define vsnprintf _vsnprintf
- #define strcasecmp _stricmp
- //#define strdup _strdup
CITI ms-nfsv41-client patch for VC19
Posted by Anonymous on Mon 4th Sep 2023 17:59
raw | new post
Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.