extern afs_int32 cryptall;
extern char cm_NetbiosName[];
+extern clientchar_t cm_NetbiosNameC[];
extern void afsi_log(char *pattern, ...);
void cm_InitIoctl(void)
{
- lock_InitializeMutex(&cm_Afsdsbmt_Lock, "AFSDSBMT.INI Access Lock");
+ lock_InitializeMutex(&cm_Afsdsbmt_Lock, "AFSDSBMT.INI Access Lock",
+ LOCK_HIERARCHY_AFSDBSBMT_GLOBAL);
}
/*
code = buf_FlushCleanPages(scp, userp, reqp);
+ if (scp->fileType == CM_SCACHETYPE_DIRECTORY)
+ lock_ObtainWrite(&scp->dirlock);
lock_ObtainWrite(&scp->rw);
cm_DiscardSCache(scp);
+ if (scp->fileType == CM_SCACHETYPE_DIRECTORY) {
+ cm_ResetSCacheDirectory(scp, 1);
+ lock_ReleaseWrite(&scp->dirlock);
+ }
lock_ReleaseWrite(&scp->rw);
osi_Log2(afsd_logp,"cm_FlushFile scp 0x%x returns error: [%x]",scp, code);
}
/*
- * Utility function. Used within this file.
- * Invalidate ACL info for a user that has just obtained or lost tokens.
- */
-void
-cm_ResetACLCache(cm_user_t *userp)
-{
- cm_scache_t *scp;
- int hash;
-
- lock_ObtainWrite(&cm_scacheLock);
- for (hash=0; hash < cm_data.scacheHashTableSize; hash++) {
- for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
- cm_HoldSCacheNoLock(scp);
- lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainWrite(&scp->rw);
- cm_InvalidateACLUser(scp, userp);
- lock_ReleaseWrite(&scp->rw);
- lock_ObtainWrite(&cm_scacheLock);
- cm_ReleaseSCacheNoLock(scp);
- }
- }
- lock_ReleaseWrite(&cm_scacheLock);
-}
-
-/*
* TranslateExtendedChars - This is a fix for TR 54482.
*
* If an extended character (80 - FF) is entered into a file
if (!str || !*str)
return;
- CharToOem(str, str);
+ CharToOemA(str, str);
}
-
-/*
- * Utility function.
- * If the IoctlPath is not parsed then it must be skipped.
- */
-void
-cm_SkipIoctlPath(cm_ioctl_t *ioctlp)
+void cm_SkipIoctlPath(cm_ioctl_t *ioctlp)
{
size_t temp;
-
+
temp = strlen(ioctlp->inDatap) + 1;
ioctlp->inDatap += temp;
-}
+}
+
+
+clientchar_t * cm_ParseIoctlStringAlloc(cm_ioctl_t *ioctlp, const char * ext_instrp)
+{
+ clientchar_t * rs = NULL;
+ const char * instrp;
+
+ instrp = (ext_instrp)?ext_instrp:ioctlp->inDatap;
+
+ if ((ioctlp->flags & CM_IOCTLFLAG_USEUTF8) == CM_IOCTLFLAG_USEUTF8) {
+ rs = cm_Utf8ToClientStringAlloc(instrp, -1, NULL);
+ } else {
+ int cch;
+
+ /* Not a UTF-8 string */
+ if (smb_StoreAnsiFilenames) {
+ cch = cm_AnsiToClientString(instrp, -1, NULL, 0);
+#ifdef DEBUG
+ osi_assert(cch > 0);
+#endif
+ rs = malloc(cch * sizeof(clientchar_t));
+ cm_AnsiToClientString(instrp, -1, rs, cch);
+ } else {
+ cch = cm_OemToClientString(instrp, -1, NULL, 0);
+#ifdef DEBUG
+ osi_assert(cch > 0);
+#endif
+ rs = malloc(cch * sizeof(clientchar_t));
+ cm_OemToClientString(instrp, -1, rs, cch);
+ }
+ }
+
+ if (ext_instrp == NULL) {
+ ioctlp->inDatap += strlen(ioctlp->inDatap) + 1;
+ }
+ return rs;
+}
+
+int cm_UnparseIoctlString(cm_ioctl_t *ioctlp,
+ char * ext_outp,
+ const clientchar_t * cstr, int cchlen)
+{
+ char *outp;
+ int cchout;
+
+ outp = ((ext_outp == NULL)? ioctlp->outDatap : ext_outp);
+
+ if ((ioctlp->flags & CM_IOCTLFLAG_USEUTF8) == CM_IOCTLFLAG_USEUTF8) {
+ cchout = cm_ClientStringToUtf8(cstr, cchlen, outp,
+ SMB_IOCTL_MAXDATA - (outp - ioctlp->outAllocp));
+ } else {
+ if (smb_StoreAnsiFilenames) {
+ cchout = WideCharToMultiByte(CP_ACP, 0, cstr, cchlen,
+ outp,
+ SMB_IOCTL_MAXDATA - (outp - ioctlp->outAllocp),
+ NULL, NULL);
+ } else {
+ cchout = WideCharToMultiByte(CP_OEMCP, 0, cstr, cchlen,
+ outp,
+ SMB_IOCTL_MAXDATA - (outp - ioctlp->outAllocp),
+ NULL, NULL);
+ }
+ }
+
+ if (cchout > 0 && ext_outp == NULL) {
+ ioctlp->outDatap += cchout;
+ }
+
+ return cchout;
+}
/*
* Must be called before XXX_ParseIoctlPath or cm_SkipIoctlPath
* the AFS path that should be written into afsdsbmt.ini).
*/
void
-cm_NormalizeAfsPath(char *outpathp, long outlen, char *inpathp)
+cm_NormalizeAfsPath(clientchar_t *outpathp, long cchlen, clientchar_t *inpathp)
+{
+ clientchar_t *cp;
+ clientchar_t bslash_mountRoot[256];
+
+ cm_ClientStrCpy(bslash_mountRoot, lengthof(bslash_mountRoot), cm_mountRootC);
+ bslash_mountRoot[0] = '\\';
+
+ if (!cm_ClientStrCmpNI(inpathp, cm_mountRootC, cm_mountRootCLen))
+ cm_ClientStrCpy(outpathp, cchlen, inpathp);
+ else if (!cm_ClientStrCmpNI(inpathp, bslash_mountRoot,
+ cm_ClientStrLen(bslash_mountRoot)))
+ cm_ClientStrCpy(outpathp, cchlen, inpathp);
+ else if ((inpathp[0] == '/') || (inpathp[0] == '\\'))
+ cm_ClientStrPrintfN(outpathp, cchlen, _C("%s%s"), cm_mountRootC, inpathp);
+ else // inpathp looks like "<cell>/usr"
+ cm_ClientStrPrintfN(outpathp, cchlen, _C("%s/%s"), cm_mountRootC, inpathp);
+
+ for (cp = outpathp; *cp != 0; ++cp) {
+ if (*cp == '\\')
+ *cp = '/';
+ }
+
+ if (cm_ClientStrLen(outpathp) && (outpathp[cm_ClientStrLen(outpathp)-1] == '/')) {
+ outpathp[cm_ClientStrLen(outpathp)-1] = 0;
+ }
+
+ if (!cm_ClientStrCmpI(outpathp, cm_mountRootC)) {
+ cm_ClientStrCpy(outpathp, cchlen, cm_mountRootC);
+ }
+}
+
+void cm_NormalizeAfsPathAscii(char *outpathp, long outlen, char *inpathp)
{
char *cp;
char bslash_mountRoot[256];
outpathp[strlen(outpathp)-1] = 0;
}
- if (!strcmpi (outpathp, cm_mountRoot)) {
+ if (!_stricmp (outpathp, cm_mountRoot)) {
StringCbCopy(outpathp, outlen, cm_mountRoot);
}
}
AFSVolSync volSync;
AFSFid afid;
int tlen;
- struct rx_connection * callp;
+ struct rx_connection * rxconnp;
/* now make the get acl call */
#ifdef AFS_FREELANCE_CLIENT
if (code)
continue;
- callp = cm_GetRxConn(connp);
- code = RXAFS_FetchACL(callp, &afid, &acl, &fileStatus, &volSync);
- rx_PutConnection(callp);
+ rxconnp = cm_GetRxConn(connp);
+ code = RXAFS_FetchACL(rxconnp, &afid, &acl, &fileStatus, &volSync);
+ rx_PutConnection(rxconnp);
} while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code));
code = cm_MapRPCError(code, reqp);
{
cellp = cm_FindCellByID(scp->fid.cell, CM_FLAG_NOPROBE);
if (cellp) {
- StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), cellp->name);
- ioctlp->outDatap += strlen(ioctlp->outDatap) + 1;
- code = 0;
- }
- else
+ clientchar_t * cellname;
+
+ cellname = cm_FsStringToClientStringAlloc(cellp->name, -1, NULL);
+ if (cellname == NULL) {
+ code = CM_ERROR_NOSUCHCELL;
+ } else {
+ cm_UnparseIoctlString(ioctlp, NULL, cellname, -1);
+ free(cellname);
+ code = 0;
+ }
+ } else
code = CM_ERROR_NOSUCHCELL;
}
AFSFetchStatus fileStatus;
AFSVolSync volSync;
AFSFid fid;
- struct rx_connection * callp;
+ struct rx_connection * rxconnp;
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
if (code)
continue;
- callp = cm_GetRxConn(connp);
- code = RXAFS_StoreACL(callp, &fid, &acl, &fileStatus, &volSync);
- rx_PutConnection(callp);
+ rxconnp = cm_GetRxConn(connp);
+ code = RXAFS_StoreACL(rxconnp, &fid, &acl, &fileStatus, &volSync);
+ rx_PutConnection(rxconnp);
} while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code));
code = cm_MapRPCError(code, reqp);
* Assumes that pioctl path has been parsed or skipped.
*/
afs_int32
-cm_IoctlFlushAllVolumes(struct cm_ioctl *ioctlp, struct cm_user *userp)
+cm_IoctlFlushAllVolumes(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_req_t *reqp)
{
afs_int32 code;
cm_scache_t *scp;
int i;
- cm_req_t req;
-
- cm_InitReq(&req);
lock_ObtainWrite(&cm_scacheLock);
for (i=0; i<cm_data.scacheHashTableSize; i++) {
lock_ReleaseWrite(&cm_scacheLock);
/* now flush the file */
- code = cm_FlushFile(scp, userp, &req);
+ code = cm_FlushFile(scp, userp, reqp);
lock_ObtainWrite(&cm_scacheLock);
cm_ReleaseSCacheNoLock(scp);
}
AFSFetchVolumeStatus volStat;
AFSStoreVolumeStatus storeStat;
cm_volume_t *tvp;
- char *cp;
cm_cell_t *cellp;
- struct rx_connection * callp;
- int len;
+ char *cp;
+ clientchar_t *strp;
+ struct rx_connection * rxconnp;
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
cm_PutVolume(tvp);
/* Copy the junk out, using cp as a roving pointer. */
- cp = ioctlp->inDatap;
- memcpy((char *)&volStat, cp, sizeof(AFSFetchVolumeStatus));
- cp += sizeof(AFSFetchVolumeStatus);
+ memcpy((char *)&volStat, ioctlp->inDatap, sizeof(AFSFetchVolumeStatus));
+ ioctlp->inDatap += sizeof(AFSFetchVolumeStatus);
+
+ strp = cm_ParseIoctlStringAlloc(ioctlp, NULL);
+ cm_ClientStringToFsString(strp, -1, volName, lengthof(volName));
+ free(strp);
- len = strlen(cp) + 1;
- cm_NormalizeUtf8String(cp, len, volName, sizeof(volName));
- cp += len;
+ strp = cm_ParseIoctlStringAlloc(ioctlp, NULL);
+ cm_ClientStringToFsString(strp, -1, offLineMsg, lengthof(offLineMsg));
+ free(strp);
- len = strlen(cp) + 1;
- cm_NormalizeUtf8String(cp, len, offLineMsg, sizeof(offLineMsg));
- cp += len;
+ strp = cm_ParseIoctlStringAlloc(ioctlp, NULL);
+ cm_ClientStringToFsString(strp, -1, motd, lengthof(motd));
+ free(strp);
+
+ strp = NULL;
- len = strlen(cp) + 1;
- cm_NormalizeUtf8String(cp, len, motd, sizeof(motd));
storeStat.Mask = 0;
if (volStat.MinQuota != -1) {
storeStat.MinQuota = volStat.MinQuota;
if (code)
continue;
- callp = cm_GetRxConn(tcp);
- code = RXAFS_SetVolumeStatus(callp, scp->fid.volume,
- &storeStat, volName, offLineMsg, motd);
- rx_PutConnection(callp);
+ rxconnp = cm_GetRxConn(tcp);
+ code = RXAFS_SetVolumeStatus(rxconnp, scp->fid.volume,
+ &storeStat, volName, offLineMsg, motd);
+ rx_PutConnection(rxconnp);
} while (cm_Analyze(tcp, userp, reqp, &scp->fid, NULL, NULL, NULL, code));
code = cm_MapRPCError(code, reqp);
char *Name;
char *OfflineMsg;
char *MOTD;
- struct rx_connection * callp;
+ struct rx_connection * rxconnp;
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp);
if (code) continue;
- callp = cm_GetRxConn(connp);
- code = RXAFS_GetVolumeStatus(callp, scp->fid.volume,
+ rxconnp = cm_GetRxConn(connp);
+ code = RXAFS_GetVolumeStatus(rxconnp, scp->fid.volume,
&volStat, &Name, &OfflineMsg, &MOTD);
- rx_PutConnection(callp);
+ rx_PutConnection(rxconnp);
} while (cm_Analyze(connp, userp, reqp, &scp->fid, NULL, NULL, NULL, code));
code = cm_MapRPCError(code, reqp);
/*
+ * VIOC_SETOWNER internals.
+ *
+ * Assumes that pioctl path has been parsed or skipped
+ * and that cm_ioctlQueryOptions_t have been parsed and skipped.
+ *
+ * scp is held but not locked.
+ *
+ */
+afs_int32
+cm_IoctlSetOwner(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *scp, cm_req_t *reqp)
+{
+ afs_int32 code = 0;
+ char *cp;
+
+ lock_ObtainWrite(&scp->rw);
+ code = cm_SyncOp(scp, NULL, userp, reqp, 0,
+ CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
+ if (code == 0)
+ cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
+ lock_ReleaseWrite(&scp->rw);
+
+ if (code == 0) {
+ afs_uint32 owner;
+ cm_attr_t attr;
+
+ memset(&attr, 0, sizeof(attr));
+
+ cp = ioctlp->inDatap;
+ memcpy((char *)&owner, cp, sizeof(afs_uint32));
+
+ attr.mask = CM_ATTRMASK_OWNER;
+ attr.owner = owner;
+
+ code = cm_SetAttr(scp, &attr, userp, reqp);
+ }
+ return code;
+}
+
+
+/*
+ * VIOC_SETGROUP internals.
+ *
+ * Assumes that pioctl path has been parsed or skipped
+ * and that cm_ioctlQueryOptions_t have been parsed and skipped.
+ *
+ */
+afs_int32
+cm_IoctlSetGroup(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *scp, cm_req_t *reqp)
+{
+ afs_int32 code = 0;
+ char *cp;
+
+ lock_ObtainWrite(&scp->rw);
+ code = cm_SyncOp(scp, NULL, userp, reqp, 0,
+ CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
+ if (code == 0)
+ cm_SyncOpDone(scp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
+ lock_ReleaseWrite(&scp->rw);
+
+ if (code == 0) {
+ afs_uint32 group;
+ cm_attr_t attr;
+
+ memset(&attr, 0, sizeof(attr));
+
+ cp = ioctlp->inDatap;
+ memcpy((char *)&group, cp, sizeof(afs_uint32));
+
+ attr.mask = CM_ATTRMASK_GROUP;
+ attr.group = group;
+
+ code = cm_SetAttr(scp, &attr, userp, reqp);
+ }
+ return code;
+}
+
+
+/*
* VIOCWHEREIS internals.
*
* Assumes that pioctl path has been parsed or skipped.
afs_int32
cm_IoctlWhereIs(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *scp, cm_req_t *reqp)
{
- afs_int32 code;
+ afs_int32 code = 0;
cm_cell_t *cellp;
cm_volume_t *tvp;
cm_serverRef_t **tsrpp, *current;
cp = ioctlp->outDatap;
- tsrpp = cm_GetVolServers(tvp, volume);
- lock_ObtainRead(&cm_serverLock);
- for (current = *tsrpp; current; current = current->next) {
- tsp = current->server;
- memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
- cp += sizeof(long);
+ tsrpp = cm_GetVolServers(tvp, volume, userp, reqp);
+ if (tsrpp == NULL) {
+ code = CM_ERROR_NOSUCHVOLUME;
+ } else {
+ lock_ObtainRead(&cm_serverLock);
+ for (current = *tsrpp; current; current = current->next) {
+ tsp = current->server;
+ memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
+ cp += sizeof(long);
+ }
+ lock_ReleaseRead(&cm_serverLock);
+ cm_FreeServerList(tsrpp, 0);
}
- lock_ReleaseRead(&cm_serverLock);
- cm_FreeServerList(tsrpp, 0);
-
/* still room for terminating NULL, add it on */
volume = 0; /* reuse vbl */
memcpy(cp, (char *)&volume, sizeof(long));
ioctlp->outDatap = cp;
cm_PutVolume(tvp);
}
- return 0;
+ return code;
}
/*
{
afs_int32 code;
cm_scache_t *scp;
- char *cp;
+ clientchar_t *cp;
- cp = ioctlp->inDatap;
+ cp = cm_ParseIoctlStringAlloc(ioctlp, NULL);
- code = cm_Lookup(dscp, cp, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+ code = cm_Lookup(dscp, cp[0] ? cp : L".", CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
if (code)
- return code;
+ goto done_2;
lock_ObtainWrite(&scp->rw);
code = cm_SyncOp(scp, NULL, userp, reqp, 0,
code = cm_ReadMountPoint(scp, userp, reqp);
if (code == 0) {
- cp = ioctlp->outDatap;
- StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), scp->mountPointStringp);
- cp += strlen(cp) + 1;
- ioctlp->outDatap = cp;
+ char * strp;
+ strp = ioctlp->outDatap;
+ StringCbCopyA(strp, SMB_IOCTL_MAXDATA - (strp - ioctlp->outAllocp), scp->mountPointStringp);
+ strp += strlen(strp) + 1;
+ ioctlp->outDatap = strp;
}
done:
lock_ReleaseWrite(&scp->rw);
cm_ReleaseSCache(scp);
+ done_2:
+ if (cp)
+ free(cp);
+
return code;
}
{
afs_int32 code;
cm_scache_t *scp;
- char *cp;
- char *originalName = NULL;
+ clientchar_t *cp = NULL;
+ fschar_t *originalName = NULL;
cm_dirOp_t dirop;
- cp = ioctlp->inDatap;
+ cp = cm_ParseIoctlStringAlloc(ioctlp, NULL);
- code = cm_Lookup(dscp, cp, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+ code = cm_Lookup(dscp, cp[0] ? cp : L".", CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
/* if something went wrong, bail out now */
if (code)
lock_ObtainWrite(&scp->rw);
code = cm_SyncOp(scp, NULL, userp, reqp, 0,
- CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
+ CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS);
if (code)
goto done2;
the file server. */
if (originalName == NULL) {
- originalName = cp;
+ originalName = cm_ClientStringToFsStringAlloc(cp, -1, NULL);
}
/* cp is a normalized name. originalName is the actual name we
saw on the fileserver. */
#ifdef AFS_FREELANCE_CLIENT
if (cm_freelanceEnabled && dscp == cm_data.rootSCachep) {
- /* we are adding the mount point to the root dir., so call
- * the freelance code to do the add. */
+ /* we are removing the mount point to the root dir., so call
+ * the freelance code to do the deletion. */
osi_Log0(afsd_logp,"IoctlDeleteMountPoint from Freelance root dir");
code = cm_FreelanceRemoveMount(originalName);
} else
}
if (code == 0 && (dscp->flags & CM_SCACHEFLAG_ANYWATCH))
smb_NotifyChange(FILE_ACTION_REMOVED,
- FILE_NOTIFY_CHANGE_DIR_NAME,
- dscp, cp, NULL, TRUE);
-
- if (originalName != NULL && originalName != cp) {
- free(originalName);
- originalName = NULL;
- }
+ FILE_NOTIFY_CHANGE_DIR_NAME,
+ dscp, cp, NULL, TRUE);
lock_ObtainWrite(&scp->rw);
done1:
cm_ReleaseSCache(scp);
done3:
+ if (originalName != NULL)
+ free(originalName);
+
+ if (cp != NULL)
+ free(cp);
+
return code;
}
ioctlp->inDatap = cp = ioctlp->inDatap + sizeof(long);
if (cp - ioctlp->inAllocp < ioctlp->inCopied) /* still more data available */
haveCell = 1;
- }
+ }
/*
* 1: fast check, don't contact servers.
if (!cellp)
return CM_ERROR_NOSUCHCELL;
}
- else cellp = (cm_cell_t *) 0;
+ else
+ cellp = (cm_cell_t *) 0;
if (!cellp && (temp & 2)) {
/* use local cell */
- char wscell[CELL_MAXNAMELEN+1];
+ fschar_t wscell[CELL_MAXNAMELEN+1];
cm_GetRootCellName(wscell);
cellp = cm_GetCell(wscell, 0);
}
if (!(temp & 1)) { /* if not fast, call server checker routine */
/* check down servers */
- cm_CheckServers(CM_FLAG_CHECKDOWNSERVERS | CM_FLAG_CHECKUPSERVERS,
- cellp);
- }
+ cm_CheckServers(CM_FLAG_CHECKDOWNSERVERS | CM_FLAG_CHECKUPSERVERS, cellp);
+ }
/* now return the current down server list */
cp = ioctlp->outDatap;
if (cellp && tsp->cellp != cellp)
continue; /* cell spec'd and wrong */
if ((tsp->flags & CM_SERVERFLAG_DOWN)
- && tsp->type == CM_SERVER_FILE) {
+ && tsp->type == CM_SERVER_FILE) {
memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
cp += sizeof(long);
}
lock_ReleaseRead(&cm_cellLock);
if (tcellp) {
int max = 8;
+ clientchar_t * cellnamep;
cp = ioctlp->outDatap;
cp += sizeof(long);
}
lock_ReleaseRead(&cm_serverLock);
- cp = basep + max * sizeof(afs_int32);
- StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), tcellp->name);
- cp += strlen(tcellp->name)+1;
- ioctlp->outDatap = cp;
+ ioctlp->outDatap = basep + max * sizeof(afs_int32);
+
+ cellnamep = cm_FsStringToClientStringAlloc(tcellp->name, -1, NULL);
+ if (cellnamep) {
+ cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1);
+ free(cellnamep);
+ } else {
+ tcellp = NULL;
+ }
}
if (tcellp)
for (cp = cm_data.allCellsp; cp; cp=cp->allNextp)
{
afs_int32 code;
- lock_ObtainMutex(&cp->mx);
+
/* delete all previous server lists - cm_FreeServerList will ask for write on cm_ServerLock*/
cm_FreeServerList(&cp->vlServersp, CM_FREESERVERLIST_DELETE);
cp->vlServersp = NULL;
+ lock_ReleaseWrite(&cm_cellLock);
+
rock.cellp = cp;
rock.flags = 0;
- code = cm_SearchCellFile(cp->name, cp->name, cm_AddCellProc, &rock);
+ code = cm_SearchCellRegistry(1, cp->name, cp->name, cp->linkedName, cm_AddCellProc, &rock);
+ if (code && code != CM_ERROR_FORCE_DNS_LOOKUP)
+ code = cm_SearchCellFileEx(cp->name, cp->name, cp->linkedName, cm_AddCellProc, &rock);
#ifdef AFS_AFSDB_ENV
if (code) {
if (cm_dnsEnabled) {
int ttl;
code = cm_SearchCellByDNS(cp->name, cp->name, &ttl, cm_AddCellProc, &rock);
if ( code == 0 ) { /* got cell from DNS */
+ lock_ObtainMutex(&cp->mx);
cp->flags |= CM_CELLFLAG_DNS;
cp->flags &= ~CM_CELLFLAG_VLSERVER_INVALID;
cp->timeout = time(0) + ttl;
+ lock_ReleaseMutex(&cp->mx);
}
}
}
else {
+ lock_ObtainMutex(&cp->mx);
cp->flags &= ~CM_CELLFLAG_DNS;
+ lock_ReleaseMutex(&cp->mx);
}
#endif /* AFS_AFSDB_ENV */
if (code) {
+ lock_ObtainMutex(&cp->mx);
cp->flags |= CM_CELLFLAG_VLSERVER_INVALID;
+ lock_ReleaseMutex(&cp->mx);
+ lock_ObtainWrite(&cm_cellLock);
}
else {
+ lock_ObtainMutex(&cp->mx);
cp->flags &= ~CM_CELLFLAG_VLSERVER_INVALID;
+ lock_ReleaseMutex(&cp->mx);
+ lock_ObtainWrite(&cm_cellLock);
cm_RandomizeServer(&cp->vlServersp);
}
- lock_ReleaseMutex(&cp->mx);
}
-
lock_ReleaseWrite(&cm_cellLock);
return 0;
}
StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), "Freelance.Local.Root");
ioctlp->outDatap += strlen(ioctlp->outDatap) +1;
} else if (cm_data.rootCellp) {
+ clientchar_t * cellnamep = cm_FsStringToClientStringAlloc(cm_data.rootCellp->name, -1, NULL);
/* return the default cellname to the caller */
- StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), cm_data.rootCellp->name);
- ioctlp->outDatap += strlen(ioctlp->outDatap) +1;
+ if (cellnamep) {
+ cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1);
+ free(cellnamep);
+ } else {
+ code = CM_ERROR_NOSUCHCELL;
+ }
} else {
/* if we don't know our default cell, return failure */
code = CM_ERROR_NOSUCHCELL;
afs_int32
cm_IoctlSysName(struct cm_ioctl *ioctlp, struct cm_user *userp)
{
- afs_uint32 setSysName, foundname = 0;
- char *cp, *cp2, inname[MAXSYSNAME], outname[MAXSYSNAME];
- int t, count, num = 0;
- char **sysnamelist[MAXSYSNAME];
-
+ afs_uint32 setSysName;
+ char *cp, *cp2;
+ clientchar_t *inname = NULL;
+ int t, count;
+
memcpy(&setSysName, ioctlp->inDatap, sizeof(afs_uint32));
ioctlp->inDatap += sizeof(afs_uint32);
-
+
if (setSysName) {
/* check my args */
if ( setSysName < 0 || setSysName > MAXNUMSYSNAMES )
return EINVAL;
cp2 = ioctlp->inDatap;
for ( cp=ioctlp->inDatap, count = 0; count < setSysName; count++ ) {
- /* won't go past end of ioctlp->inDatap since maxsysname*num < ioctlp->inDatap length */
+ /* won't go past end of ioctlp->inDatap since
+ maxsysname*num < ioctlp->inDatap length */
t = (int)strlen(cp);
if (t >= MAXSYSNAME || t <= 0)
return EINVAL;
/* inname gets first entry in case we're being a translator */
/* (we are never a translator) */
- t = (int)strlen(ioctlp->inDatap);
- memcpy(inname, ioctlp->inDatap, t + 1);
- ioctlp->inDatap += t + 1;
- num = count;
+ inname = cm_ParseIoctlStringAlloc(ioctlp, NULL);
}
/* Not xlating, so local case */
if (!cm_sysName)
osi_panic("cm_IoctlSysName: !cm_sysName\n", __FILE__, __LINE__);
- if (!setSysName) { /* user just wants the info */
- StringCbCopyA(outname, sizeof(outname), cm_sysName);
- foundname = cm_sysNameCount;
- *sysnamelist = cm_sysNameList;
- } else {
+ if (setSysName) {
/* Local guy; only root can change sysname */
/* clear @sys entries from the dnlc, once afs_lookup can
* do lookups of @sys entries and thinks it can trust them */
/* privs ok, store the entry, ... */
- StringCbCopyA(cm_sysName, sizeof(cm_sysName), inname);
- StringCbCopyA(cm_sysNameList[0], MAXSYSNAME, inname);
+
+ cm_ClientStrCpy(cm_sysName, lengthof(cm_sysName), inname);
+ cm_ClientStrCpy(cm_sysNameList[0], MAXSYSNAME, inname);
+
if (setSysName > 1) { /* ... or list */
- cp = ioctlp->inDatap;
for (count = 1; count < setSysName; ++count) {
+ clientchar_t * newsysname;
+
if (!cm_sysNameList[count])
osi_panic("cm_IoctlSysName: no cm_sysNameList entry to write\n",
- __FILE__, __LINE__);
- t = (int)strlen(cp);
- StringCbCopyA(cm_sysNameList[count], MAXSYSNAME, cp);
- cp += t + 1;
+ __FILE__, __LINE__);
+
+ newsysname = cm_ParseIoctlStringAlloc(ioctlp, NULL);
+ cm_ClientStrCpy(cm_sysNameList[count], MAXSYSNAME, newsysname);
+ free(newsysname);
}
}
cm_sysNameCount = setSysName;
- }
+ } else {
+ afs_int32 i32;
- if (!setSysName) {
/* return the sysname to the caller */
- cp = ioctlp->outDatap;
- memcpy(cp, (char *)&foundname, sizeof(afs_int32));
- cp += sizeof(afs_int32); /* skip found flag */
- if (foundname) {
- StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), outname);
- cp += strlen(outname) + 1; /* skip name and terminating null char */
- for ( count=1; count < foundname ; ++count) { /* ... or list */
- if ( !(*sysnamelist)[count] )
+ i32 = cm_sysNameCount;
+ memcpy(ioctlp->outDatap, &i32, sizeof(afs_int32));
+ ioctlp->outDatap += sizeof(afs_int32); /* skip found flag */
+
+ if (cm_sysNameCount) {
+ for ( count=0; count < cm_sysNameCount ; ++count) { /* ... or list */
+ if ( !cm_sysNameList[count] || *cm_sysNameList[count] == _C('\0'))
osi_panic("cm_IoctlSysName: no cm_sysNameList entry to read\n",
- __FILE__, __LINE__);
- t = (int)strlen((*sysnamelist)[count]);
- if (t >= MAXSYSNAME)
- osi_panic("cm_IoctlSysName: sysname entry garbled\n",
- __FILE__, __LINE__);
- StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), (*sysnamelist)[count]);
- cp += t + 1;
+ __FILE__, __LINE__);
+ cm_UnparseIoctlString(ioctlp, NULL, cm_sysNameList[count], -1);
}
}
- ioctlp->outDatap = cp;
}
-
+
+ if (inname) {
+ free(inname);
+ inname = NULL;
+ }
+
/* done: success */
return 0;
}
{
afs_uint32 temp;
cm_cell_t *cellp;
+ clientchar_t * cellnamep;
+ fschar_t * fscellnamep;
+
+ cellnamep = cm_ParseIoctlStringAlloc(ioctlp, NULL);
+ fscellnamep = cm_ClientStringToFsStringAlloc(cellnamep, -1, NULL);
+ cellp = cm_GetCell(fscellnamep, 0);
+ free(fscellnamep);
+ free(cellnamep);
- cellp = cm_GetCell(ioctlp->inDatap, 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
if (cellp->flags & CM_CELLFLAG_SUID)
temp |= CM_SETCELLFLAG_SUID;
lock_ReleaseMutex(&cellp->mx);
-
+
/* now copy out parm */
memcpy(ioctlp->outDatap, &temp, sizeof(afs_uint32));
ioctlp->outDatap += sizeof(afs_uint32);
afs_int32
cm_IoctlSetCellStatus(struct cm_ioctl *ioctlp, struct cm_user *userp)
{
- afs_uint32 temp;
+ afs_uint32 flags;
cm_cell_t *cellp;
+ clientchar_t *temp;
+ fschar_t * cellnamep;
+
+ temp = cm_ParseIoctlStringAlloc(ioctlp, ioctlp->inDatap + 2*sizeof(afs_uint32));
+ cellnamep = cm_ClientStringToFsStringAlloc(temp, -1, NULL);
+ cellp = cm_GetCell(cellnamep, 0);
+ free(temp);
+ free(cellnamep);
- cellp = cm_GetCell(ioctlp->inDatap + 2*sizeof(afs_uint32), 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
- memcpy((char *)&temp, ioctlp->inDatap, sizeof(afs_uint32));
+ memcpy((char *)&flags, ioctlp->inDatap, sizeof(afs_uint32));
lock_ObtainMutex(&cellp->mx);
- if (temp & CM_SETCELLFLAG_SUID)
+ if (flags & CM_SETCELLFLAG_SUID)
cellp->flags |= CM_CELLFLAG_SUID;
else
cellp->flags &= ~CM_CELLFLAG_SUID;
srvin = &(spin->servers[i]);
rank = srvin->rank + (rand() & 0x000f);
tmp.sin_addr = srvin->host;
+ switch (type) {
+ case CM_SERVER_VLDB:
+ tmp.sin_port = htons(7003);
+ break;
+ case CM_SERVER_FILE:
+ tmp.sin_port = htons(7000);
+ break;
+ }
tmp.sin_family = AF_INET;
tsp = cm_FindServer(&tmp, type);
if ( tsp ) /* an existing server - ref count increased */
{
- tsp->ipRank = rank; /* no need to protect by mutex*/
-
- if (type == CM_SERVER_FILE)
- { /* fileserver */
- /* find volumes which might have RO copy
- /* on server and change the ordering of
+ lock_ObtainMutex(&tsp->mx);
+ tsp->ipRank = rank;
+ tsp->flags |= CM_SERVERFLAG_PREF_SET;
+ lock_ReleaseMutex(&tsp->mx);
+
+ switch (type) {
+ case CM_SERVER_FILE:
+ /*
+ * find volumes which might have RO copy
+ * on server and change the ordering of
* their RO list
*/
cm_ChangeRankVolume(tsp);
- }
- else
- {
+ break;
+ case CM_SERVER_VLDB:
/* set preferences for an existing vlserver */
cm_ChangeRankCellVLServer(tsp);
+ break;
}
}
else /* add a new server without a cell */
{
- tsp = cm_NewServer(&tmp, type, NULL, CM_FLAG_NOPROBE); /* refcount = 1 */
+ tsp = cm_NewServer(&tmp, type, NULL, NULL, CM_FLAG_NOPROBE); /* refcount = 1 */
+ lock_ObtainMutex(&tsp->mx);
+ tsp->ipRank = rank;
+ tsp->flags |= CM_SERVERFLAG_PREF_SET;
+ lock_ReleaseMutex(&tsp->mx);
tsp->ipRank = rank;
}
- lock_ObtainMutex(&tsp->mx);
- tsp->flags |= CM_SERVERFLAG_PREF_SET;
- lock_ReleaseMutex(&tsp->mx);
cm_PutServer(tsp); /* decrease refcount */
}
return 0;
continue; /* catch up to where we left off */
}
- if ( vlonly && (tsp->type == CM_SERVER_FILE) )
+ if ( vlonly && (tsp->type != CM_SERVER_VLDB) )
continue; /* ignore fileserver for -vlserver option*/
- if ( !vlonly && (tsp->type == CM_SERVER_VLDB) )
+ if ( !vlonly && (tsp->type != CM_SERVER_FILE) )
continue; /* ignore vlservers */
srvout->host = tsp->addr.sin_addr;
* dscp is held but not locked.
*/
afs_int32
-cm_IoctlCreateMountPoint(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *dscp, cm_req_t *reqp, char *leaf)
+cm_IoctlCreateMountPoint(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *dscp, cm_req_t *reqp, clientchar_t *leaf)
{
afs_int32 code;
cm_attr_t tattr;
- char *cp;
- char mpInfo[256];
- char fullCell[256];
- char volume[256];
- char cell[256];
- int ttl;
-
- /* Translate chars for the mount point name */
- if (!(ioctlp->flags & CM_IOCTLFLAG_USEUTF8)) {
- TranslateExtendedChars(leaf);
- }
+ clientchar_t *cp;
+ fschar_t mpInfo[512]; /* mount point string */
+ fschar_t fullCell[CELL_MAXNAMELEN];
+ fschar_t *fscell = NULL;
+ fschar_t *fsvolume = NULL;
+ clientchar_t volume[VL_MAXNAMELEN];
+ clientchar_t *mpp = NULL;
+ clientchar_t *cell = NULL;
+ cm_volume_t *volp = NULL;
+ cm_cell_t *cellp = NULL;
+ size_t len;
/*
* The fs command allows the user to specify partial cell names on NT. These must
*/
/* Extract the possibly partial cell name */
- StringCbCopyA(cell, sizeof(cell), ioctlp->inDatap + 1); /* Skip the mp type character */
-
- if (cp = strchr(cell, ':')) {
+ mpp = cm_ParseIoctlStringAlloc(ioctlp, NULL);
+ cell = cm_ClientCharNext(mpp);
+ if (cp = cm_ClientStrChr(cell, ':')) {
+
/* Extract the volume name */
*cp = 0;
- StringCbCopyA(volume, sizeof(volume), cp + 1);
-
+ cm_ClientStrCpy(volume, lengthof(volume), cm_ClientCharNext(cp));
+
+ fscell = cm_ClientStringToFsStringAlloc(cell, -1, NULL);
+ fsvolume = cm_ClientStringToFsStringAlloc(volume, -1, NULL);
+
/* Get the full name for this cell */
- code = cm_SearchCellFile(cell, fullCell, 0, 0);
-#ifdef AFS_AFSDB_ENV
- if (code && cm_dnsEnabled)
- code = cm_SearchCellByDNS(cell, fullCell, &ttl, 0, 0);
-#endif
- if (code) {
- return CM_ERROR_NOSUCHCELL;
+ cellp = cm_GetCell_Gen(fscell, fullCell, CM_FLAG_NOPROBE);
+ if (!cellp) {
+ code = CM_ERROR_NOSUCHCELL;
+ goto done;
}
-
- StringCbPrintfA(mpInfo, sizeof(mpInfo), "%c%s:%s", *ioctlp->inDatap, fullCell, volume);
+
+ StringCbPrintfA(mpInfo, sizeof(mpInfo), "%c%s:%s", (char) *mpp,
+ fullCell, fsvolume);
+
} else {
- /* No cell name specified */
- StringCbCopyA(mpInfo, sizeof(mpInfo), ioctlp->inDatap);
+ /* No cell name specified, so cell points at the volume instead. */
+ fsvolume = cm_ClientStringToFsStringAlloc(cell, -1, NULL);
+ cm_ClientStringToFsString(mpp, -1, mpInfo, lengthof(mpInfo));
+ cellp = cm_FindCellByID(dscp->fid.cell, CM_FLAG_NOPROBE);
}
+ /* remove the trailing dot if it is present */
+ len = strlen(fsvolume);
+ if (len > 1 && fsvolume[len-1] == '.')
+ fsvolume[len-1] = '\0';
+
+ /* validate the target info */
+ if (cm_VolNameIsID(fsvolume)) {
+ code = cm_FindVolumeByID(cellp, atoi(fsvolume), userp, reqp,
+ CM_GETVOL_FLAG_CREATE, &volp);
+ } else {
+ code = cm_FindVolumeByName(cellp, fsvolume, userp, reqp,
+ CM_GETVOL_FLAG_CREATE, &volp);
+ }
+ if (code)
+ goto done;
+
#ifdef AFS_FREELANCE_CLIENT
if (cm_freelanceEnabled && dscp == cm_data.rootSCachep) {
- /* we are adding the mount point to the root dir., so call
+ /* we are adding the mount point to the root dir, so call
* the freelance code to do the add. */
+ fschar_t * fsleaf = cm_ClientStringToFsStringAlloc(leaf, -1, NULL);
osi_Log0(afsd_logp,"IoctlCreateMountPoint within Freelance root dir");
- code = cm_FreelanceAddMount(leaf, fullCell, volume,
- *ioctlp->inDatap == '%', NULL);
- } else
+ code = cm_FreelanceAddMount(fsleaf, fullCell, fsvolume, *mpInfo == '%', NULL);
+ free(fsleaf);
+ } else
#endif
{
/* create the symlink with mode 644. The lack of X bits tells
FILE_NOTIFY_CHANGE_DIR_NAME,
dscp, leaf, NULL, TRUE);
+ done:
+ if (volp)
+ cm_PutVolume(volp);
+ if (mpp)
+ free(mpp);
+ if (fscell)
+ free(fscell);
+ if (fsvolume)
+ free(fsvolume);
+
return code;
}
* dscp is held but not locked.
*/
afs_int32
-cm_IoctlSymlink(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *dscp, cm_req_t *reqp, char *leaf)
+cm_IoctlSymlink(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_scache_t *dscp, cm_req_t *reqp, clientchar_t *leaf)
{
afs_int32 code;
cm_attr_t tattr;
int free_syml = FALSE;
if (!(ioctlp->flags & CM_IOCTLFLAG_USEUTF8)) {
- /* Translate chars for the link name */
- TranslateExtendedChars(leaf);
-
/* Translate chars for the linked to name */
TranslateExtendedChars(ioctlp->inDatap);
}
- symlp = ioctlp->inDatap; /* contents of link */
-
- {
- char * normalized;
- int normalized_len;
-
- int len = strlen(symlp) + 1;
-
- normalized_len = cm_NormalizeUtf8String(symlp, len, NULL, 0);
- if (normalized_len > len) {
- normalized = malloc(normalized_len);
- free_syml = TRUE;
- } else {
- normalized = symlp;
- }
-
- cm_NormalizeUtf8String(symlp, len, normalized, normalized_len);
-
- if (symlp != normalized)
- symlp = normalized;
- }
-
- cp = symlp;
+ cp = symlp = ioctlp->inDatap; /* contents of link */
#ifdef AFS_FREELANCE_CLIENT
if (cm_freelanceEnabled && dscp == cm_data.rootSCachep) {
/* we are adding the symlink to the root dir., so call
* the freelance code to do the add. */
+ fschar_t *fsleaf;
+
if (cp[0] == cp[1] && cp[1] == '\\' &&
!_strnicmp(cm_NetbiosName,cp+2,strlen(cm_NetbiosName)))
{
p += 4;
cp = p;
}
+
osi_Log0(afsd_logp,"IoctlCreateSymlink within Freelance root dir");
- code = cm_FreelanceAddSymlink(leaf, cp, NULL);
+ fsleaf = cm_ClientStringToFsStringAlloc(leaf, -1, NULL);
+ code = cm_FreelanceAddSymlink(fsleaf, cp, NULL);
+ free(fsleaf);
} else
#endif
{
FILE_NOTIFY_CHANGE_FILE_NAME
| FILE_NOTIFY_CHANGE_DIR_NAME,
dscp, leaf, NULL, TRUE);
-
- if (free_syml)
- free(symlp);
-
return code;
}
char *cp;
cm_space_t *spacep;
cm_scache_t *newRootScp;
+ clientchar_t *clientp;
if (!(ioctlp->flags & CM_IOCTLFLAG_USEUTF8)) {
/* Translate chars for the link name */
}
cp = ioctlp->inDatap;
- code = cm_Lookup(dscp, cp, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+ clientp = cm_Utf8ToClientStringAlloc(cp, -1, NULL);
+ code = cm_Lookup(dscp, clientp[0] ? clientp : L".", CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+ free(clientp);
if (code)
return code;
code = cm_AssembleLink(scp, "", &newRootScp, &spacep, userp, reqp);
cm_ReleaseSCache(scp);
if (code == 0) {
+ char * linkstr;
cp = ioctlp->outDatap;
if (newRootScp != NULL) {
StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), cm_mountRoot);
StringCbCatA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), "/");
cp += strlen(cp);
}
- StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), spacep->data);
+
+ linkstr = cm_ClientStringToFsStringAlloc(spacep->wdata, -1, NULL);
+ StringCbCopyA(cp, SMB_IOCTL_MAXDATA - (cp - ioctlp->outAllocp), linkstr);
cp += strlen(cp) + 1;
ioctlp->outDatap = cp;
cm_FreeSpace(spacep);
+ free(linkstr);
if (newRootScp != NULL)
cm_ReleaseSCache(newRootScp);
code = 0;
afs_int32 code;
cm_scache_t *scp;
char *cp;
+ clientchar_t *clientp;
if (!(ioctlp->flags & CM_IOCTLFLAG_USEUTF8)) {
/* Translate chars for the link name */
cp = ioctlp->inDatap;
osi_LogEvent("cm_IoctlListlink",NULL," name[%s]",cp);
- code = cm_Lookup(dscp, cp, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+ clientp = cm_Utf8ToClientStringAlloc(cp, -1, NULL);
+ code = cm_Lookup(dscp, clientp[0] ? clientp : L".", CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+ free(clientp);
if (code)
return code;
char *cp;
char * originalName = NULL;
cm_dirOp_t dirop;
+ clientchar_t *clientp;
if (!(ioctlp->flags & CM_IOCTLFLAG_USEUTF8)) {
/* Translate chars for the link name */
}
cp = ioctlp->inDatap;
- code = cm_Lookup(dscp, cp, CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
-
+ clientp = cm_Utf8ToClientStringAlloc(cp, -1, NULL);
+ code = cm_Lookup(dscp, clientp[0] ? clientp : L".", CM_FLAG_NOMOUNTCHASE, userp, reqp, &scp);
+
/* if something went wrong, bail out now */
if (code)
goto done3;
#ifdef USE_BPLUS
code = cm_BeginDirOp(dscp, userp, reqp, CM_DIRLOCK_READ, &dirop);
if (code == 0) {
- code = cm_BPlusDirLookupOriginalName(&dirop, cp, &originalName);
+ code = cm_BPlusDirLookupOriginalName(&dirop, clientp, &originalName);
/* cm_Dir*() functions can't be used to lookup the original
name since those functions only know of the original
name. */
#endif
{
/* easier to do it this way */
- code = cm_Unlink(dscp, originalName, cp, userp, reqp);
+ code = cm_Unlink(dscp, originalName, clientp, userp, reqp);
}
if (code == 0 && (dscp->flags & CM_SCACHEFLAG_ANYWATCH))
smb_NotifyChange(FILE_ACTION_REMOVED,
FILE_NOTIFY_CHANGE_FILE_NAME
| FILE_NOTIFY_CHANGE_DIR_NAME,
- dscp, cp, NULL, TRUE);
+ dscp, clientp, NULL, TRUE);
if (originalName != NULL && originalName != cp) {
free(originalName);
cm_ReleaseSCache(scp);
done3:
+ free(clientp);
+
return code;
}
int i;
char * p, * r;
+ memset(&info, 0, sizeof(info));
tdir = afsconf_Open(AFSDIR_CLIENT_ETC_DIRPATH);
code = afsconf_GetCellInfo(tdir, ucellp->cellp->name, "afsprot", &info);
afsconf_Close(tdir);
code = ubik_ClientInit(serverconns, &pruclient);
if (code) {
+ if (info.linkedCell)
+ free(info.linkedCell);
return code;
}
pruclient = NULL;
}
+ if (info.linkedCell)
+ free(info.linkedCell);
return 0;
}
#endif /* QUERY_AFSID */
ioctlp->flags |= CM_IOCTLFLAG_LOGON;
}
- cm_ResetACLCache(userp);
+ cm_ResetACLCache(cellp, userp);
if (release_userp)
cm_ReleaseUser(userp);
lock_ReleaseMutex(&userp->mx);
- cm_ResetACLCache(userp);
+ cm_ResetACLCache(cellp, userp);
return 0;
}
lock_ReleaseMutex(&userp->mx);
- cm_ResetACLCache(userp);
+ cm_ResetACLCache(NULL, userp);
return 0;
}
/* Parse the input parameters--first the required afs path,
* then the requested submount name (which may be "").
*/
- cm_NormalizeAfsPath (afspath, sizeof(afspath), ioctlp->inDatap);
+ cm_NormalizeAfsPathAscii(afspath, sizeof(afspath), ioctlp->inDatap);
submountreqp = ioctlp->inDatap + (strlen(ioctlp->inDatap)+1);
/* If the caller supplied a suggested submount name, see if
NULL );
if (submountreqp && *submountreqp) {
- char submountPathNormalized[MAX_PATH];
char submountPath[MAX_PATH];
dwSize = sizeof(submountPath);
* supplied path matches the submount's path, we can still
* use the suggested submount name.
*/
- cm_NormalizeAfsPath (submountPathNormalized, sizeof(submountPathNormalized), submountPath);
- if (!strcmp (submountPathNormalized, afspath)) {
+ if (!strcmp (submountPath, afspath)) {
StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), submountreqp);
ioctlp->outDatap += strlen(ioctlp->outDatap) +1;
RegCloseKey( hkSubmounts );
nextAutoSubmount = 1;
for ( dwIndex = 0; dwIndex < dwSubmounts; dwIndex ++ ) {
- char submountPathNormalized[MAX_PATH];
char submountPath[MAX_PATH] = "";
DWORD submountPathLen = sizeof(submountPath);
char submountName[MAX_PATH];
* that our caller specified. If so, we can return
* this submount.
*/
- cm_NormalizeAfsPath (submountPathNormalized, sizeof(submountPathNormalized), submountPath);
- if (!strcmp (submountPathNormalized, afspath)) {
+ if (!strcmp (submountPath, afspath)) {
StringCbCopyA(ioctlp->outDatap, SMB_IOCTL_MAXDATA - (ioctlp->outDatap - ioctlp->outAllocp), submountName);
ioctlp->outDatap += strlen(ioctlp->outDatap) +1;
RegCloseKey(hkSubmounts);
memcpy(&cryptall, ioctlp->inDatap, sizeof(cryptall));
if (c != cryptall) {
- if (cryptall)
+ if (cryptall == 1)
LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_CRYPT_ON);
+ else if (cryptall == 2)
+ LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_CRYPT_AUTH);
else
LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_CRYPT_OFF);
}
*/
extern int cm_DumpSCache(FILE *outputFile, char *cookie, int lock);
extern int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock);
-extern int smb_DumpVCP(FILE *outputFile, char *cookie, int lock);
/*
* VIOC_TRACEMEMDUMP internals.
cm_DumpVolumes(hLogFile, cookie, 1);
cm_DumpSCache(hLogFile, cookie, 1);
cm_DumpBufHashTable(hLogFile, cookie, 1);
+ cm_DumpServers(hLogFile, cookie, 1);
smb_DumpVCP(hLogFile, cookie, 1);
+ rx_DumpCalls(hLogFile, cookie);
+ rx_DumpPackets(hLogFile, cookie);
CloseHandle(hLogFile);
lock_ObtainRead(&cm_serverLock);
for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
+ if (tsrp->status == srv_deleted)
+ continue;
if (tsp = tsrp->server) {
cm_GetServerNoLock(tsp);
lock_ReleaseRead(&cm_serverLock);
* Assumes that pioctl path has been parsed or skipped.
*/
afs_int32
-cm_IoctlVolStatTest(struct cm_ioctl *ioctlp, struct cm_user *userp)
+cm_IoctlVolStatTest(struct cm_ioctl *ioctlp, struct cm_user *userp, cm_req_t *reqp)
{
afs_int32 code;
cm_cell_t *cellp = NULL;
cm_vol_state_t *statep;
struct VolStatTest * testp;
afs_uint32 n;
- cm_req_t req;
-
- cm_InitReq(&req);
testp = (struct VolStatTest *)ioctlp->inDatap;
if (n)
testp->fid.volume = n;
else
- code = cm_FindVolumeByName(cellp, testp->volname, userp, &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
+ code = cm_FindVolumeByName(cellp, testp->volname, userp, reqp, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
}
if (testp->fid.volume > 0)
- code = cm_FindVolumeByID(cellp, testp->fid.volume, userp, &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
+ code = cm_FindVolumeByID(cellp, testp->fid.volume, userp, reqp, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
if (code)
return code;
return code;
}
-
-
git://git.openafs.org / openafs.git / blobdiff