From 105d06bf527b495fc510e05278b2a0cbe938fe8a Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 13 Sep 2007 02:41:44 +0000 Subject: [PATCH] DEVEL15-windows-afsmaxpath-20070912 ensure that all path stack buffers are of size AFSMAXPATH (cherry picked from commit b06335911bb203b74ab7129266680d8d2b97739b) --- src/WINNT/afsd/cm_buf.c | 2 +- src/WINNT/afsd/cm_vnodeops.c | 4 ++-- src/WINNT/afsd/smb.c | 12 ++++++------ src/WINNT/afsd/smb3.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/WINNT/afsd/cm_buf.c b/src/WINNT/afsd/cm_buf.c index b8fb5972a..d1d634885 100644 --- a/src/WINNT/afsd/cm_buf.c +++ b/src/WINNT/afsd/cm_buf.c @@ -1770,7 +1770,7 @@ long buf_CleanDirtyBuffers(cm_scache_t *scp) for (bp = cm_data.buf_allp; bp; bp=bp->allp, bcount++) { if (!cm_FidCmp(fidp, &bp->fid) && (bp->flags & CM_BUF_DIRTY)) { - buf_Hold(bp); + buf_Hold(bp); lock_ObtainMutex(&bp->mx); bp->cmFlags &= ~CM_BUF_CMSTORING; bp->flags &= ~CM_BUF_DIRTY; diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c index 2f3f40d1d..a0ef4b4f1 100644 --- a/src/WINNT/afsd/cm_vnodeops.c +++ b/src/WINNT/afsd/cm_vnodeops.c @@ -1502,7 +1502,7 @@ long cm_Lookup(cm_scache_t *dscp, char *namep, long flags, cm_user_t *userp, #endif { long code; - char tname[256]; + char tname[AFSPATHMAX]; int sysNameIndex = 0; cm_scache_t *scp = NULL; @@ -1818,7 +1818,7 @@ long cm_NameI(cm_scache_t *rootSCachep, char *pathp, long flags, char *tp; /* ptr moving through input buffer */ char tc; /* temp char */ int haveComponent; /* has new component started? */ - char component[256]; /* this is the new component */ + char component[AFSPATHMAX]; /* this is the new component */ char *cp; /* component name being assembled */ cm_scache_t *tscp; /* current location in the hierarchy */ cm_scache_t *nscp; /* next dude down */ diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index a09ac2f45..c529a72d5 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -1651,8 +1651,8 @@ char VNLCComputerName[] = "%LCCOMPUTERNAME%"; /* List available shares */ int smb_ListShares() { - char sbmtpath[256]; - char pathName[256]; + char sbmtpath[AFSPATHMAX]; + char pathName[AFSPATHMAX]; char shareBuf[4096]; int num_shares=0; char *this_share; @@ -1689,7 +1689,7 @@ int smb_ListShares() /*strcpy(shareNameList[num_shares], this_share);*/ len = GetPrivateProfileString("AFS Submounts", this_share, NULL, - pathName, 256, + pathName, AFSPATHMAX, sbmtpath); if (!len) return num_shares; @@ -3782,7 +3782,7 @@ long smb_ReceiveCoreTreeConnect(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * smb_tid_t *tidp; smb_user_t *uidp; unsigned short newTid; - char shareName[256]; + char shareName[AFSPATHMAX]; char *sharePath; int shareFound; char *tp; @@ -8428,7 +8428,7 @@ void smb_Listener(void *parmp) return; } else if (code != 0) { #ifndef DJGPP - char tbuffer[256]; + char tbuffer[AFSPATHMAX]; #endif /* terminate silently if shutdown flag is set */ @@ -9263,7 +9263,7 @@ void smb_Init(osi_log_t *logp, int useV3, ); if (nts != STATUS_SUCCESS && ntsEx != STATUS_SUCCESS) { - char message[256]; + char message[AFSPATHMAX]; sprintf(message,"MsV1_0SetProcessOption failure: nts 0x%x ntsEx 0x%x", nts, ntsEx); OutputDebugString(message); diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index 4873559c1..fac34cf64 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -1008,7 +1008,7 @@ long smb_ReceiveV3TreeConnectX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *o smb_tid_t *tidp; smb_user_t *uidp = NULL; unsigned short newTid; - char shareName[256]; + char shareName[AFSPATHMAX]; char *sharePath; int shareFound; char *tp; @@ -1524,7 +1524,7 @@ long smb_ReceiveRAPNetShareEnum(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_ smb_rap_share_info_1_t * shares; USHORT cshare = 0; char * cstrp; - char thisShare[256]; + char thisShare[AFSPATHMAX]; int i,j; DWORD dw; int nonrootShares; -- 2.39.5