--- openafs/src/NTMakefile:1.27.2.12 Sat Aug 16 13:59:03 2008 +++ openafs/src/NTMakefile Thu Apr 2 03:41:50 2009 @@ -41,91 +41,91 @@ DOCD=$(SRC)\DOLASTCMP.BAT config: - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\config $(CD) $(SRC)\config $(NTMAKE) $(CD) ..\.. procmgmt_headers: config - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\procmgmt $(CD) $(SRC)\procmgmt $(NTMAKE_HEADERS) $(CD) ..\.. afsreg_headers: - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\afsreg $(CD) $(SRC)\WINNT\afsreg $(NTMAKE_HEADERS) $(CD) ..\..\.. lwp_headers: - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\lwp $(CD) $(SRC)\lwp $(NTMAKE_HEADERS) $(CD) ..\.. util: procmgmt_headers afsreg_headers lwp_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. comerr: util - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. afs: comerr - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\afs $(CD) $(SRC)\afs $(NTMAKE) $(CD) ..\.. cmd: afs - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. afsreg: cmd - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. eventlog: afsreg - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. lwp: eventlog - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. rxgen: lwp - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. des: rxgen - echo ***** $@ + @echo ***** $@ ! IF (EXIST($(SRC)\des\NTMakefile)) $(DOCD) $(SRC)\des $(CD) $(SRC)\des @@ -139,461 +139,461 @@ ! ENDIF rx: des - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. rxdebug: rx - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. ubik_headers: rxdebug - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\ubik $(CD) $(SRC)\ubik $(NTMAKE_HEADERS) $(CD) ..\.. rxstat: ubik_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. rxkad: rxstat - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. pthread: rxkad - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. procmgmt: pthread - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. fsint: procmgmt - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. audit: fsint - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. osi_headers: audit - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\client_osi $(CD) $(SRC)\WINNT\client_osi $(NTMAKE_HEADERS) $(CD) ..\..\.. libacl_headers: osi_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libacl $(CD) $(SRC)\libacl $(NTMAKE_HEADERS) $(CD) ..\.. cm_headers: libacl_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\afsd $(CD) $(SRC)\WINNT\afsd $(NTMAKE_HEADERS) $(CD) ..\..\.. auth_headers: cm_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\auth $(CD) $(SRC)\auth $(NTMAKE_HEADERS) $(CD) ..\.. vlserver_headers: auth_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\vlserver $(CD) $(SRC)\vlserver $(NTMAKE_HEADERS) $(CD) ..\.. afsdobjs: vlserver_headers - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\afsd $(CD) $(SRC)\WINNT\afsd $(NTMAKE_OBJS) $(CD) ..\..\.. sys: afsdobjs - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. auth: sys - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. ubik: auth - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. ptserver: ubik - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. libacl: ptserver - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. kauth: libacl - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. vlserver: kauth - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. usd: vlserver - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. bubasics: usd - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. budb: bubasics - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. butm: budb - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. dir: butm - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. vol: dir - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. volser: vol - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. viced: volser - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. update: viced - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. bucoord: update - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. butc: bucoord - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. bozo: butc - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. bosctlsvc: bozo - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. bu_utils: bosctlsvc - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. libafsrpc: bu_utils - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. libafsauthent: libafsrpc - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. tviced: libafsauthent - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. tbutc: tviced - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. talocale: tbutc - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. license: talocale - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. client_osi: license - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. afsd: client_osi - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. libadmin: afsd - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. adminutil: libadmin - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. vos: adminutil - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. client: vos - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. kas: client - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. pts: kas - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. bos: pts - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. cfg: bos - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\$@ $(CD) $(SRC)\libadmin\$@ $(NTMAKE) $(CD) ..\..\.. admintest: cfg - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\libadmin\test $(CD) $(SRC)\libadmin\test $(NTMAKE) $(CD) ..\..\.. afsadmsvr: admintest - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. afsusrmgr: afsadmsvr - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. afssvrmgr: afsusrmgr - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. afssvrcfg: afssvrmgr - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. afssvrcpa: afssvrcfg - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. client_talocale: afssvrcpa - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\talocale $(CD) $(SRC)\WINNT\talocale $(NTMAKE) $(CD) ..\..\.. client_cpa: client_talocale - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. client_config: client_cpa - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. client_exp: client_config - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. client_creds: client_exp - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. aklog: client_creds - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. xstat: aklog - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. netidmgr_plugin: xstat - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) @@ -601,24 +601,24 @@ extra: netidmgr_plugin ! IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile) - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. ! ELSE - echo ***** Skipping $@ ***** Not found. + @echo ***** Skipping $@ ***** Not found. ! ENDIF finale: extra - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. install: finale - echo Build Finished Successfully + @echo Build Finished Successfully # Clean target for obj tree @@ -647,28 +647,33 @@ -@copy $(SRC)\config\NTLANG.BAT . loopback: - echo ***** Making Loopback Adapter Utility DLL + @echo ***** Making Loopback Adapter Utility DLL $(DOCD) $(SRC)\WINNT\install\$@ $(CD) $(SRC)\WINNT\install\$@ $(NTMAKE) $(CD) ..\..\..\.. man-pages: - echo ***** $@ + @echo ***** $@ $(DOCD) $(DOC)\man-pages $(CD) $(DOC)\man-pages $(NTMAKE) $(CD) ..\.. -NSIS: loopback man-pages - echo ***** Making NSIS Installer - $(DOCD) $(SRC)\WINNT\install\$@ - $(CD) $(SRC)\WINNT\install\$@ +NSIS.i386: loopback man-pages + @echo ***** Making NSIS Installer + $(DOCD) $(SRC)\WINNT\install\NSIS + $(CD) $(SRC)\WINNT\install\NSIS $(NTMAKE) $(CD) ..\..\..\.. +NSIS.AMD64: + @echo Skipping NSIS Installer on non-x86 platforms; not implemented + +NSIS: NSIS.$(CPU) + wix: loopback man-pages - echo ***** Making Wix MSI Installer + @echo ***** Making Wix MSI Installer $(DOCD) $(SRC)\WINNT\install\$@ $(CD) $(SRC)\WINNT\install\$@ $(NTMAKE) --- openafs/src/WINNT/afsd/afsd_eventlog.c:1.5.4.4 Wed Feb 18 23:04:36 2009 +++ openafs/src/WINNT/afsd/afsd_eventlog.c Sat Mar 28 19:17:44 2009 @@ -195,7 +195,6 @@ case MSG_SERVICE_ERROR_STOP: case MSG_CRYPT_OFF: case MSG_CRYPT_ON: - case MSG_SMB_RESET_ALL_VCS: break; case MSG_FLUSH_BAD_SHARE_NAME: case MSG_FLUSH_OPEN_ENUM_ERROR: --- openafs/src/WINNT/afsd/afsd_eventmessages.mc:1.4.4.3 Wed Feb 18 23:04:36 2009 +++ openafs/src/WINNT/afsd/afsd_eventmessages.mc Sat Mar 28 19:17:44 2009 @@ -374,12 +374,4 @@ MaxBufferSize for client is too small (Client=%1, Server=%2). . -MessageId= -Severity=Informational -Facility=System -SymbolicName=MSG_SMB_RESET_ALL_VCS -Language=English -Windows SMB Redirector requests reset of all SMB virtual circuits. -. - ;#endif /* __AFSD_EVENTMESSAGES_H_ 1 */ --- openafs/src/WINNT/afsd/afsd_init.c:1.79.2.54 Sun Mar 1 23:45:15 2009 +++ openafs/src/WINNT/afsd/afsd_init.c Wed Apr 1 13:29:24 2009 @@ -617,6 +617,7 @@ int cm_SubnetMask[CM_MAXINTERFACE_ADDR];/* client's subnet mask in host order*/ int cm_NetMtu[CM_MAXINTERFACE_ADDR]; /* client's MTU sizes */ int cm_NetFlags[CM_MAXINTERFACE_ADDR]; /* network flags */ + DWORD dwPriority; WSAStartup(0x0101, &WSAjunk); @@ -666,6 +667,16 @@ osi_panic(buf, __FILE__, __LINE__); } + dummyLen = sizeof(dwPriority); + code = RegQueryValueEx(parmKey, "PriorityClass", NULL, NULL, + (BYTE *) &dwPriority, &dummyLen); + if (code != ERROR_SUCCESS || dwPriority == 0) { + dwPriority = HIGH_PRIORITY_CLASS; + } + if (dwPriority != GetPriorityClass(GetCurrentProcess())) + SetPriorityClass(GetCurrentProcess(), dwPriority); + afsi_log("PriorityClass 0x%x", GetPriorityClass(GetCurrentProcess())); + dummyLen = sizeof(lockOrderValidation); code = RegQueryValueEx(parmKey, "LockOrderValidation", NULL, NULL, (BYTE *) &lockOrderValidation, &dummyLen); --- openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.99 Sat Mar 14 00:55:09 2009 +++ openafs/src/WINNT/afsd/cm_vnodeops.c Fri Mar 27 13:58:19 2009 @@ -1932,17 +1932,13 @@ fid_count = i+1; } else { /* add the new fid to the list */ - for ( i=0; ifid, &fids[i]) ) { - code = CM_ERROR_TOO_MANY_SYMLINKS; - cm_ReleaseSCache(nscp); - nscp = NULL; - break; - } - } - if (i == fid_count && fid_count < MAX_FID_COUNT) { - fids[fid_count++] = nscp->fid; - } + if (fid_count == MAX_FID_COUNT) { + code = CM_ERROR_TOO_MANY_SYMLINKS; + cm_ReleaseSCache(nscp); + nscp = NULL; + break; + } + fids[fid_count++] = nscp->fid; } } --- openafs/src/WINNT/afsd/cm_vnodeops.h:1.14.4.15 Sat Mar 14 00:55:10 2009 +++ openafs/src/WINNT/afsd/cm_vnodeops.h Fri Mar 27 13:58:19 2009 @@ -237,7 +237,7 @@ extern int cm_KeyEquals(cm_key_t * k1, cm_key_t * k2, int flags); -#define MAX_SYMLINK_COUNT 16 +#define MAX_SYMLINK_COUNT 64 /* make this big enough so that one buffer of dir pages won't overflow. We'll * check anyway, but we want to minimize the chance that we have to leave stuff --- openafs/src/WINNT/afsd/cm_volume.c:1.14.4.59 Sun Mar 1 23:45:15 2009 +++ openafs/src/WINNT/afsd/cm_volume.c Wed Apr 1 12:39:08 2009 @@ -163,7 +163,8 @@ cm_volume_t *volp) { cm_conn_t *connp; - int i, j, k; + int i; + afs_uint32 j, k; cm_serverRef_t *tsrp; cm_server_t *tsp; struct sockaddr_in tsockAddr; @@ -412,7 +413,7 @@ serverUUID[j] = uuid; } - free(addrs.bulkaddrs_val); /* This is wrong */ + xdr_free(addrs.bulkaddrs_val, addrs.bulkaddrs_len * sizeof(*addrs.bulkaddrs_val)); if (nentries == 0) code = CM_ERROR_INVAL; --- openafs/src/WINNT/afsd/smb.c:1.118.2.120 Tue Mar 17 23:56:26 2009 +++ openafs/src/WINNT/afsd/smb.c Sat Apr 4 16:16:36 2009 @@ -3183,7 +3183,7 @@ #endif /* COMMENT */ } else if (code == CM_ERROR_BADSHARENAME) { - NTStatus = 0xC00000CCL; /* Bad network name */ + NTStatus = 0xC00000BEL; /* Bad network path (server valid, share bad) */ } else if (code == CM_ERROR_NOIPC) { #ifdef COMMENT @@ -3254,7 +3254,7 @@ NTStatus = 0xC000022DL; /* Retry */ } else if (code == CM_ERROR_ALLOFFLINE || code == CM_ERROR_ALLDOWN) { - NTStatus = 0xC00000BEL; /* Bad Network Path */ + NTStatus = 0xC000003AL; /* Path not found */ } else if (code >= ERROR_TABLE_BASE_RXK && code < ERROR_TABLE_BASE_RXK + 256) { NTStatus = 0xC0000322L; /* No Kerberos key */ @@ -8358,25 +8358,30 @@ if (dp->procp) { /* we have a recognized operation */ char * opName = myCrt_Dispatch(inp->inCom); + smb_t *smbp; + + smbp = (smb_t *) inp; - if (inp->inCom == 0x1d) + osi_Log5(smb_logp,"Dispatch %s mid 0x%x vcp 0x%p lana %d lsn %d", + opName, smbp->mid, vcp,vcp->lana,vcp->lsn); + if (inp->inCom == 0x1d) { /* Raw Write */ code = smb_ReceiveCoreWriteRaw (vcp, inp, outp, rwcp); - else { - osi_Log4(smb_logp,"Dispatch %s vcp 0x%p lana %d lsn %d", - opName,vcp,vcp->lana,vcp->lsn); + } else { code = (*(dp->procp)) (vcp, inp, outp); - osi_Log4(smb_logp,"Dispatch return code 0x%x vcp 0x%p lana %d lsn %d", - code,vcp,vcp->lana,vcp->lsn); -#ifdef LOG_PACKET - if ( code == CM_ERROR_BADSMB || - code == CM_ERROR_BADOP ) - smb_LogPacket(inp); -#endif /* LOG_PACKET */ } + osi_Log5(smb_logp,"Dispatch return code 0x%x mid 0x%x vcp 0x%p lana %d lsn %d", + code, smbp->mid, vcp,vcp->lana,vcp->lsn); newTime = GetTickCount(); - osi_Log2(smb_logp, "Dispatch %s duration %d ms", opName, newTime - oldTime); + osi_Log3(smb_logp, "Dispatch %s mid 0x%x duration %d ms", + opName, smbp->mid, newTime - oldTime); + +#ifdef LOG_PACKET + if ( code == CM_ERROR_BADSMB || + code == CM_ERROR_BADOP ) + smb_LogPacket(inp); +#endif /* LOG_PACKET */ /* ReceiveV3Tran2A handles its own logging */ if (inp->inCom != 0x32 && newTime - oldTime > 45000) { @@ -8387,7 +8392,7 @@ cm_fid_t afid = {0,0,0,0,0}; uidp = smb_FindUID(vcp, smbp->uid, 0); - smb_LookupTIDPath(vcp,((smb_t *)inp)->tid, &treepath); + smb_LookupTIDPath(vcp, smbp->tid, &treepath); fidp = smb_FindFID(vcp, inp->fid, 0); if (fidp) { @@ -8401,9 +8406,10 @@ pathname = inp->stringsp->wdata; } - afsi_log("Request %s duration %d ms user %S tid \"%S\" path? \"%S\" afid (%d.%d.%d.%d)", - opName, newTime - oldTime, - uidp ? uidp->unp->name : NULL, + afsi_log("Request %s duration %d ms user 0x%x \"%S\" pid 0x%x mid 0x%x tid 0x%x \"%S\" path? \"%S\" afid (%d.%d.%d.%d)", + opName, newTime - oldTime, + smbp->uid, uidp ? uidp->unp->name : NULL, + smbp->pid, smbp->mid, smbp->tid, treepath, pathname, afid.cell, afid.volume, afid.vnode, afid.unique); @@ -10077,13 +10083,12 @@ ); if (nts != STATUS_SUCCESS && ntsEx != STATUS_SUCCESS) { - char message[AFSPATHMAX]; - sprintf(message,"MsV1_0SetProcessOption failure: nts 0x%x ntsEx 0x%x", - nts, ntsEx); - OutputDebugString(message); - afsi_log(message); + osi_Log2(smb_logp, "MsV1_0SetProcessOption failure: nts 0x%x ntsEx 0x%x", + nts, ntsEx); + + afsi_log("MsV1_0SetProcessOption failure: nts 0x%x ntsEx 0x%x", nts, ntsEx); } else { - OutputDebugString("MsV1_0SetProcessOption success"); + osi_Log0(smb_logp, "MsV1_0SetProcessOption success"); afsi_log("MsV1_0SetProcessOption success"); } /* END - code from Larry */ --- openafs/src/WINNT/afsd/smb3.c:1.95.2.91 Tue Mar 17 23:56:26 2009 +++ openafs/src/WINNT/afsd/smb3.c Mon Apr 6 13:25:16 2009 @@ -144,8 +144,6 @@ va_start( args, format ); cm_ClientStrPrintfV(vbuffer, lengthof(vbuffer), format, args); osi_Log1(smb_logp, "%S", osi_LogSaveClientString(smb_logp, vbuffer)); - cm_ClientStrCat(vbuffer, lengthof(vbuffer), _C("\n")); - OutputDebugStringW(vbuffer); } void OutputDebugHexDump(unsigned char * buffer, int len) { @@ -159,8 +157,6 @@ if(!(i%16)) { if(i) { osi_Log1(smb_logp, "%s", osi_LogSaveString(smb_logp, buf)); - StringCchCatA(buf, lengthof(buf), "\r\n"); - OutputDebugString(buf); } StringCchPrintfA(buf, lengthof(buf), "%5x", i); memset(buf+5,' ',80); @@ -180,8 +176,6 @@ } if(i) { osi_Log1(smb_logp, "%s", osi_LogSaveString(smb_logp, buf)); - StringCchCatA(buf, lengthof(buf), "\r\n"); - OutputDebugString(buf); } } @@ -715,7 +709,6 @@ } if (vcNumber == 0) { - LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_SMB_RESET_ALL_VCS); osi_Log0(smb_logp, "Resetting all VCs"); smb_MarkAllVCsDead(vcp); } @@ -1856,7 +1849,7 @@ } else { userp = smb_GetTran2User(vcp, p); if (!userp) { - osi_Log1(smb_logp,"ReceiveTran2GetDfsReferral unable to resolve user [%d]", p->uid); + osi_Log1(smb_logp,"ReceiveRAPNetShareGetInfo unable to resolve user [%d]", p->uid); return CM_ERROR_BADSMB; } code = cm_NameI(cm_data.rootSCachep, shareName, @@ -2262,9 +2255,10 @@ pathname = inp->stringsp->wdata; } - afsi_log("Request %s duration %d ms user %S tid \"%S\" path? \"%S\" afid (%d.%d.%d.%d)", + afsi_log("Request %s duration %d ms user 0x%x \"%S\" pid 0x%x mid 0x%x tid 0x%x \"%S\" path? \"%S\" afid (%d.%d.%d.%d)", myCrt_2Dispatch(asp->opcode), newTime - oldTime, - uidp ? uidp->unp->name : NULL, + asp->uid, uidp ? uidp->unp->name : NULL, + asp->pid, asp->mid, asp->tid, treepath, pathname, afid.cell, afid.volume, afid.vnode, afid.unique); @@ -3902,10 +3896,10 @@ /* * We have a requested path. Check to see if it is something * we know about. - * - * But be careful because the name that we might be searching - * for might be a known name with the final character stripped - * off. If we + * + * But be careful because the name that we might be searching + * for might be a known name with the final character stripped + * off. */ code = cm_NameI(cm_data.rootSCachep, &requestFileName[nbnLen+2], CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD | CM_FLAG_DFS_REFERRAL, --- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.42 Thu Jan 22 11:05:20 2009 +++ openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Mon Apr 6 13:20:52 2009 @@ -57,7 +57,7 @@

OpenAFS for Windows

-

Version 1.5.57

+

Version 1.5.59

 

@@ -78,7 +78,7 @@ ·         OpenAFS for Windows 1.5.57 +href="ReleaseNotes/relnotes-frames.htm">OpenAFS for Windows 1.5.59 Release Notes

--- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.40 Thu Jan 22 11:05:25 2009 +++ openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm Mon Apr 6 13:20:55 2009 @@ -18,7 +18,7 @@ .shape {behavior:url(#default#VML);} -OpenAFS for Windows 1.5.57 Release Notes +OpenAFS for Windows 1.5.59 Release Notes -OpenAFS for Windows 1.5.57 Release Notes +OpenAFS for Windows 1.5.59 Release Notes -

OpenAFS for Windows 1.5.57 (with Unicode Support)
+

OpenAFS for Windows 1.5.59 (with Unicode Support)
Release Notes

The Andrew File System (AFS) is a location-independent --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.41 Thu Jan 22 11:05:26 2009 +++ openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm Mon Apr 6 13:20:55 2009 @@ -12,7 +12,7 @@ -OpenAFS for Windows 1.5.57 Table of Contents +OpenAFS for Windows 1.5.59 Table of Contents