diff --git a/sys/nfs41_debug.c b/sys/nfs41_debug.c index 595b020..0f7b917 100644 --- a/sys/nfs41_debug.c +++ b/sys/nfs41_debug.c @@ -304,8 +304,10 @@ void print_file_object(int on, PFILE_OBJECT file) void print_fo_all(int on, PRX_CONTEXT c) { if (!on) return; - DbgP("OpenCount %d FCB %p SRV %p FOBX %p\n", c->pFcb->OpenCount, c->pFcb, - c->pRelevantSrvOpen, c->pFobx); + if (c->pFcb && c->pRelevantSrvOpen) + DbgP("OpenCount %d FCB %p SRV %p FOBX %p VNET %p NET %p\n", + c->pFcb->OpenCount, c->pFcb, c->pRelevantSrvOpen, c->pFobx, + c->pRelevantSrvOpen->pVNetRoot, c->pFcb->pNetRoot); } VOID print_fcb(int on, IN PMRX_FCB p) diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index 5b1a06d..a47bcb3 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -2670,12 +2670,8 @@ BOOLEAN has_file_changed( void print_open_args(PRX_CONTEXT RxContext) { print_debug_header(RxContext); - print_net_root(0, RxContext->pFcb->pNetRoot); - print_v_net_root(0, RxContext->pRelevantSrvOpen->pVNetRoot); //DbgP("RxContext->FsdUid %ld\n", RxContext->FsdUid); //DbgP("RxInferFileType returns %d\n", RxInferFileType(RxContext)); - print_irps_flags(0, RxContext->CurrentIrpSp); - print_irp_flags(0, RxContext->CurrentIrp); print_nt_create_params(1, RxContext->Create.NtCreateParameters); } @@ -3639,14 +3635,11 @@ out: static void print_acl_args(SECURITY_INFORMATION info) { - if (info & OWNER_SECURITY_INFORMATION) - DbgP("OWNER_SECURITY_INFORMATION\n"); - if (info & GROUP_SECURITY_INFORMATION) - DbgP("GROUP_SECURITY_INFORMATION\n"); - if (info & DACL_SECURITY_INFORMATION) - DbgP("DACL_SECURITY_INFORMATION\n"); - if (info & SACL_SECURITY_INFORMATION) - DbgP("SACL_SECURITY_INFORMATION\n"); + DbgP("Security query: %s %s %s\n", + (info & OWNER_SECURITY_INFORMATION)?"OWNER":"", + (info & GROUP_SECURITY_INFORMATION)?"GROUP":"", + (info & DACL_SECURITY_INFORMATION)?"DACL":"", + (info & SACL_SECURITY_INFORMATION)?"SACL":""); } static NTSTATUS map_query_acl_error(DWORD error)