#include <afs/param.h>
#include <afs/stds.h>
+#include <afs/com_err.h>
#include <windows.h>
#include <stdlib.h>
#include <malloc.h>
#include <string.h>
+#include <strsafe.h>
#include <stdio.h>
#include <time.h>
#include <winsock2.h>
#include <osi.h>
#include <afsint.h>
+#include <afs/afs_consts.h>
+#include <afs/cellconfig.h>
#include <afs/ptserver.h>
#include <afs/ptuser.h>
+#include <afs/volser.h>
#include <WINNT\afsreg.h>
#include "fs.h"
#include "afsd.h"
#include "cm_ioctl.h"
-#define MAXHOSTS 13
-#define OMAXHOSTS 8
-#define MAXCELLHOSTS 8
#define MAXNAME 100
-#define MAXSIZE 2048
#define MAXINSIZE 1300 /* pioctl complains if data is larger than this */
#define VMSGSIZE 128 /* size of msg buf in volume hdr */
-#define MAXCELLCHARS 64
+#define CELL_MAXNAMELEN 256
#define MAXHOSTCHARS 64
-static char space[MAXSIZE];
+static char space[AFS_PIOCTL_MAXSIZE];
static char tspace[1024];
-#ifndef WIN32
static struct ubik_client *uclient;
-#endif /* not WIN32 */
-static int GetClientAddrsCmd(struct cmd_syndesc *asp, char *arock);
-static int SetClientAddrsCmd(struct cmd_syndesc *asp, char *arock);
-static int FlushMountCmd(struct cmd_syndesc *asp, char *arock);
-static int RxStatProcCmd(struct cmd_syndesc *asp, char *arock);
-static int RxStatPeerCmd(struct cmd_syndesc *asp, char *arock);
+static int GetClientAddrsCmd(struct cmd_syndesc *asp, void *arock);
+static int SetClientAddrsCmd(struct cmd_syndesc *asp, void *arock);
+static int FlushMountCmd(struct cmd_syndesc *asp, void *arock);
+static int RxStatProcCmd(struct cmd_syndesc *asp, void *arock);
+static int RxStatPeerCmd(struct cmd_syndesc *asp, void *arock);
extern struct cmd_syndesc *cmd_CreateSyntax();
-static int MemDumpCmd(struct cmd_syndesc *asp, char *arock);
-static int CSCPolicyCmd(struct cmd_syndesc *asp, char *arock);
-static int MiniDumpCmd(struct cmd_syndesc *asp, char *arock);
-
-extern afs_int32 VL_GetEntryByNameO();
+static int MemDumpCmd(struct cmd_syndesc *asp, void *arock);
+static int CSCPolicyCmd(struct cmd_syndesc *asp, void *arock);
+static int MiniDumpCmd(struct cmd_syndesc *asp, void *arock);
static char pn[] = "fs";
static int rxInitDone = 0;
-struct afsconf_cell {
- char name[MAXCELLCHARS];
- short numServers;
- short flags;
- struct sockaddr_in hostAddr[MAXCELLHOSTS];
- char hostName[MAXCELLHOSTS][MAXHOSTCHARS];
- char *linkedCell;
-};
-
-
/*
* Character to use between name and rights in printed representation for
* DFS ACL's.
InAFS(char *apath)
{
struct ViceIoctl blob;
+ cm_ioctlQueryOptions_t options;
+ cm_fid_t fid;
afs_int32 code;
- blob.in_size = 0;
- blob.out_size = MAXSIZE;
- blob.out = space;
+ memset(&options, 0, sizeof(options));
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = 1;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
- code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1);
+ code = pioctl_utf8(apath, VIOCGETFID, &blob, 1);
if (code) {
if ((errno == EINVAL) || (errno == ENOENT))
return 0;
afs_int32 code;
blob.in_size = 0;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
- code = pioctl(apath, VIOC_FILE_CELL_NAME, &blob, 1);
- if (code == 0)
- return !strcmp("Freelance.Local.Root",space);
+ code = pioctl_utf8(apath, VIOC_FILE_CELL_NAME, &blob, 1);
+ if (code == 0) {
+ return !cm_strnicmp_utf8N("Freelance.Local.Root",space, blob.out_size);
+ }
return 1; /* assume it is because it is more restrictive that way */
}
Parent(char *apath)
{
char *tp;
- strcpy(tspace, apath);
+ if( FAILED(StringCbCopy(tspace, sizeof(tspace), apath))) {
+ fprintf (stderr, "tspace - not enough space");
+ exit(1);
+ }
tp = strrchr(tspace, '\\');
if (tp) {
*(tp+1) = 0; /* lv trailing slash so Parent("k:\foo") is "k:\" not "k:" */
}
else {
fs_ExtractDriveLetter(apath, tspace);
- strcat(tspace, ".");
+ if( FAILED(StringCbCat(tspace, sizeof(tspace), "."))) {
+ fprintf (stderr, "tspace - not enough space");
+ exit(1);
+ }
}
return tspace;
}
static afs_int32
Convert(char *arights, int dfs, enum rtype *rtypep)
{
- int i, len;
afs_int32 mode;
char tc;
*rtypep = destroy; /* Remove entire entry */
return 0;
}
- len = strlen(arights);
mode = 0;
- for(i=0;i<len;i++) {
- tc = *arights++;
+ for(; (tc = *arights) != '\0'; arights++) {
if (dfs) {
if (tc == '-')
continue;
SetDotDefault(struct cmd_item **aitemp)
{
struct cmd_item *ti;
+ int len_data = 2;
+
if (*aitemp)
return; /* already has value */
/* otherwise, allocate an item representing "." */
ti = (struct cmd_item *) malloc(sizeof(struct cmd_item));
assert(ti);
ti->next = (struct cmd_item *) 0;
- ti->data = (char *) malloc(2);
+ ti->data = (char *) malloc(len_data);
assert(ti->data);
- strcpy(ti->data, ".");
+ if( FAILED(StringCbCopy(ti->data, len_data, "."))) {
+ fprintf (stderr, "data - not enough space");
+ exit(1);
+ }
*aitemp = ti;
}
/* Otherwise we make a new item and plug in the new data. */
tlist = (struct AclEntry *) malloc(sizeof (struct AclEntry));
assert(tlist);
- strcpy(tlist->name, aname);
+ if( FAILED(StringCbCopy(tlist->name, sizeof(tlist->name), aname))) {
+ fprintf (stderr, "name - not enough space");
+ exit(1);
+ }
tlist->rights = arights;
if (plus) {
tlist->next = al->pluslist;
tp->nplus = tp->nminus = 0;
tp->pluslist = tp->minuslist = 0;
tp->dfs = 0;
- sscanf(astr, "%d dfs:%d %s", &junk, &tp->dfs, tp->cell);
+#if _MSC_VER < 1400
+ if (astr == NULL || sscanf(astr, "%d dfs:%d %s", &junk, &tp->dfs, tp->cell) <= 0) {
+ tp->dfs = 0;
+ tp->cell[0] = '\0';
+ }
+#else
+ if (astr == NULL || sscanf_s(astr, "%d dfs:%d %s", &junk, &tp->dfs, tp->cell, sizeof(tp->cell)) <= 0) {
+ tp->dfs = 0;
+ tp->cell[0] = '\0';
+ }
+#endif
return tp;
}
static struct Acl *
-ParseAcl (char *astr)
+ParseAcl (char *astr, int astr_size)
{
- int nplus, nminus, i, trights;
+ int nplus, nminus, i, trights, ret;
+ size_t len;
char tname[MAXNAME];
- struct AclEntry *first, *last, *tl;
+ struct AclEntry *first, *next, *last, *tl;
struct Acl *ta;
- ta = (struct Acl *) malloc (sizeof (struct Acl));
- assert(ta);
- ta->dfs = 0;
- sscanf(astr, "%d dfs:%d %s", &ta->nplus, &ta->dfs, ta->cell);
+ ta = EmptyAcl(NULL);
+ if( FAILED(StringCbLength(astr, astr_size, &len))) {
+ fprintf (stderr, "StringCbLength failure on astr");
+ exit(1);
+ }
+ if (astr == NULL || len == 0)
+ return ta;
+
+#if _MSC_VER < 1400
+ ret = sscanf(astr, "%d dfs:%d %s", &ta->nplus, &ta->dfs, ta->cell);
+#else
+ ret = sscanf_s(astr, "%d dfs:%d %s", &ta->nplus, &ta->dfs, ta->cell, sizeof(ta->cell));
+#endif
+ if (ret <= 0) {
+ free(ta);
+ return NULL;
+ }
astr = SkipLine(astr);
- sscanf(astr, "%d", &ta->nminus);
+#if _MSC_VER < 1400
+ ret = sscanf(astr, "%d", &ta->nminus);
+#else
+ ret = sscanf_s(astr, "%d", &ta->nminus);
+#endif
+ if (ret <= 0) {
+ free(ta);
+ return NULL;
+ }
astr = SkipLine(astr);
nplus = ta->nplus;
last = 0;
first = 0;
for(i=0;i<nplus;i++) {
- sscanf(astr, "%100s %d", tname, &trights);
+#if _MSC_VER < 1400
+ ret = sscanf(astr, "%100s %d", tname, &trights);
+#else
+ ret = sscanf_s(astr, "%100s %d", tname, sizeof(tname), &trights);
+#endif
+ if (ret <= 0)
+ goto nplus_err;
astr = SkipLine(astr);
tl = (struct AclEntry *) malloc(sizeof (struct AclEntry));
- assert(tl);
+ if (tl == NULL)
+ goto nplus_err;
if (!first)
first = tl;
- strcpy(tl->name, tname);
+ if( FAILED(StringCbCopy(tl->name, sizeof(tl->name), tname))) {
+ fprintf (stderr, "name - not enough space");
+ exit(1);
+ }
tl->rights = trights;
tl->next = 0;
if (last)
last = 0;
first = 0;
for(i=0;i<nminus;i++) {
- sscanf(astr, "%100s %d", tname, &trights);
+#if _MSC_VER < 1400
+ ret = sscanf(astr, "%100s %d", tname, &trights);
+#else
+ ret = sscanf_s(astr, "%100s %d", tname, sizeof(tname), &trights);
+#endif
+ if (ret <= 0)
+ goto nminus_err;
astr = SkipLine(astr);
tl = (struct AclEntry *) malloc(sizeof (struct AclEntry));
- assert(tl);
+ if (tl == NULL)
+ goto nminus_err;
if (!first)
first = tl;
- strcpy(tl->name, tname);
+ if( FAILED(StringCbCopy(tl->name, sizeof(tl->name), tname))) {
+ fprintf (stderr, "name - not enough space");
+ exit(1);
+ }
tl->rights = trights;
tl->next = 0;
if (last)
ta->minuslist = first;
return ta;
+
+ nminus_err:
+ for (;first; first = next) {
+ next = first->next;
+ free(first);
+ }
+ first = ta->pluslist;
+
+ nplus_err:
+ for (;first; first = next) {
+ next = first->next;
+ free(first);
+ }
+ free(ta);
+ return NULL;
}
static int
PrintStatus(VolumeStatus *status, char *name, char *motd, char *offmsg)
{
- printf("Volume status for vid = %u named %s\n",status->Vid, name);
+ printf("Volume status for vid = %u named %s is\n",status->Vid, name);
if (*offmsg != 0)
printf("Current offline message is %s\n",offmsg);
if (*motd != 0)
else
printf("unlimited\n");
printf("Current blocks used are %d\n",status->BlocksInUse);
- printf("The partition has %d blocks available out of %d\n\n",
+ printf("The partition has %d blocks available out of %d\n",
status->PartBlocksAvail, status->PartMaxBlocks);
return 0;
}
printf("%-25.25s",name);
if (status->MaxQuota != 0) {
- printf("%10d%10d", status->MaxQuota, status->BlocksInUse);
+ printf(" %10d %10d", status->MaxQuota, status->BlocksInUse);
QuotaUsed = ((((double)status->BlocksInUse)/status->MaxQuota) * 100.0);
} else {
- printf("no limit%10d", status->BlocksInUse);
+ printf(" no limit %10d", status->BlocksInUse);
}
if (QuotaUsed > 90.0){
printf(" %5.0f%%<<", QuotaUsed);
static char *
AclToString(struct Acl *acl)
{
- static char mydata[MAXSIZE];
- char tstring[MAXSIZE];
+ static char mydata[AFS_PIOCTL_MAXSIZE];
+ char tstring[AFS_PIOCTL_MAXSIZE];
char dfsstring[30];
struct AclEntry *tp;
-
- if (acl->dfs)
- sprintf(dfsstring, " dfs:%d %s", acl->dfs, acl->cell);
- else
+
+ if (acl->dfs) {
+ if( FAILED(StringCbPrintf(dfsstring, sizeof(dfsstring), " dfs:%d %s", acl->dfs, acl->cell))) {
+ fprintf (stderr, "dfsstring - cannot be populated");
+ exit(1);
+ }
+ } else {
dfsstring[0] = '\0';
- sprintf(mydata, "%d%s\n%d\n", acl->nplus, dfsstring, acl->nminus);
+ }
+ if( FAILED(StringCbPrintf(mydata, sizeof(mydata), "%d%s\n%d\n", acl->nplus, dfsstring, acl->nminus))) {
+ fprintf (stderr, "mydata - cannot be populated");
+ exit(1);
+ }
for (tp = acl->pluslist;tp;tp=tp->next) {
- sprintf(tstring, "%s %d\n", tp->name, tp->rights);
- strcat(mydata, tstring);
+ if( FAILED(StringCbPrintf(tstring, sizeof(tstring), "%s %d\n", tp->name, tp->rights))) {
+ fprintf (stderr, "tstring - cannot be populated");
+ exit(1);
+ }
+ if( FAILED(StringCbCat(mydata, sizeof(mydata), tstring))) {
+ fprintf (stderr, "mydata - not enough space");
+ exit(1);
+ }
}
for (tp = acl->minuslist;tp;tp=tp->next) {
- sprintf(tstring, "%s %d\n", tp->name, tp->rights);
- strcat(mydata, tstring);
+ if( FAILED(StringCbPrintf(tstring, sizeof(tstring), "%s %d\n", tp->name, tp->rights))) {
+ fprintf (stderr, "tstring - cannot be populated");
+ exit(1);
+ }
+ if( FAILED(StringCbCat(mydata, sizeof(mydata), tstring))) {
+ fprintf (stderr, "mydata - not enough space");
+ exit(1);
+ }
}
return mydata;
}
DWORD enabled = 0;
code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, KEY_QUERY_VALUE, &parmKey);
+ 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey);
if (code == ERROR_SUCCESS) {
dummyLen = sizeof(cm_freelanceEnabled);
code = RegQueryValueEx(parmKey, "FreelanceClient", NULL, NULL,
return enabled;
}
+#define NETBIOSNAMESZ 1024
static const char * NetbiosName(void)
{
- static char buffer[1024] = "AFS";
+ static char buffer[NETBIOSNAMESZ] = "AFS";
HKEY parmKey;
DWORD code;
DWORD dummyLen;
DWORD enabled = 0;
code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, KEY_QUERY_VALUE, &parmKey);
+ 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey);
if (code == ERROR_SUCCESS) {
dummyLen = sizeof(buffer);
code = RegQueryValueEx(parmKey, "NetbiosName", NULL, NULL,
buffer, &dummyLen);
RegCloseKey (parmKey);
} else {
- strcpy(buffer, "AFS");
+ if( FAILED(StringCbCopy(buffer, sizeof(buffer), "AFS"))) {
+ fprintf (stderr, "buffer - not enough space");
+ exit(1);
+ }
}
return buffer;
}
dwSize = 0;
dwSize2 = 0;
- strcat(pszAdminGroup,"\\");
- strcat(pszAdminGroup, AFSCLIENT_ADMIN_GROUPNAME);
+ if( FAILED(StringCbCat(pszAdminGroup, MAX_COMPUTERNAME_LENGTH + sizeof(AFSCLIENT_ADMIN_GROUPNAME) + 2,"\\"))) {
+ fprintf (stderr, "pszAdminGroup - not enough space");
+ exit(1);
+ }
+ if( FAILED(StringCbCat(pszAdminGroup, MAX_COMPUTERNAME_LENGTH +
+ sizeof(AFSCLIENT_ADMIN_GROUPNAME) + 2, AFSCLIENT_ADMIN_GROUPNAME))) {
+ fprintf (stderr, "pszAdminGroup - not enough space");
+ exit(1);
+ }
LookupAccountName(NULL, pszAdminGroup, NULL, &dwSize, NULL, &dwSize2, &snu);
/* that should always fail. */
}
static int
-SetACLCmd(struct cmd_syndesc *as, char *arock)
+SetACLCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
afs_int32 rights;
int clear;
int idf = getidf(as, parm_setacl_id);
-
+ size_t len;
int error = 0;
if (as->parms[2].items)
clear = 0;
plusp = !(as->parms[3].items);
for(ti=as->parms[0].items; ti;ti=ti->next) {
- blob.out_size = MAXSIZE;
+ if ( IsFreelanceRoot(ti->data) ) {
+ fprintf(stderr,"%s: ACLs cannot be set on the Freelance root.afs volume.\n", pn);
+ error = 1;
+ continue;
+ }
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = idf;
blob.in = blob.out = space;
- code = pioctl(ti->data, VIOCGETAL, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCGETAL, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
}
if (ta)
ZapAcl(ta);
- ta = ParseAcl(space);
+ ta = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
+ if (!ta) {
+ fprintf(stderr,
+ "fs: %s: invalid acl data returned from VIOCGETAL\n",
+ ti->data);
+ error = 1;
+ continue;
+ }
if (!plusp && ta->dfs) {
fprintf(stderr,
"fs: %s: you may not use the -negative switch with DFS acl's.\n%s",
if (clear)
ta = EmptyAcl(space);
else
- ta = ParseAcl(space);
+ ta = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
+ if (!ta) {
+ fprintf(stderr,
+ "fs: %s: invalid acl data returned from VIOCGETAL\n",
+ ti->data);
+ error = 1;
+ continue;
+ }
CleanAcl(ta, ti->data);
for(ui=as->parms[1].items; ui; ui=ui->next->next) {
enum rtype rtype;
}
blob.in = AclToString(ta);
blob.out_size=0;
- blob.in_size = 1+strlen(blob.in);
- code = pioctl(ti->data, VIOCSETAL, &blob, 1);
+ if( FAILED(StringCbLength(blob.in, sizeof(space), &len))) {
+ fprintf (stderr, "StringCbLength failure on blob.in");
+ exit(1);
+ }
+ blob.in_size = 1+(long)len;
+ code = pioctl_utf8(ti->data, VIOCSETAL, &blob, 1);
if (code) {
if (errno == EINVAL) {
if (ta->dfs) {
}
static int
-CopyACLCmd(struct cmd_syndesc *as, char *arock)
+CopyACLCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
int clear;
int idf = getidf(as, parm_copyacl_id);
int error = 0;
+ size_t len;
if (as->parms[2].items)
clear=1;
else
clear=0;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = idf;
blob.in = blob.out = space;
- code = pioctl(as->parms[0].items->data, VIOCGETAL, &blob, 1);
+ code = pioctl_utf8(as->parms[0].items->data, VIOCGETAL, &blob, 1);
if (code) {
Die(errno, as->parms[0].items->data);
return 1;
}
- fa = ParseAcl(space);
+ fa = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
+ if (!fa) {
+ fprintf(stderr,
+ "fs: %s: invalid acl data returned from VIOCGETAL\n",
+ as->parms[0].items->data);
+ return 1;
+ }
CleanAcl(fa, as->parms[0].items->data);
for (ti=as->parms[1].items; ti;ti=ti->next) {
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = idf;
blob.in = blob.out = space;
- code = pioctl(ti->data, VIOCGETAL, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCGETAL, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
if (clear)
ta = EmptyAcl(space);
else
- ta = ParseAcl(space);
+ ta = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
+ if (!ta) {
+ fprintf(stderr,
+ "fs: %s: invalid acl data returned from VIOCGETAL\n",
+ ti->data);
+ error = 1;
+ continue;
+ }
CleanAcl(ta, ti->data);
if (ta->dfs != fa->dfs) {
fprintf(stderr,
error = 1;
continue;
}
- strcpy(ta->cell, fa->cell);
+ if( FAILED(StringCbCopy(ta->cell, sizeof(ta->cell), fa->cell))) {
+ fprintf (stderr, "cell - not enough space");
+ exit(1);
+ }
}
for (tp = fa->pluslist;tp;tp=tp->next)
ChangeList(ta, 1, tp->name, tp->rights);
ChangeList(ta, 0, tp->name, tp->rights);
blob.in = AclToString(ta);
blob.out_size=0;
- blob.in_size = 1+strlen(blob.in);
- code = pioctl(ti->data, VIOCSETAL, &blob, 1);
+ if( FAILED(StringCbLength(blob.in, sizeof(space), &len))) {
+ fprintf (stderr, "StringCbLength failure on blob.in");
+ exit(1);
+ }
+ blob.in_size = 1+(long)len;
+ code = pioctl_utf8(ti->data, VIOCSETAL, &blob, 1);
if (code) {
if (errno == EINVAL) {
fprintf(stderr,
return error;
}
-/* pioctl() call to get the cellname of a pathname */
+/* pioctl_utf8() call to get the cellname of a pathname */
static afs_int32
GetCell(char *fname, char *cellname)
{
struct ViceIoctl blob;
blob.in_size = 0;
- blob.out_size = MAXCELLCHARS;
+ blob.out_size = CELL_MAXNAMELEN;
blob.out = cellname;
- code = pioctl(fname, VIOC_FILE_CELL_NAME, &blob, 1);
- return code ? errno : 0;
+ code = pioctl_utf8(fname, VIOC_FILE_CELL_NAME, &blob, 1);
+ if (code == 0)
+ cellname[blob.out_size - 1] = '\0';
+ return code;
}
/* Check if a username is valid: If it contains only digits (or a
{
afs_int32 tc, code, id;
char *nm;
- char cell[MAXCELLCHARS];
+ char cell[CELL_MAXNAMELEN];
+ char confDir[257];
for ( nm = aname; tc = *nm; nm++) {
/* all must be '-' or digit to be bad */
if (code)
return 0;
- pr_Initialize(1, AFSDIR_CLIENT_ETC_DIRPATH, cell);
+ cm_GetConfigDir(confDir, sizeof(confDir));
+
+ pr_Initialize(1, confDir, cell);
code = pr_SNameToId(aname, &id);
pr_End();
/* clean up an acl to not have bogus entries */
static int
-CleanACLCmd(struct cmd_syndesc *as, char *arock)
+CleanACLCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct Acl *ta = 0;
struct cmd_item *ti;
struct AclEntry *te;
int error = 0;
+ size_t len;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = 0;
blob.out = space;
- code = pioctl(ti->data, VIOCGETAL, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCGETAL, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
}
if (ta)
ZapAcl(ta);
- ta = ParseAcl(space);
-
+ ta = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
+ if (!ta) {
+ fprintf(stderr,
+ "fs: %s: invalid acl data returned from VIOCGETAL\n",
+ ti->data);
+ error = 1;
+ continue;
+ }
if (ta->dfs) {
fprintf(stderr,
"%s: cleanacl is not supported for DFS access lists.\n",
if (changes) {
/* now set the acl */
blob.in=AclToString(ta);
- blob.in_size = strlen(blob.in)+1;
+ if( FAILED(StringCbLength(blob.in, sizeof(space), &len))) {
+ fprintf (stderr, "StringCbLength failure on blob.in");
+ exit(1);
+ }
+ blob.in_size = (long)len+1;
blob.out_size = 0;
- code = pioctl(ti->data, VIOCSETAL, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCSETAL, &blob, 1);
if (code) {
if (errno == EINVAL) {
fprintf(stderr,
}
static int
-ListACLCmd(struct cmd_syndesc *as, char *arock)
+ListACLCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct Acl *ta = 0;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
char separator;
- blob.out_size = MAXSIZE;
+
+ if ( IsFreelanceRoot(ti->data) ) {
+ fprintf(stderr,"%s: ACLs are not set on the Freelance root.afs volume.\n", pn);
+ error = 1;
+ continue;
+ }
+
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = idf;
blob.in = blob.out = space;
- code = pioctl(ti->data, VIOCGETAL, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCGETAL, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
continue;
}
- ta = ParseAcl(space);
- switch (ta->dfs) {
- case 0:
- printf("Access list for %s is\n", ti->data);
- break;
- case 1:
- printf("DFS access list for %s is\n", ti->data);
- break;
- case 2:
- printf("DFS initial directory access list of %s is\n", ti->data);
- break;
- case 3:
- printf("DFS initial file access list of %s is\n", ti->data);
- break;
- }
- if (ta->dfs) {
- printf(" Default cell = %s\n", ta->cell);
- }
- separator = ta->dfs? DFS_SEPARATOR : ' ';
- if (ta->nplus > 0) {
- if (!ta->dfs)
- printf("Normal rights:\n");
- for(te = ta->pluslist;te;te=te->next) {
- printf(" %s%c", te->name, separator);
- PRights(te->rights, ta->dfs);
- printf("\n");
- }
- }
- if (ta->nminus > 0) {
- printf("Negative rights:\n");
- for(te = ta->minuslist;te;te=te->next) {
- printf(" %s ", te->name);
- PRights(te->rights, ta->dfs);
- printf("\n");
- }
- }
- if (ti->next)
+ ta = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
+ if (!ta) {
+ fprintf(stderr,
+ "fs: %s: invalid acl data returned from VIOCGETAL\n",
+ ti->data);
+ error = 1;
+ continue;
+ }
+ if (as->parms[3].items) { /* -cmd */
+ printf("fs setacl -dir %s -acl ", ti->data);
+ if (ta->nplus > 0) {
+ for (te = ta->pluslist; te; te = te->next) {
+ printf(" %s ", te->name);
+ PRights(te->rights, ta->dfs);
+ }
+ }
printf("\n");
+ if (ta->nminus > 0) {
+ printf("fs setacl -dir %s -acl ", ti->data);
+ for (te = ta->minuslist; te; te = te->next) {
+ printf(" %s ", te->name);
+ PRights(te->rights, ta->dfs);
+ }
+ printf(" -negative\n");
+ }
+ } else {
+ switch (ta->dfs) {
+ case 0:
+ printf("Access list for %s is\n", ti->data);
+ break;
+ case 1:
+ printf("DFS access list for %s is\n", ti->data);
+ break;
+ case 2:
+ printf("DFS initial directory access list of %s is\n", ti->data);
+ break;
+ case 3:
+ printf("DFS initial file access list of %s is\n", ti->data);
+ break;
+ }
+ if (ta->dfs) {
+ printf(" Default cell = %s\n", ta->cell);
+ }
+ separator = ta->dfs? DFS_SEPARATOR : ' ';
+ if (ta->nplus > 0) {
+ if (!ta->dfs)
+ printf("Normal rights:\n");
+ for(te = ta->pluslist;te;te=te->next) {
+ printf(" %s%c", te->name, separator);
+ PRights(te->rights, ta->dfs);
+ printf("\n");
+ }
+ }
+ if (ta->nminus > 0) {
+ printf("Negative rights:\n");
+ for(te = ta->minuslist;te;te=te->next) {
+ printf(" %s ", te->name);
+ PRights(te->rights, ta->dfs);
+ printf("\n");
+ }
+ }
+ if (ti->next)
+ printf("\n");
+ }
ZapAcl(ta);
}
return error;
}
static int
-FlushAllCmd(struct cmd_syndesc *as, char *arock)
+FlushAllCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
blob.in_size = blob.out_size = 0;
- code = pioctl(NULL, VIOC_FLUSHALL, &blob, 0);
+ code = pioctl_utf8(NULL, VIOC_FLUSHALL, &blob, 0);
if (code) {
fprintf(stderr, "Error flushing all ");
return 1;
}
static int
-FlushVolumeCmd(struct cmd_syndesc *as, char *arock)
+FlushVolumeCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
blob.in_size = blob.out_size = 0;
- code = pioctl(ti->data, VIOC_FLUSHVOLUME, &blob, 0);
+ code = pioctl_utf8(ti->data, VIOC_FLUSHVOLUME, &blob, 0);
if (code) {
fprintf(stderr, "Error flushing volume ");
perror(ti->data);
}
static int
-FlushCmd(struct cmd_syndesc *as, char *arock)
+FlushCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
struct cmd_item *ti;
-
int error = 0;
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+ if (as->parms[1].items)
+ literal = 1;
+
for(ti=as->parms[0].items; ti; ti=ti->next) {
- blob.in_size = blob.out_size = 0;
- code = pioctl(ti->data, VIOCFLUSH, &blob, 0);
+ /* once per file */
+ memset(&options, 0, sizeof(options));
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = 0;
+ code = pioctl_utf8(ti->data, VIOCFLUSH, &blob, 0);
if (code) {
if (errno == EMFILE) {
fprintf(stderr, "%s: Can't flush active file %s\n", pn,
/* all this command does is repackage its args and call SetVolCmd */
static int
-SetQuotaCmd(struct cmd_syndesc *as, char *arock) {
+SetQuotaCmd(struct cmd_syndesc *as, void *arock) {
struct cmd_syndesc ts;
-
+ errno_t err;
/* copy useful stuff from our command slot; we may later have to reorder */
- memcpy(&ts, as, sizeof(ts)); /* copy whole thing */
+#if _MSC_VER < 1400
+ memcpy(&ts, as, sizeof(ts)); /* copy whole thing */
+#else
+ err = memcpy_s(&ts, sizeof(ts), as, sizeof(ts)); /* copy whole thing */
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on ts");
+ exit(1);
+ }
+#endif
return SetVolCmd(&ts, arock);
}
static int
-SetVolCmd(struct cmd_syndesc *as, char *arock) {
+SetVolCmd(struct cmd_syndesc *as, void *arock) {
afs_int32 code;
struct ViceIoctl blob;
struct cmd_item *ti;
struct VolumeStatus *status;
- char *motd, *offmsg, *input;
+ char *motd, *offmsg, *input, *destEnd;
+ size_t destRemaining;
int error = 0;
+ size_t len;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
/* once per file */
- blob.out_size = MAXSIZE;
+ destRemaining = sizeof(space);
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = sizeof(*status) + 3; /* for the three terminating nulls */
blob.out = space;
blob.in = space;
status->MinQuota = status->MaxQuota = -1;
motd = offmsg = NULL;
if (as->parms[1].items) {
- code = util_GetInt32(as->parms[1].items->data, &status->MaxQuota);
+ code = util_GetHumanInt32(as->parms[1].items->data, &status->MaxQuota);
if (code) {
fprintf(stderr,"%s: bad integer specified for quota.\n", pn);
error = 1;
offmsg = as->parms[3].items->data;
input = (char *)status + sizeof(*status);
*(input++) = '\0'; /* never set name: this call doesn't change vldb */
+ destRemaining -= sizeof(*status) + 1;
if(offmsg) {
- if (strlen(offmsg) >= VMSGSIZE) {
- fprintf(stderr,"%s: message must be shorter than %d characters\n",
+ if( FAILED(StringCbLength(offmsg, VMSGSIZE, &len))) {
+ fprintf(stderr,"%s: message must be shorter than %d characters\n",
pn, VMSGSIZE);
error = 1;
continue;
- }
- strcpy(input,offmsg);
- blob.in_size += strlen(offmsg);
- input += strlen(offmsg) + 1;
- } else
+ }
+ if( FAILED(StringCbCopyEx(input, destRemaining, offmsg, &destEnd, &destRemaining, STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, "input - not enough space");
+ exit(1);
+ }
+ blob.in_size += destEnd - input;
+ input = destEnd + 1;
+ destRemaining -= sizeof(char);
+ } else {
*(input++) = '\0';
+ destRemaining -= sizeof(char);
+ }
if(motd) {
- if (strlen(motd) >= VMSGSIZE) {
- fprintf(stderr,"%s: message must be shorter than %d characters\n",
- pn, VMSGSIZE);
+ if( FAILED(StringCbLength(motd, VMSGSIZE, &len))) {
+ fprintf(stderr,"%s: message must be shorter than %d characters\n",
+ pn, VMSGSIZE);
return code;
- }
- strcpy(input,motd);
- blob.in_size += strlen(motd);
- input += strlen(motd) + 1;
- } else
+ }
+ if( FAILED(StringCbCopyEx(input, destRemaining, motd, &destEnd, &destRemaining, STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, "input - not enough space");
+ exit(1);
+ }
+ blob.in_size += (long)(destEnd - input);
+ input = destEnd + 1;
+ destRemaining -= sizeof(char);
+ } else {
*(input++) = '\0';
- code = pioctl(ti->data,VIOCSETVOLSTAT, &blob, 1);
+ destRemaining -= sizeof(char);
+ }
+ code = pioctl_utf8(ti->data,VIOCSETVOLSTAT, &blob, 1);
if (code) {
+ Die(errno, ti->data);
error = 1;
}
}
return error;
}
-#ifndef WIN32
-/*
- * Why is VenusFid declared in the kernel-only section of afs.h,
- * if it's the exported interface of the (UNIX) cache manager?
- */
-struct VenusFid {
- afs_int32 Cell;
- AFSFid Fid;
-};
-#endif /* WIN32 */
+/* values match cache manager File Types */
+static char *
+filetypestr(afs_uint32 type)
+{
+ char * s = "Object";
+
+ switch (type) {
+ case 1: /* file */
+ s = "File";
+ break;
+ case 2:
+ s = "Directory";
+ break;
+ case 3:
+ s = "Symlink";
+ break;
+ case 4:
+ s = "Mountpoint";
+ break;
+ case 5:
+ s = "DfsLink";
+ break;
+ }
+ return s;
+}
static int
-ExamineCmd(struct cmd_syndesc *as, char *arock)
+ExamineCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
struct VolumeStatus *status;
char *name, *offmsg, *motd;
int error = 0;
-
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+ size_t len;
+
+ if (as->parms[1].items)
+ literal = 1;
+
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
cm_fid_t fid;
- afs_uint32 owner[2];
- char cell[MAXCELLCHARS];
+ afs_uint32 filetype;
+ afs_int32 owner[2];
+ char cell[CELL_MAXNAMELEN];
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
- code = GetCell(ti->data, cell);
- if (code) {
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl_utf8(ti->data, VIOCGETFID, &blob, 1) &&
+ blob.out_size == sizeof(cm_fid_t)) {
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
Die(errno, ti->data);
error = 1;
continue;
- }
+ }
- /* once per file */
- blob.in_size = 0;
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
- blob.out_size = sizeof(cm_fid_t);
- blob.out = (char *) &fid;
- if (0 == pioctl(ti->data, VIOCGETFID, &blob, 1)) {
- printf("File %s (%u.%u.%u) contained in cell %s\n",
- ti->data, fid.volume, fid.vnode, fid.unique,
- cell);
+ code = pioctl_utf8(ti->data, VIOC_GETFILETYPE, &blob, 1);
+ if (code || blob.out_size != sizeof(filetype)) {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
}
+ blob.out_size = CELL_MAXNAMELEN;
+ blob.out = cell;
+
+ code = pioctl_utf8(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
+ if (code == 0)
+ cell[blob.out_size-1] = '\0';
+ printf("%s %s (%u.%u.%u) contained in cell %s\n",
+ filetypestr(filetype),
+ ti->data, fid.volume, fid.vnode, fid.unique,
+ code ? "unknown-cell" : cell);
+
blob.out_size = 2 * sizeof(afs_uint32);
blob.out = (char *) &owner;
- if (0 == pioctl(ti->data, VIOCGETOWNER, &blob, 1)) {
+ if (0 == pioctl_utf8(ti->data, VIOCGETOWNER, &blob, 1) &&
+ blob.out_size == 2 * sizeof(afs_uint32)) {
char oname[PR_MAXNAMELEN] = "(unknown)";
+ char gname[PR_MAXNAMELEN] = "(unknown)";
+ char confDir[257];
/* Go to the PRDB and see if this all number username is valid */
- pr_Initialize(1, AFSDIR_CLIENT_ETC_DIRPATH, cell);
+ cm_GetConfigDir(confDir, sizeof(confDir));
+
+ pr_Initialize(1, confDir, cell);
pr_SIdToName(owner[0], oname);
- printf("Owner %s (%u) Group %u\n", oname, owner[0], owner[1]);
+ pr_SIdToName(owner[1], gname);
+ printf("Owner %s (%d) Group %s (%d)\n", oname, owner[0], gname, owner[1]);
}
-
+
blob.out = space;
- blob.out_size = MAXSIZE;
- code = pioctl(ti->data, VIOCGETVOLSTAT, &blob, 1);
- if (code) {
- Die(errno, ti->data);
- error = 1;
- continue;
- }
- status = (VolumeStatus *)space;
- name = (char *)status + sizeof(*status);
- offmsg = name + strlen(name) + 1;
- motd = offmsg + strlen(offmsg) + 1;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
+ code = pioctl_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
+ if (code == 0) {
+ space[blob.out_size - 1] = '\0';
+ status = (VolumeStatus *)space;
+ name = (char *)status + sizeof(*status);
+ if( FAILED(StringCbLength(name, sizeof(space) - (name - space), &len))) {
+ fprintf (stderr, "StringCbLength failure on name");
+ exit(1);
+ }
+ offmsg = name + len + 1;
+ if( FAILED(StringCbLength(offmsg, sizeof(space) - (offmsg - space), &len))) {
+ fprintf (stderr, "StringCbLength failure on offmsg");
+ exit(1);
+ }
+ motd = offmsg + len + 1;
+ PrintStatus(status, name, motd, offmsg);
+ } else {
+ Die(errno, ti->data);
+ }
- PrintStatus(status, name, motd, offmsg);
+ errno = 0;
+ code = pioctl_utf8(ti->data, VIOC_PATH_AVAILABILITY, &blob, 1);
+ switch (errno) {
+ case 0:
+ printf("Volume is online\n");
+ break;
+ case ENXIO:
+ printf("Volume is offline\n");
+ break;
+ case ENOSYS:
+ printf("All Volume servers are down\n");
+ break;
+ case EBUSY:
+ printf("All volume servers are busy\n");
+ break;
+ default:
+ printf("Unknown volume state\n");
+ Die(errno, ti->data);
+ }
+ printf("\n");
}
return error;
}
static int
-ListQuotaCmd(struct cmd_syndesc *as, char *arock)
+ListQuotaCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
int error = 0;
- printf("%-25s%-10s%-10s%-7s%-13s\n",
- "Volume Name", " Quota", " Used", " %Used", " Partition");
+ printf("%-25s%-11s%-11s%-7s%-13s\n", "Volume Name", " Quota",
+ " Used", " %Used", " Partition");
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
/* once per file */
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = 0;
blob.out = space;
- code = pioctl(ti->data, VIOCGETVOLSTAT, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
continue;
}
+ space[blob.out_size - 1] = '\0';
status = (VolumeStatus *)space;
name = (char *)status + sizeof(*status);
QuickPrintStatus(status, name);
}
static int
-WhereIsCmd(struct cmd_syndesc *as, char *arock)
+WhereIsCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
afs_int32 *hosts;
char *tp;
int error = 0;
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+
+ if (as->parms[1].items)
+ literal = 1;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
- /* once per file */
- blob.out_size = MAXSIZE;
- blob.in_size = 0;
+ cm_fid_t fid;
+ afs_uint32 filetype;
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl_utf8(ti->data, VIOCGETFID, &blob, 1) &&
+ blob.out_size == sizeof(cm_fid_t)) {
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
+
+ code = pioctl_utf8(ti->data, VIOC_GETFILETYPE, &blob, 1);
+ if (code || blob.out_size != sizeof(filetype)) {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
memset(space, 0, sizeof(space));
- code = pioctl(ti->data, VIOCWHEREIS, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCWHEREIS, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
continue;
}
- hosts = (afs_int32 *) space;
- printf("File %s is on host%s ", ti->data,
+ hosts = (afs_int32 *) space;
+ printf("%s %s is on host%s ",
+ filetypestr(filetype),
+ ti->data,
(hosts[0] && !hosts[1]) ? "": "s");
- for(j=0; j<MAXHOSTS; j++) {
+ for(j=0; j<AFS_MAXHOSTS; j++) {
if (hosts[j] == 0)
break;
tp = hostutil_GetNameByINet(hosts[j]);
static int
-DiskFreeCmd(struct cmd_syndesc *as, char *arock)
+DiskFreeCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
/* once per file */
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = 0;
blob.out = space;
- code = pioctl(ti->data, VIOCGETVOLSTAT, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
continue;
}
+ space[blob.out_size - 1] = '\0';
status = (VolumeStatus *)space;
name = (char *)status + sizeof(*status);
QuickPrintSpace(status, name);
}
static int
-QuotaCmd(struct cmd_syndesc *as, char *arock)
+QuotaCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
/* once per file */
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = 0;
blob.out = space;
- code = pioctl(ti->data, VIOCGETVOLSTAT, &blob, 1);
- if (code) {
+ code = pioctl_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
+ /*
+ * The response is VolumeStatus, volume name, offline message, and motd
+ */
+ if (code || blob.out_size < sizeof(*status)) {
Die(errno, ti->data);
error = 1;
continue;
}
- status = (VolumeStatus *)space;
+
+ status = (VolumeStatus *)space;
if (status->MaxQuota)
quotaPct = ((((double)status->BlocksInUse)/status->MaxQuota) * 100.0);
else
}
static int
-ListMountCmd(struct cmd_syndesc *as, char *arock)
+ListMountCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
char true_name[1024]; /*``True'' dirname (e.g., symlink target)*/
char parent_dir[1024]; /*Parent directory of true name*/
char *last_component; /*Last component of true name*/
+ size_t len;
+
#ifndef WIN32
struct stat statbuff; /*Buffer for status info*/
#endif /* not WIN32 */
/* once per file */
thru_symlink = 0;
#ifdef WIN32
- strcpy(orig_name, ti->data);
+ if( FAILED(StringCbCopy(orig_name, sizeof(orig_name), ti->data))) {
+ fprintf (stderr, "orig_name - not enough space");
+ exit(1);
+ }
#else /* not WIN32 */
- sprintf(orig_name, "%s%s",
- (ti->data[0] == '/') ? "" : "./",
- ti->data);
+
+ if( FAILED(StringCbPrintf(orig_name, sizeof(orig_name), "%s%s",
+ (ti->data[0] == '/') ? "" : "./",
+ ti->data))) {
+ fprintf (stderr, "orig_name - cannot be populated");
+ exit(1);
+ }
#endif /* not WIN32 */
#ifndef WIN32
* name (we know there is one) and splice in the symlink value.
*/
if (true_name[0] != '\\') {
- last_component = (char *) strrchr(orig_name, '\\');
- strcpy(++last_component, true_name);
- strcpy(true_name, orig_name);
+ last_component = (char *) strrchr(orig_name, '\\');
+ if( FAILED(StringCbCopy(++last_component, sizeof(orig_name) - (last_component - orig_name) * sizeof(char), true_name))) {
+ fprintf (stderr, "last_component - not enough space");
+ exit(1);
+ }
+ if( FAILED(StringCbCopy(true_name, sizeof(true_name), orig_name))) {
+ fprintf (stderr, "true_name - not enough space");
+ exit(1);
+ }
}
- } else
- strcpy(true_name, orig_name);
+ } else {
+ if( FAILED(StringCbCopy(true_name, sizeof(true_name), orig_name))) {
+ fprintf (stderr, "true_name - not enough space");
+ exit(1);
+ }
+ }
#else /* WIN32 */
- strcpy(true_name, orig_name);
+ if( FAILED(StringCbCopy(true_name, sizeof(true_name), orig_name))) {
+ fprintf (stderr, "true_name - not enough space");
+ exit(1);
+ }
#endif /* WIN32 */
/*
* Found it. Designate everything before it as the parent directory,
* everything after it as the final component.
*/
- strncpy(parent_dir, true_name, last_component - true_name + 1);
+ if( FAILED(StringCchCopyN(parent_dir, sizeof(parent_dir) / sizeof(char), true_name, last_component - true_name + 1))) {
+ fprintf (stderr, "parent_dir - not enough space");
+ exit(1);
+ }
parent_dir[last_component - true_name + 1] = 0;
last_component++; /*Skip the slash*/
#ifdef WIN32
if (!InAFS(parent_dir)) {
const char * nbname = NetbiosName();
- int len = strlen(nbname);
-
+ if( FAILED(StringCbLength(nbname, NETBIOSNAMESZ, &len))) {
+ fprintf (stderr, "StringCbLength failure on nbname");
+ exit(1);
+ }
if (parent_dir[0] == '\\' && parent_dir[1] == '\\' &&
parent_dir[len+2] == '\\' &&
parent_dir[len+3] == '\0' &&
!strnicmp(nbname,&parent_dir[2],len))
{
- sprintf(parent_dir,"\\\\%s\\all\\", nbname);
+ if( FAILED(StringCbPrintf(parent_dir, sizeof(parent_dir),"\\\\%s\\all\\", nbname))) {
+ fprintf (stderr, "parent_dir - cannot be populated");
+ exit(1);
+ }
}
}
#endif
* directory, and the last component as the given name.
*/
fs_ExtractDriveLetter(true_name, parent_dir);
- strcat(parent_dir, ".");
+ if( FAILED(StringCbCat(parent_dir, sizeof(parent_dir), "."))) {
+ fprintf (stderr, "parent_dir - not enough space");
+ exit(1);
+ }
last_component = true_name;
fs_StripDriveLetter(true_name, true_name, sizeof(true_name));
}
}
blob.in = last_component;
- blob.in_size = strlen(last_component)+1;
- blob.out_size = MAXSIZE;
+ if( FAILED(StringCchLength(last_component, sizeof(true_name) / sizeof(char) - (last_component - true_name), &len))) {
+ fprintf (stderr, "StringCbLength failure on last_component");
+ exit(1);
+ }
+ blob.in_size = (long)len+1;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
- memset(space, 0, MAXSIZE);
+ memset(space, 0, AFS_PIOCTL_MAXSIZE);
- code = pioctl(parent_dir, VIOC_AFS_STAT_MT_PT, &blob, 1);
+ code = pioctl_utf8(parent_dir, VIOC_AFS_STAT_MT_PT, &blob, 1);
if (code == 0) {
- printf("'%s' is a %smount point for volume '%s'\n",
+ printf("'%s' is a %smount point for volume '%.*s'\n",
ti->data,
(thru_symlink ? "symbolic link, leading to a " : ""),
- space);
+ blob.out_size,
+ space);
} else {
if (errno == EINVAL) {
}
static int
-MakeMountCmd(struct cmd_syndesc *as, char *arock)
+MakeMountCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
char *cellName, *volName, *tmpName;
#endif
char path[1024] = "";
struct afsconf_cell info;
-#ifndef WIN32
struct vldbentry vldbEntry;
-#endif
struct ViceIoctl blob;
char * parent;
+ size_t len;
+
+ memset(&info, 0, sizeof(info));
if (as->parms[2].items) /* cell name specified */
cellName = as->parms[2].items->data;
else
cellName = NULL;
volName = as->parms[1].items->data;
-
- if (strlen(volName) >= 64) {
- fprintf(stderr,"%s: volume name too long (length must be < 64 characters)\n", pn);
+ if( FAILED(StringCbLength(volName, VL_MAXNAMELEN, &len))) {
+ fprintf(stderr,"%s: volume name too long (length must be <= 64 characters)\n", pn);
return 1;
}
if (!InAFS(parent)) {
#ifdef WIN32
const char * nbname = NetbiosName();
- int len = strlen(nbname);
-
+ if ( FAILED(StringCbLength(nbname, NETBIOSNAMESZ, &len))) {
+ fprintf (stderr, "StringCbLength failure on nbname");
+ exit(1);
+ }
if (parent[0] == '\\' && parent[1] == '\\' &&
parent[len+2] == '\\' &&
parent[len+3] == '\0' &&
!strnicmp(nbname,&parent[2],len))
{
- sprintf(path,"%sall\\%s", parent, &as->parms[0].items->data[strlen(parent)]);
+ if( FAILED(StringCbPrintf(path, sizeof(path),"%sall\\%s", parent, &as->parms[0].items->data[len+2]))) {
+ fprintf (stderr, "path - cannot be populated");
+ exit(1);
+ }
parent = Parent(path);
if (!InAFS(parent)) {
fprintf(stderr,"%s: mount points must be created within the AFS file system\n", pn);
}
}
- if ( strlen(path) == 0 )
- strcpy(path, as->parms[0].items->data);
-
+ if( FAILED(StringCbLength(path, sizeof(path), &len))) {
+ fprintf (stderr, "StringCbLength failure on path");
+ exit(1);
+ }
+ if ( len == 0 ) {
+ if( FAILED(StringCbCopy(path, sizeof(path), as->parms[0].items->data))) {
+ fprintf (stderr, "path - not enough space");
+ exit(1);
+ }
+ }
if ( IsFreelanceRoot(parent) ) {
if ( !IsAdmin() ) {
- fprintf(stderr,"%s: Only AFS Client Administrators may alter the root.afs volume\n", pn);
+ fprintf(stderr,"%s: Only AFS Client Administrators may alter the Freelance root.afs volume\n", pn);
return 1;
}
blob.in_size = 0;
blob.out_size = sizeof(localCellName);
blob.out = localCellName;
- code = pioctl(parent, VIOC_GET_WS_CELL, &blob, 1);
- if (!code)
+ code = pioctl_utf8(parent, VIOC_GET_WS_CELL, &blob, 1);
+ if (!code) {
+ localCellName[sizeof(localCellName) - 1] = '\0';
cellName = localCellName;
+ }
}
} else {
- if (!cellName)
- GetCell(parent,space);
+ if (!cellName) {
+ code = GetCell(parent,space);
+ if (code)
+ return 1;
+ }
}
code = GetCellName(cellName?cellName:space, &info);
if (code) {
return 1;
}
-#ifndef WIN32
if (!(as->parms[4].items)) {
/* not fast, check which cell the mountpoint is being created in */
code = 0;
code = VLDBInit(1, &info);
if (code == 0) {
/* make the check. Don't complain if there are problems with init */
- code = ubik_Call(VL_GetEntryByNameO, uclient, 0, volName, &vldbEntry);
+ code = ubik_VL_GetEntryByNameO(uclient, 0, volName, &vldbEntry);
if (code == VL_NOENT) {
fprintf(stderr,"%s: warning, volume %s does not exist in cell %s.\n",
pn, volName, cellName ? cellName : space);
}
}
}
-#endif /* not WIN32 */
- if (as->parms[3].items) /* if -rw specified */
- strcpy(space, "%");
- else
- strcpy(space, "#");
+ if (as->parms[3].items) { /* if -rw specified */
+ if( FAILED(StringCbCopy(space, sizeof(space), "%"))) {
+ fprintf (stderr, "space arr - not enough space");
+ exit(1);
+ }
+ } else {
+ if( FAILED(StringCbCopy(space, sizeof(space), "#"))) {
+ fprintf (stderr, "space arr - not enough space");
+ exit(1);
+ }
+ }
if (cellName) {
/* cellular mount point, prepend cell prefix */
- strcat(space, info.name);
- strcat(space, ":");
+ if( FAILED(StringCbCat(space, sizeof(space), info.name))) {
+ fprintf (stderr, "space arr - not enough space");
+ exit(1);
+ }
+ if( FAILED(StringCbCat(space, sizeof(space), ":"))) {
+ fprintf (stderr, "space arr - not enough space");
+ exit(1);
+ }
+ }
+ if( FAILED(StringCbCat(space, sizeof(space), volName))) { /* append volume name */
+ fprintf (stderr, "space arr - not enough space");
+ exit(1);
+ }
+ if( FAILED(StringCbCat(space, sizeof(space), "."))) { /* stupid convention; these end with a period */
+ fprintf (stderr, "space arr - not enough space");
+ exit(1);
}
- strcat(space, volName); /* append volume name */
- strcat(space, "."); /* stupid convention; these end with a period */
#ifdef WIN32
/* create symlink with a special pioctl for Windows NT, since it doesn't
* have a symlink system call.
*/
blob.out_size = 0;
- blob.in_size = 1 + strlen(space);
+ if( FAILED(StringCbLength(space, sizeof(space), &len))) {
+ fprintf (stderr, "StringCbLength failure on space");
+ exit(1);
+ }
+ blob.in_size = 1 + (long)len;
blob.in = space;
blob.out = NULL;
- code = pioctl(path, VIOC_AFS_CREATE_MT_PT, &blob, 0);
+ code = pioctl_utf8(path, VIOC_AFS_CREATE_MT_PT, &blob, 0);
#else /* not WIN32 */
code = symlink(space, path);
#endif /* not WIN32 */
+
+ if (info.linkedCell)
+ free(info.linkedCell);
+
if (code) {
Die(errno, path);
return 1;
* tp: Set to point to the actual name of the mount point to nuke.
*/
static int
-RemoveMountCmd(struct cmd_syndesc *as, char *arock) {
+RemoveMountCmd(struct cmd_syndesc *as, void *arock) {
afs_int32 code=0;
struct ViceIoctl blob;
struct cmd_item *ti;
char lsbuffer[1024];
char *tp;
int error = 0;
-
+ size_t len;
+
for(ti=as->parms[0].items; ti; ti=ti->next) {
/* once per file */
tp = (char *) strrchr(ti->data, '\\');
if (!tp)
tp = (char *) strrchr(ti->data, '/');
if (tp) {
- strncpy(tbuffer, ti->data, code=tp-ti->data+1); /* the dir name */
- tbuffer[code] = 0;
+ if( FAILED(StringCchCopyN(tbuffer, sizeof(tbuffer) / sizeof(char), ti->data, code=(afs_int32)(tp-ti->data+1)))) { /* the dir name */
+ fprintf (stderr, "tbuffer - not enough space");
+ exit(1);
+ }
tp++; /* skip the slash */
#ifdef WIN32
if (!InAFS(tbuffer)) {
const char * nbname = NetbiosName();
- int len = strlen(nbname);
+ if( FAILED(StringCbLength(nbname, NETBIOSNAMESZ, &len))) {
+ fprintf (stderr, "StringCbLength failure on nbname");
+ exit(1);
+ }
if (tbuffer[0] == '\\' && tbuffer[1] == '\\' &&
tbuffer[len+2] == '\\' &&
tbuffer[len+3] == '\0' &&
!strnicmp(nbname,&tbuffer[2],len))
{
- sprintf(tbuffer,"\\\\%s\\all\\", nbname);
+ if( FAILED(StringCbPrintf(tbuffer, sizeof(tbuffer),"\\\\%s\\all\\", nbname))) {
+ fprintf (stderr, "tbuffer - cannot be populated");
+ exit(1);
+ }
}
}
#endif
} else {
fs_ExtractDriveLetter(ti->data, tbuffer);
- strcat(tbuffer, ".");
+ if( FAILED(StringCbCat(tbuffer, sizeof(tbuffer), "."))) {
+ fprintf (stderr, "tbuffer - not enough space");
+ exit(1);
+ }
tp = ti->data;
fs_StripDriveLetter(tp, tp, 0);
}
blob.in = tp;
- blob.in_size = strlen(tp)+1;
+ if( FAILED(StringCbLength(tp, AFS_PIOCTL_MAXSIZE, &len))) {
+ fprintf (stderr, "StringCbLength failure on tp");
+ exit(1);
+ }
+ blob.in_size = (long)len+1;
blob.out = lsbuffer;
blob.out_size = sizeof(lsbuffer);
- code = pioctl(tbuffer, VIOC_AFS_STAT_MT_PT, &blob, 0);
+ code = pioctl_utf8(tbuffer, VIOC_AFS_STAT_MT_PT, &blob, 0);
if (code) {
if (errno == EINVAL) {
fprintf(stderr,"%s: '%s' is not a mount point.\n", pn, ti->data);
}
if ( IsFreelanceRoot(tbuffer) && !IsAdmin() ) {
- fprintf(stderr,"%s: Only AFS Client Administrators may alter the root.afs volume\n", pn);
+ fprintf(stderr,"%s: Only AFS Client Administrators may alter the Freelance root.afs volume\n", pn);
error = 1;
continue; /* skip */
}
blob.out_size = 0;
blob.in = tp;
- blob.in_size = strlen(tp)+1;
- code = pioctl(tbuffer, VIOC_AFS_DELETE_MT_PT, &blob, 0);
+ if( FAILED(StringCbLength(tp, AFS_PIOCTL_MAXSIZE, &len))) {
+ fprintf (stderr, "StringCbLength failure on tp");
+ exit(1);
+ }
+ blob.in_size = (long)len+1;
+ code = pioctl_utf8(tbuffer, VIOC_AFS_DELETE_MT_PT, &blob, 0);
if (code) {
Die(errno, ti->data);
error = 1;
*/
static int
-CheckServersCmd(struct cmd_syndesc *as, char *arock)
+CheckServersCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
char *tp;
struct afsconf_cell info;
struct chservinfo checkserv;
+ errno_t err;
+ size_t len;
+ memset(&info, 0, sizeof(info));
memset(&checkserv, 0, sizeof(struct chservinfo));
blob.in_size=sizeof(struct chservinfo);
blob.in=(caddr_t)&checkserv;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
memset(space, 0, sizeof(afs_int32)); /* so we assure zero when nothing is copied back */
if (code) {
return 1;
}
- strcpy(checkserv.tbuffer,info.name);
- checkserv.tsize=strlen(info.name)+1;
+ if( FAILED(StringCbCopy(checkserv.tbuffer, sizeof(checkserv.tbuffer), info.name))) {
+ fprintf (stderr, "tbuffer - not enough space");
+ exit(1);
+ }
+ if( FAILED(StringCbLength(info.name, sizeof(info.name), &len))) {
+ fprintf (stderr, "StringCbLength failure on info.name");
+ exit(1);
+ }
+ checkserv.tsize=(int)len+1;
+ if (info.linkedCell)
+ free(info.linkedCell);
} else {
- strcpy(checkserv.tbuffer,"\0");
+ if( FAILED(StringCbCopy(checkserv.tbuffer, sizeof(checkserv.tbuffer),"\0"))) {
+ fprintf (stderr, "tbuffer - not enough space");
+ exit(1);
+ }
checkserv.tsize=0;
}
/* sanity check */
if(checkserv.tinterval<0) {
printf("Warning: The negative -interval is ignored; treated as an inquiry\n");
- checkserv.tinterval=0;
+ checkserv.tinterval=-1;
} else if(checkserv.tinterval> 600) {
printf("Warning: The maximum -interval value is 10 mins (600 secs)\n");
checkserv.tinterval=600; /* 10 min max interval */
checkserv.tinterval = -1; /* don't change current interval */
}
- if ( checkserv.tinterval != 0 ) {
+ if ( checkserv.tinterval >= 0 ) {
#ifdef WIN32
if ( !IsAdmin() ) {
fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
#endif /* WIN32 */
}
- code = pioctl(0, VIOCCKSERV, &blob, 1);
+ code = pioctl_utf8(0, VIOCCKSERV, &blob, 1);
if (code) {
if ((errno == EACCES) && (checkserv.tinterval > 0)) {
printf("Must be root to change -interval\n");
Die(errno, 0);
return 1;
}
+#if _MSC_VER < 1400
memcpy(&temp, space, sizeof(afs_int32));
- if (checkserv.tinterval >= 0) {
+#else
+ err = memcpy_s(&temp, sizeof(temp), space, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on temp");
+ exit(1);
+ }
+#endif
+
+ if (checkserv.tinterval >= 0) {
if (checkserv.tinterval > 0)
printf("The new down server probe interval (%d secs) is now in effect (old interval was %d secs)\n",
checkserv.tinterval, temp);
printf("All servers are running.\n");
} else {
printf("These servers unavailable due to network or server problems: ");
- for(j=0; j < MAXHOSTS; j++) {
- memcpy(&temp, space + j*sizeof(afs_int32), sizeof(afs_int32));
+ for(j=0; j < AFS_MAXHOSTS; j++) {
+#if _MSC_VER < 1400
+ memcpy(&temp, space + j*sizeof(afs_int32), sizeof(afs_int32));
+#else
+ err = memcpy_s(&temp, sizeof(temp), space + j*sizeof(afs_int32), sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on temp");
+ exit(1);
+ }
+#endif
+
if (temp == 0)
break;
tp = hostutil_GetNameByINet(temp);
}
static int
-MessagesCmd(struct cmd_syndesc *as, char *arock)
+MessagesCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code=0;
struct ViceIoctl blob;
memset(&gagflags, 0, sizeof(struct gaginfo));
blob.in_size = sizeof(struct gaginfo);
blob.in = (caddr_t ) &gagflags;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
memset(space, 0, sizeof(afs_int32)); /* so we assure zero when nothing is copied back */
if (code)
return 1;
- code = pioctl(0, VIOC_GAG, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GAG, &blob, 1);
if (code) {
Die(errno, 0);
return 1;
}
static int
-CheckVolumesCmd(struct cmd_syndesc *as, char *arock)
+CheckVolumesCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
blob.in_size = 0;
blob.out_size = 0;
- code = pioctl(0, VIOCCKBACK, &blob, 1);
+ code = pioctl_utf8(0, VIOCCKBACK, &blob, 1);
if (code) {
Die(errno, 0);
return 1;
}
static int
-SetCacheSizeCmd(struct cmd_syndesc *as, char *arock)
+SetCacheSizeCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
return 1;
}
if (as->parms[0].items) {
- code = util_GetInt32(as->parms[0].items->data, &temp);
+ code = util_GetHumanInt32(as->parms[0].items->data, &temp);
if (code) {
fprintf(stderr,"%s: bad integer specified for cache size.\n", pn);
return 1;
blob.in = (char *) &temp;
blob.in_size = sizeof(afs_int32);
blob.out_size = 0;
- code = pioctl(0, VIOCSETCACHESIZE, &blob, 1);
+ code = pioctl_utf8(0, VIOCSETCACHESIZE, &blob, 1);
if (code) {
Die(errno, (char *) 0);
return 1;
return 0;
}
-#define MAXGCSIZE 16
static int
-GetCacheParmsCmd(struct cmd_syndesc *as, char *arock)
+GetCacheParmsCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
- afs_int32 parms[MAXGCSIZE];
+ cm_cacheParms_t parms;
- memset(parms, 0, sizeof(parms));
+ memset(&parms, 0, sizeof(parms));
blob.in = NULL;
blob.in_size = 0;
blob.out_size = sizeof(parms);
- blob.out = (char *) parms;
- code = pioctl(0, VIOCGETCACHEPARMS, &blob, 1);
- if (code) {
+ blob.out = (char *) &parms;
+ code = pioctl_utf8(0, VIOCGETCACHEPARMS, &blob, 1);
+ if (code || blob.out_size != sizeof(parms)) {
Die(errno, NULL);
return 1;
}
- printf("AFS using %d of the cache's available %d 1K byte blocks.\n",
- parms[1], parms[0]);
- if (parms[1] > parms[0])
+ printf("AFS using %I64u of the cache's available %I64u 1K byte blocks.\n",
+ parms.parms[1], parms.parms[0]);
+ if (parms.parms[1] > parms.parms[0])
printf("[Cache guideline temporarily deliberately exceeded; it will be adjusted down but you may wish to increase the cache size.]\n");
return 0;
}
static int
-ListCellsCmd(struct cmd_syndesc *as, char *arock)
+ListCellsCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
afs_int32 i, j, *lp, magic, size;
char *tp;
- afs_int32 addr, maxa = OMAXHOSTS;
+ afs_int32 addr, maxa = AFS_OMAXHOSTS;
struct ViceIoctl blob;
int resolve;
+ errno_t err;
resolve = !(as->parms[0].items); /* -numeric */
for(i=0;i<1000;i++) {
tp = space;
- memcpy(tp, &i, sizeof(afs_int32));
+#if _MSC_VER < 1400
+ memcpy(tp, &i, sizeof(afs_int32));
+#else
+ err = memcpy_s(tp, sizeof(space), &i, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on tp");
+ exit(1);
+ }
+#endif
tp = (char *)(space + sizeof(afs_int32));
lp = (afs_int32 *)tp;
*lp++ = 0x12345678;
size = sizeof(afs_int32) + sizeof(afs_int32);
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = sizeof(afs_int32);
blob.in = space;
blob.out = space;
- code = pioctl(0, VIOCGETCELL, &blob, 1);
+ code = pioctl_utf8(0, VIOCGETCELL, &blob, 1);
if (code < 0) {
if (errno == EDOM)
break; /* done with the list */
return 1;
}
tp = space;
- memcpy(&magic, tp, sizeof(afs_int32));
+#if _MSC_VER < 1400
+ memcpy(&magic, tp, sizeof(afs_int32));
+#else
+ err = memcpy_s(&magic, sizeof(magic), tp, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on magic");
+ exit(1);
+ }
+#endif
if (magic == 0x12345678) {
- maxa = MAXHOSTS;
+ maxa = AFS_MAXHOSTS;
tp += sizeof(afs_int32);
}
printf("Cell %s on hosts", tp+maxa*sizeof(afs_int32));
- for(j=0; j < maxa; j++) {
+ for(j=0; j < maxa && j*sizeof(afs_int32) < AFS_PIOCTL_MAXSIZE; j++) {
char *name, tbuffer[20];
-
- memcpy(&addr, tp + j*sizeof(afs_int32), sizeof(afs_int32));
+#if _MSC_VER < 1400
+ memcpy(&addr, tp + j*sizeof(afs_int32), sizeof(afs_int32));
+#else
+ err = memcpy_s(&addr, sizeof(addr), tp + j*sizeof(afs_int32), sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on addr");
+ exit(1);
+ }
+#endif
if (addr == 0)
break;
name = hostutil_GetNameByINet(addr);
} else {
addr = ntohl(addr);
- sprintf(tbuffer, "%d.%d.%d.%d", (addr >> 24) & 0xff,
- (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
+ if( FAILED(StringCbPrintf(tbuffer, sizeof(tbuffer), "%d.%d.%d.%d", (addr >> 24) & 0xff,
+ (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff))) {
+ fprintf (stderr, "tbuffer - cannot be populated");
+ exit(1);
+ }
name = tbuffer;
}
printf(" %s", name);
#ifndef WIN32
static int
-ListAliasesCmd(struct cmd_syndesc *as, char *arock)
+ListAliasesCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code, i;
char *tp, *aliasName, *realName;
struct ViceIoctl blob;
+ errno_t err;
+ size_t len;
for (i = 0;; i++) {
tp = space;
- memcpy(tp, &i, sizeof(afs_int32));
- blob.out_size = MAXSIZE;
+#if _MSC_VER < 1400
+ memcpy(tp, &i, sizeof(afs_int32));
+#else
+ err = memcpy_s(tp, sizeof(space), &i, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on tp");
+ exit(1);
+ }
+#endif
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = sizeof(afs_int32);
blob.in = space;
blob.out = space;
- code = pioctl(0, VIOC_GETALIAS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GETALIAS, &blob, 1);
if (code < 0) {
if (errno == EDOM)
break; /* done with the list */
Die(errno, 0);
return 1;
}
+ space[blob.out_size - 1] = '\0';
tp = space;
aliasName = tp;
- tp += strlen(aliasName) + 1;
+ if( FAILED(StringCbLength(aliasName, sizeof(space), &len))) {
+ fprintf (stderr, "StringCbLength failure on aliasName");
+ exit(1);
+ }
+ tp += len + 1;
realName = tp;
printf("Alias %s for cell %s\n", aliasName, realName);
}
}
static int
-CallBackRxConnCmd(struct cmd_syndesc *as, char *arock)
+CallBackRxConnCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
if (!thp) {
fprintf(stderr, "host %s not found in host table.\n", ti->data);
return 1;
- }
- else memcpy(&hostAddr, thp->h_addr, sizeof(afs_int32));
+ } else {
+#if _MSC_VER < 1400
+ memcpy(&hostAddr, thp->h_addr, sizeof(afs_int32));
+#else
+ err = memcpy_s(&hostAddr, sizeof(hostAddr), thp->h_addr, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on hostAddr");
+ exit(1);
+ }
+#endif
} else {
hostAddr = 0; /* means don't set host */
setp = 0; /* aren't setting host */
blob.in = (char *) &hostAddr;
blob.out = (char *) &hostAddr;
- code = pioctl(0, VIOC_CBADDR, &blob, 1);
+ code = pioctl_utf8(0, VIOC_CBADDR, &blob, 1);
if (code < 0) {
Die(errno, 0);
return 1;
#endif /* WIN32 */
static int
-NewCellCmd(struct cmd_syndesc *as, char *arock)
+NewCellCmd(struct cmd_syndesc *as, void *arock)
{
-#ifndef WIN32
- afs_int32 code, linkedstate=0, size=0, *lp;
+ afs_uint32 code, linkedstate=0, size=0, count=0, *lp;
+ afs_uint32 usedns=0, useregistry=0;
struct ViceIoctl blob;
struct cmd_item *ti;
- char *tp, *cellname=0;
- struct hostent *thp;
- afs_int32 fsport = 0, vlport = 0;
+ char *tp, *cellname=0, *linked_cellname=0;
+ afs_uint32 fsport = 0, vlport = 0;
+ size_t destRemaining;
- memset(space, 0, MAXHOSTS * sizeof(afs_int32));
- tp = space;
- lp = (afs_int32 *)tp;
- *lp++ = 0x12345678;
- tp += sizeof(afs_int32);
- for(ti=as->parms[1].items; ti; ti=ti->next) {
- thp = hostutil_GetHostByName(ti->data);
- if (!thp) {
- fprintf(stderr,"%s: Host %s not found in host table, skipping it.\n",
- pn, ti->data);
- }
- else {
- memcpy(tp, thp->h_addr, sizeof(afs_int32));
- tp += sizeof(afs_int32);
- }
+ if ( !IsAdmin() ) {
+ fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
+ return EACCES;
+ }
+
+ /* if there is no cell specified, use old Windows behavior */
+ if (as->parms[0].items == NULL) {
+ blob.in_size = 0;
+ blob.in = (char *) 0;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
+ blob.out = space;
+
+ code = pioctl_utf8((char *) 0, VIOCNEWCELL, &blob, 1);
+
+ if (code) {
+ Die(errno, (char *) 0);
+ return 1;
+ }
+
+ printf("Cell servers information refreshed\n");
+ return 0;
+ } else {
+ cellname = as->parms[0].items->data;
}
+
if (as->parms[2].items) {
/*
* Link the cell, for the purposes of volume location, to the specified
* cell.
*/
- cellname = as->parms[2].items->data;
+ linked_cellname = as->parms[2].items->data;
linkedstate = 1;
}
-#ifdef FS_ENABLE_SERVER_DEBUG_PORTS
+
if (as->parms[3].items) {
- code = util_GetInt32(as->parms[3].items->data, &vlport);
+ code = util_GetInt32(as->parms[2].items->data, &vlport);
if (code) {
fprintf(stderr,"fs: bad integer specified for the fileserver port.\n");
return code;
}
}
if (as->parms[4].items) {
- code = util_GetInt32(as->parms[4].items->data, &fsport);
+ code = util_GetInt32(as->parms[3].items->data, &fsport);
if (code) {
fprintf(stderr,"fs: bad integer specified for the vldb server port.\n");
return code;
}
}
-#endif
- tp = (char *)(space + (MAXHOSTS+1) *sizeof(afs_int32));
- lp = (afs_int32 *)tp;
+
+ if (as->parms[5].items) {
+ useregistry = 1;
+ }
+
+ if (as->parms[6].items) {
+ usedns = 1;
+ }
+
+ /* Count the number of hostnames */
+ for (ti=as->parms[1].items; ti && count < AFS_MAXHOSTS; ti=ti->next, count++);
+
+ if (!usedns && count == 0) {
+ fprintf( stderr, "fs: at least one vldb server must be specified.");
+ exit(1);
+ }
+
+ if (count > AFS_MAXHOSTS) {
+ fprintf( stderr, "fs: at most %u servers may be specified.", AFS_MAXHOSTS);
+ exit(1);
+ }
+
+ /*
+ * The pioctl data buffer consists of the following structure:
+ *
+ * afs_uint32 flags
+ * afs_uint32 alternative fs port
+ * afs_uint32 alternative vl port
+ * afs_uint32 count of vldb servers
+ * char[] cellname
+ * char[] linkedcell
+ * n * char[] hostnames
+ */
+
+ memset(space, 0, sizeof(space));
+ tp = space;
+ lp = (afs_uint32 *)tp;
+
+ /* flags */
+ if (usedns)
+ *lp |= VIOC_NEWCELL2_FLAG_USEDNS;
+
+ if (useregistry)
+ *lp |= VIOC_NEWCELL2_FLAG_USEREG;
+
+ if (linkedstate)
+ *lp |= VIOC_NEWCELL2_FLAG_LINKED;
+ lp++;
+
+ /* alt fs port */
*lp++ = fsport;
+
+ /* alt vl port */
*lp++ = vlport;
- *lp = linkedstate;
- strcpy(space + ((MAXHOSTS+4) * sizeof(afs_int32)), as->parms[0].items->data);
- size = ((MAXHOSTS+4) * sizeof(afs_int32)) + strlen(as->parms[0].items->data) + 1 /* for null */;
- tp = (char *)(space + size);
- if (linkedstate) {
- strcpy(tp, cellname);
- size += strlen(cellname) + 1;
- }
- blob.in_size = size;
- blob.in = space;
- blob.out_size = 0;
- code = pioctl(0, VIOCNEWCELL, &blob, 1);
- if (code < 0)
- Die(errno, 0);
- return 0;
-#else /* WIN32 */
- afs_int32 code;
- struct ViceIoctl blob;
-
- if ( !IsAdmin() ) {
- fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
- return EACCES;
+
+ /* count of server names */
+ *lp++ = count;
+
+ /* Switch back to char pointer */
+ tp = (char *)lp;
+
+ /* Add nul-terminated cellname */
+ destRemaining = sizeof(space) - (tp - space);
+ if( FAILED(StringCbCopyEx( tp,
+ destRemaining,
+ as->parms[0].items->data,
+ &tp,
+ &destRemaining,
+ STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, " not enough space for cellname");
+ exit(1);
+ }
+ /* Move beyond the terminating nul */
+ tp++;
+ destRemaining -= sizeof(char);
+
+ /* Add nul-terminated linkname */
+ if( FAILED(StringCbCopyEx( tp,
+ destRemaining,
+ linkedstate ? linked_cellname : "",
+ &tp,
+ &destRemaining,
+ STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, " not enough space for linked cellname");
+ exit(1);
+ }
+ /* Move beyond the terminating nul */
+ tp++;
+ destRemaining -= sizeof(char);
+
+ /* Add the servers */
+ for (ti=as->parms[1].items; ti; ti=ti->next) {
+ if( FAILED(StringCbCopyEx( tp,
+ destRemaining,
+ ti->data,
+ &tp,
+ &destRemaining,
+ STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, " not enough space for server %s", ti->data);
+ exit(1);
+ }
+ /* Move beyond the terminating nul */
+ tp++;
+ destRemaining -= sizeof(char);
}
- blob.in_size = 0;
- blob.in = (char *) 0;
- blob.out_size = MAXSIZE;
+ blob.in_size = (tp - space);
+ blob.in = space;
+ blob.out_size = 0;
blob.out = space;
-
- code = pioctl((char *) 0, VIOCNEWCELL, &blob, 1);
+ code = pioctl_utf8(NULL, VIOCNEWCELL2, &blob, 1);
if (code) {
- Die(errno, (char *) 0);
+ Die(errno, as->parms[0].items->data);
return 1;
}
- printf("Cell servers information refreshed\n");
+ printf("Cell servers information for %s added or updated.\n",
+ as->parms[0].items->data);
return 0;
-#endif /* WIN32 */
}
#ifndef WIN32
static int
-NewAliasCmd(struct cmd_syndesc *as, char *arock)
+NewAliasCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
char *tp;
char *aliasName, *realName;
+ size_t destRemaining = sizeof(space);
/* Setup and do the NEWALIAS pioctl call */
aliasName = as->parms[0].items->data;
realName = as->parms[1].items->data;
tp = space;
- strcpy(tp, aliasName);
- tp += strlen(aliasName) + 1;
- strcpy(tp, realName);
- tp += strlen(realName) + 1;
+ if( FAILED(StringCbCopyEx(tp, destRemaining, aliasName, &tp, &destRemaining, STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, "tp - not enough space");
+ exit(1);
+ }
+ tp++;
+ destRemaining -= sizeof(char);
+ if( FAILED(StringCbCopyEx(tp, destRemaining, realName, &tp, &destRemaining, STRSAFE_FILL_ON_FAILURE))) {
+ fprintf (stderr, "tp - not enough space");
+ exit(1);
+ }
+ tp++;
+ destRemaining -= sizeof(char);
blob.in_size = tp - space;
blob.in = space;
blob.out_size = 0;
blob.out = space;
- code = pioctl(0, VIOC_NEWALIAS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_NEWALIAS, &blob, 1);
if (code < 0) {
if (errno == EEXIST) {
fprintf(stderr,
#endif /* WIN32 */
static int
-WhichCellCmd(struct cmd_syndesc *as, char *arock)
+WhichCellCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct cmd_item *ti;
+ struct ViceIoctl blob;
int error = 0;
- char cell[MAXCELLCHARS]="";
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+
+ if (as->parms[1].items)
+ literal = 1;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
- code = GetCell(ti->data, cell);
+ cm_fid_t fid;
+ afs_uint32 filetype;
+ char cell[CELL_MAXNAMELEN];
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl_utf8(ti->data, VIOCGETFID, &blob, 1) &&
+ blob.out_size == sizeof(cm_fid_t)) {
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
+
+ code = pioctl_utf8(ti->data, VIOC_GETFILETYPE, &blob, 1);
+ if (code || blob.out_size != sizeof(filetype)) {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+ blob.out_size = CELL_MAXNAMELEN;
+ blob.out = cell;
+
+ code = pioctl_utf8(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
if (code) {
if (errno == ENOENT)
fprintf(stderr,"%s: no such cell as '%s'\n", pn, ti->data);
error = 1;
continue;
}
- printf("File %s lives in cell '%s'\n", ti->data, cell);
+ cell[CELL_MAXNAMELEN - 1] = '\0';
+ printf("%s %s lives in cell '%s'\n",
+ filetypestr(filetype),
+ ti->data, cell);
}
return error;
}
static int
-WSCellCmd(struct cmd_syndesc *as, char *arock)
+WSCellCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
blob.in_size = 0;
blob.in = NULL;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
- code = pioctl(NULL, VIOC_GET_WS_CELL, &blob, 1);
+ code = pioctl_utf8(NULL, VIOC_GET_WS_CELL, &blob, 1);
if (code) {
Die(errno, NULL);
return 1;
}
-
+ space[AFS_PIOCTL_MAXSIZE - 1] = '\0';
printf("This workstation belongs to cell '%s'\n", space);
return 0;
}
/*
static int
-PrimaryCellCmd(struct cmd_syndesc *as, char *arock)
+PrimaryCellCmd(struct cmd_syndesc *as, void *arock)
{
fprintf(stderr,"This command is obsolete, as is the concept of a primary token.\n");
return 0;
}
*/
+#ifndef AFS_NT40_ENV
static int
-MonitorCmd(struct cmd_syndesc *as, char *arock)
+MonitorCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
struct hostent *thp;
char *tp;
int setp;
+ errno_t err;
ti = as->parms[0].items;
setp = 1;
return 1;
}
} else {
+#if _MSC_VER < 1400
memcpy(&hostAddr, thp->h_addr, sizeof(afs_int32));
- }
+#else
+ err = memcpy_s(&hostAddr, sizeof(hostAddr), thp->h_addr, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on hostAddr");
+ exit(1);
+ }
+#endif
+ }
}
} else {
hostAddr = 0; /* means don't set host */
blob.out_size = sizeof(afs_int32);
blob.in = (char *) &hostAddr;
blob.out = (char *) &hostAddr;
- code = pioctl(0, VIOC_AFS_MARINER_HOST, &blob, 1);
- if (code) {
+ code = pioctl_utf8(0, VIOC_AFS_MARINER_HOST, &blob, 1);
+ if (code || blob.out_size != sizeof(afs_int32)) {
Die(errno, 0);
return 1;
}
}
return 0;
}
+#endif /* AFS_NT40_ENV */
static int
-SysNameCmd(struct cmd_syndesc *as, char *arock)
+SysNameCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
struct cmd_item *ti;
char *input = space;
afs_int32 setp = 0;
+ errno_t err;
+ size_t destRemaining = sizeof(space);
+ size_t len;
ti = as->parms[0].items;
if (ti) {
blob.in = space;
blob.out = space;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.in_size = sizeof(afs_int32);
+#if _MSC_VER < 1400
memcpy(input, &setp, sizeof(afs_int32));
+#else
+ err = memcpy_s(input, destRemaining, &setp, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on input");
+ exit(1);
+ }
+#endif
input += sizeof(afs_int32);
+ destRemaining -= sizeof(afs_int32);
for (; ti; ti = ti->next) {
setp++;
- blob.in_size += strlen(ti->data) + 1;
- if (blob.in_size > MAXSIZE) {
+ if( FAILED(StringCbCopyEx(input, destRemaining, ti->data, &input, &destRemaining, STRSAFE_FILL_ON_FAILURE))) {
fprintf(stderr, "%s: sysname%s too long.\n", pn,
setp > 1 ? "s" : "");
return 1;
}
- strcpy(input, ti->data);
- input += strlen(ti->data);
- *(input++) = '\0';
+ input++;
+ destRemaining -= sizeof(char);
}
+ blob.in_size = (input - space) * sizeof(char);
+#if _MSC_VER < 1400
memcpy(space, &setp, sizeof(afs_int32));
- code = pioctl(0, VIOC_AFS_SYSNAME, &blob, 1);
+#else
+ err = memcpy_s(space, sizeof(space), &setp, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on space");
+ exit(1);
+ }
+#endif
+
+ code = pioctl_utf8(0, VIOC_AFS_SYSNAME, &blob, 1);
if (code) {
Die(errno, 0);
return 1;
}
input = space;
+#if _MSC_VER < 1400
memcpy(&setp, input, sizeof(afs_int32));
+#else
+ err = memcpy_s(&setp, sizeof(setp), input, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on setp");
+ exit(1);
+ }
+#endif
input += sizeof(afs_int32);
if (!setp) {
fprintf(stderr,"No sysname name value was found\n");
return 1;
}
-
+ space[blob.out_size - 1] = '\0';
printf("Current sysname%s is", setp > 1 ? " list" : "");
for (; setp > 0; --setp ) {
printf(" \'%s\'", input);
- input += strlen(input) + 1;
+ if( FAILED(StringCbLength(input, sizeof(space) - (input - space), &len))) {
+ fprintf (stderr, "StringCbLength failure on input");
+ exit(1);
+ }
+ input += len + 1;
}
printf("\n");
return 0;
}
+#ifndef AFS_NT40_ENV
static char *exported_types[] = {"null", "nfs", ""};
-static int ExportAfsCmd(struct cmd_syndesc *as, char *arock)
+static int ExportAfsCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
blob.in_size = sizeof(afs_int32);
blob.out = (char *) &exportcall;
blob.out_size = sizeof(afs_int32);
- code = pioctl(0, VIOC_EXPORTAFS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_EXPORTAFS, &blob, 1);
if (code) {
if (errno == ENODEV) {
fprintf(stderr,
}
return 0;
}
-
+#endif
static int
-GetCellCmd(struct cmd_syndesc *as, char *arock)
+GetCellCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
afs_int32 junk;
} args;
int error = 0;
+ size_t len;
+ memset(&info, 0, sizeof(info));
memset(&args, 0, sizeof(args)); /* avoid Purify UMR error */
for(ti=as->parms[0].items; ti; ti=ti->next) {
/* once per cell */
error = 1;
continue;
}
- blob.in_size = 1+strlen(info.name);
+ if (info.linkedCell)
+ free(info.linkedCell);
+ if( FAILED(StringCbLength(info.name, sizeof(info.name), &len))) {
+ fprintf (stderr, "StringCbLength failure on info.name");
+ exit(1);
+ }
+ blob.in_size = 1+(long)len;
blob.in = info.name;
- code = pioctl(0, VIOC_GETCELLSTATUS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GETCELLSTATUS, &blob, 1);
if (code) {
if (errno == ENOENT)
fprintf(stderr,"%s: the cell named '%s' does not exist\n", pn, info.name);
return error;
}
-static int SetCellCmd(struct cmd_syndesc *as, char *arock)
+static int SetCellCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
} args;
int error = 0;
+ memset(&info, 0, sizeof(info));
+
/* Check arguments. */
if (as->parms[1].items && as->parms[2].items) {
fprintf(stderr, "Cannot specify both -suid and -nosuid.\n");
error = 1;
continue;
}
- strcpy(args.cname, info.name);
+ if (info.linkedCell)
+ free(info.linkedCell);
+ if( FAILED(StringCbCopy(args.cname, sizeof(args.cname), info.name))) {
+ fprintf (stderr, "cname - not enough space");
+ exit(1);
+ }
blob.in_size = sizeof(args);
blob.in = (caddr_t) &args;
blob.out_size = 0;
blob.out = (caddr_t) 0;
- code = pioctl(0, VIOC_SETCELLSTATUS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_SETCELLSTATUS, &blob, 1);
if (code) {
Die(errno, info.name); /* XXX added cell name to Die() call */
error = 1;
return error;
}
-#ifdef WIN32
static int
GetCellName(char *cellNamep, struct afsconf_cell *infop)
{
- strcpy(infop->name, cellNamep);
- return 0;
-}
-
-static int
-VLDBInit(int noAuthFlag, struct afsconf_cell *infop)
-{
- return 0;
-}
-#else /* not WIN32 */
-static int
-GetCellName(char *cellName, struct afsconf_cell *info)
-{
- struct afsconf_dir *tdir;
- int code;
-
- tdir = afsconf_Open(AFSDIR_CLIENT_ETC_CLIENTNAME);
- if (!tdir) {
- fprintf(stderr,
- "Could not process files in configuration directory (%s).\n",
- AFSDIR_CLIENT_ETC_CLIENTNAME);
- return -1;
+ if( FAILED(StringCbCopy(infop->name, sizeof(infop->name), cellNamep))) {
+ fprintf (stderr, "name - not enough space");
+ exit(1);
}
-
- code = afsconf_GetCellInfo(tdir, cellName, AFSCONF_VLDBSERVICE, info);
- if (code) {
- fprintf(stderr,"fs: cell %s not in %s/CellServDB\n", cellName,
- AFSDIR_CLIENT_ETC_CLIENTNAME);
- return code;
- }
-
return 0;
}
-
static int
VLDBInit(int noAuthFlag, struct afsconf_cell *info)
{
afs_int32 code;
+ char confDir[257];
+
+ cm_GetConfigDir(confDir, sizeof(confDir));
- code = ugen_ClientInit(noAuthFlag, AFSDIR_CLIENT_ETC_DIRPATH,
+ code = ugen_ClientInit(noAuthFlag, confDir,
info->name, 0, &uclient,
NULL, pn, rxkad_clear,
VLDB_MAXSERVERS, AFSCONF_VLDBSERVICE, 50,
rxInitDone = 1;
return code;
}
-#endif /* not WIN32 */
static struct ViceIoctl gblob;
static int debug = 0;
{
int code;
cm_SSetPref_t *ssp;
- code = pioctl(0, VIOC_SETSPREFS, &gblob, 1);
+ code = pioctl_utf8(0, VIOC_SETSPREFS, &gblob, 1);
ssp = (cm_SSetPref_t *)space;
- gblob.in_size = ((char *)&(ssp->servers[0])) - (char *)ssp;
+ gblob.in_size = (long)(((char *)&(ssp->servers[0])) - (char *)ssp);
gblob.in = space;
return code;
}
{
int code;
- code = pioctl(0, VIOC_SETSPREFS, &gblob, 1);
+ code = pioctl_utf8(0, VIOC_SETSPREFS, &gblob, 1);
if (code && (errno == EINVAL)) {
struct setspref *ssp;
ssp = (struct setspref *)gblob.in;
if (!(ssp->flags & DBservers)) {
gblob.in = (void *)&(ssp->servers[0]);
gblob.in_size -= ((char *)&(ssp->servers[0])) - (char *)ssp;
- code = pioctl(0, VIOC_SETSPREFS33, &gblob, 1);
+ code = pioctl_utf8(0, VIOC_SETSPREFS33, &gblob, 1);
return code ? errno : 0;
}
fprintf(stderr,
cm_SSetPref_t *ssp;
cm_SPref_t *sp;
struct hostent *thostent;
+ errno_t err;
#ifndef MAXUSHORT
#ifdef MAXSHORT
}
sp = (cm_SPref_t *)((char*)gblob.in + gblob.in_size);
+#if _MSC_VER < 1400
memcpy (&(sp->host.s_addr), thostent->h_addr, sizeof(afs_uint32));
+#else
+ err = memcpy_s (&(sp->host.s_addr), sizeof(afs_uint32), thostent->h_addr, sizeof(afs_uint32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on sp->host.s_addr");
+ exit(1);
+ }
+#endif
+
sp->rank = (rank > MAXUSHORT ? MAXUSHORT : rank);
gblob.in_size += sizeof(cm_SPref_t);
ssp->num_servers++;
struct hostent *thostent;
afs_uint32 addr;
int error = 0;
+ errno_t err;
#ifndef MAXUSHORT
#ifdef MAXSHORT
}
sp = (struct spref *)(gblob.in + gblob.in_size);
- memcpy(&(sp->server.s_addr), thostent->h_addr_list[t],
+#if _MSC_VER < 1400
+ memcpy(&(sp->server.s_addr), thostent->h_addr_list[t],
sizeof(afs_uint32));
+#else
+ err = memcpy_s(&(sp->server.s_addr), sizeof(afs_uint32), thostent->h_addr_list[t],
+ sizeof(afs_uint32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on sp->server.s_addr");
+ exit(1);
+ }
+#endif
+
sp->rank = (rank > MAXUSHORT ? MAXUSHORT : rank);
gblob.in_size += sizeof(struct spref);
ssp->num_servers++;
#ifdef WIN32
static int
-SetPrefCmd(struct cmd_syndesc *as, char * arock)
+SetPrefCmd(struct cmd_syndesc *as, void * arock)
{
FILE *infd;
afs_int32 code;
ssp = (cm_SSetPref_t *)space;
ssp->flags = 0;
ssp->num_servers = 0;
- gblob.in_size = ((char*)&(ssp->servers[0])) - (char *)ssp;
+ gblob.in_size = (long)(((char*)&(ssp->servers[0])) - (char *)ssp);
gblob.in = space;
gblob.out = space;
- gblob.out_size = MAXSIZE;
+ gblob.out_size = AFS_PIOCTL_MAXSIZE;
if ( !IsAdmin() ) {
fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
if (!(infd = fopen(ti->data,"r" ))) {
code = errno;
Die(errno,ti->data);
- }
- else
+ } else {
+#if _MSC_VER < 1400
while ( fscanf(infd, "%79s%ld", name, &rank) != EOF) {
code = addServer (name, (unsigned short) rank);
}
+#else
+ while ( fscanf_s(infd, "%79s%ld", name, sizeof(name), &rank) != EOF) {
+ code = addServer (name, (unsigned short) rank);
+ }
+#endif
+ }
}
+
ti = as->parms[3].items; /* -stdin */
if (ti) {
- while ( scanf("%79s%ld", name, &rank) != EOF) {
+#if _MSC_VER < 1400
+ while ( scanf("%79s%ld", name, &rank) != EOF) {
code = addServer (name, (unsigned short) rank);
}
+#else
+ while ( scanf_s("%79s%ld", name, sizeof(name), &rank) != EOF) {
+ code = addServer (name, (unsigned short) rank);
+ }
+#endif
}
for (ti = as->parms[0].items;ti;ti=ti->next) {/*list of servers, ranks */
printf("now working on vlservers, code=%d, errno=%d\n",code,errno);
ssp = (cm_SSetPref_t *)space;
- gblob.in_size = ((char*)&(ssp->servers[0])) - (char *)ssp;
+ gblob.in_size = (long)(((char*)&(ssp->servers[0])) - (char *)ssp);
gblob.in = space;
ssp->flags = CM_SPREF_VLONLY;
ssp->num_servers = 0;
}
#else
static int
-SetPrefCmd(struct cmd_syndesc *as, char *arock)
+SetPrefCmd(struct cmd_syndesc *as, void *arock)
{
FILE *infd;
afs_int32 code;
gblob.in_size = ((char *)&(ssp->servers[0])) - (char *)ssp;
gblob.in = space;
gblob.out = space;
- gblob.out_size = MAXSIZE;
+ gblob.out_size = AFS_PIOCTL_MAXSIZE;
if (geteuid()) {
perror(ti->data);
error = -1;
} else {
- while (fscanf(infd, "%79s%ld", name, &rank) != EOF) {
+#if _MSC_VER < 1400
+ while (fscanf(infd, "%79s%ld", name, &rank) != EOF) {
+ code = addServer(name, (unsigned short)rank);
+ if (code)
+ error = code;
+ }
+#else
+ while (fscanf_s(infd, "%79s%ld", name, sizeof(name), &rank) != EOF) {
code = addServer(name, (unsigned short)rank);
if (code)
error = code;
}
+#endif
+
}
}
ti = as->parms[3].items; /* -stdin */
if (ti) {
+#if _MSC_VER < 1400
while (scanf("%79s%ld", name, &rank) != EOF) {
code = addServer(name, (unsigned short)rank);
if (code)
error = code;
}
+#else
+ while (scanf_s("%79s%ld", name, sizeof(name), &rank) != EOF) {
+ code = addServer(name, (unsigned short)rank);
+ if (code)
+ error = code;
+ }
+#endif
}
for (ti = as->parms[0].items; ti; ti = ti->next) { /* list of servers, ranks */
#ifdef WIN32
static int
-GetPrefCmd(struct cmd_syndesc *as, char *arock)
+GetPrefCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct cmd_item *ti;
blob.in_size=sizeof(struct cm_SPrefRequest);
blob.in = (char *)in;
blob.out = space;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
- in->num_servers = (MAXSIZE - 2*sizeof(short))/sizeof(struct cm_SPref);
+ in->num_servers = (AFS_PIOCTL_MAXSIZE - 2*sizeof(short))/sizeof(struct cm_SPref);
in->flags = vlservers;
- code = pioctl(0, VIOC_GETSPREFS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GETSPREFS, &blob, 1);
if (code){
perror("getserverprefs pioctl");
Die (errno,0);
}
else {
addr = ntohl(out->servers[i].host.s_addr);
- sprintf(tbuffer, "%d.%d.%d.%d", (addr>>24) & 0xff, (addr>>16) & 0xff,
- (addr>>8) & 0xff, addr & 0xff);
+ if( FAILED(StringCbPrintf(tbuffer, sizeof(tbuffer), "%d.%d.%d.%d", (addr>>24) & 0xff, (addr>>16) & 0xff,
+ (addr>>8) & 0xff, addr & 0xff))) {
+ fprintf (stderr, "tbuffer - cannot be populated");
+ exit(1);
+ }
name=tbuffer;
}
printf ("%-50s %5u\n",name,out->servers[i].rank);
}
#else
static int
-GetPrefCmd(struct cmd_syndesc *as, char *arock)
+GetPrefCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct cmd_item *ti;
blob.in_size = sizeof(struct sprefrequest);
blob.in = (char *)in;
blob.out = space;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
in->num_servers =
- (MAXSIZE - 2 * sizeof(short)) / sizeof(struct spref);
+ (AFS_PIOCTL_MAXSIZE - 2 * sizeof(short)) / sizeof(struct spref);
in->flags = vlservers;
- code = pioctl(0, VIOC_GETSPREFS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GETSPREFS, &blob, 1);
if (code) {
perror("getserverprefs pioctl");
return 1;
name = hostutil_GetNameByINet(out->servers[i].server.s_addr);
} else {
addr = ntohl(out->servers[i].server.s_addr);
- sprintf(tbuffer, "%d.%d.%d.%d", (addr >> 24) & 0xff,
- (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
+ if( FAILED(StringCbPrintf(tbuffer, sizeof(tbuffer), "%d.%d.%d.%d", (addr >> 24) & 0xff,
+ (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff))) {
+ fprintf (stderr, "tbuffer - cannot be populated");
+ exit(1);
+ }
name = tbuffer;
}
printf("%-50s %5u\n", name, out->servers[i].rank);
}
#endif /* WIN32 */
+static afs_int32
+SmbUnicodeCmd(struct cmd_syndesc * asp, void * arock)
+{
+ long inValue = 0;
+ long outValue = 0;
+ long code;
+
+ struct ViceIoctl blob;
+
+ if (asp->parms[0].items) {
+ /* On */
+
+ inValue = 3;
+ } else if (asp->parms[1].items) {
+ /* Off */
+
+ inValue = 2;
+ }
+
+ if (inValue != 0 && !IsAdmin()) {
+ fprintf (stderr, "Permission denied: Requires AFS Client Administrator access.\n");
+ return EACCES;
+ }
+
+ blob.in_size = sizeof(inValue);
+ blob.in = (char *) &inValue;
+ blob.out_size = sizeof(outValue);
+ blob.out = (char *) &outValue;
+
+ code = pioctl_utf8(NULL, VIOC_UNICODECTL, &blob, 1);
+ if (code) {
+ Die(errno, NULL);
+ return code;
+ }
+
+ if (outValue != 2) {
+ printf("Unicode support is %s%s.\n",
+ ((outValue != 0)? "enabled":"disabled"),
+ ((inValue != 0)? " for new SMB connections":""));
+ } else {
+ printf("Unicode support is absent in this installation of OpenAFS.\n");
+ }
+
+ return 0;
+}
+
static int
-TraceCmd(struct cmd_syndesc *asp, char *arock)
+GetFidCmd(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 code;
+ struct ViceIoctl blob;
+ struct cmd_item *ti;
+ int error = 0;
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+
+ if (as->parms[1].items)
+ literal = 1;
+
+ SetDotDefault(&as->parms[0].items);
+ for(ti=as->parms[0].items; ti; ti=ti->next) {
+ cm_fid_t fid;
+ afs_uint32 filetype;
+ char cell[CELL_MAXNAMELEN];
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl_utf8(ti->data, VIOCGETFID, &blob, 1) &&
+ blob.out_size == sizeof(cm_fid_t)) {
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
+
+ code = pioctl_utf8(ti->data, VIOC_GETFILETYPE, &blob, 1);
+ if (code || blob.out_size != sizeof(filetype)) {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+ blob.out_size = CELL_MAXNAMELEN;
+ blob.out = cell;
+
+ code = pioctl_utf8(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
+ if (code == 0)
+ cell[CELL_MAXNAMELEN - 1] = '\0';
+ printf("%s %s (%u.%u.%u) contained in cell %s\n",
+ filetypestr(filetype),
+ ti->data, fid.volume, fid.vnode, fid.unique,
+ code ? "unknown-cell" : cell);
+ }
+ return error;
+}
+
+static int
+UuidCmd(struct cmd_syndesc *asp, void *arock)
+{
+ long code;
+ long inValue;
+ afsUUID outValue;
+ struct ViceIoctl blob;
+ char * uuidstring = NULL;
+
+ if (asp->parms[0].items) {
+#ifdef WIN32
+ if ( !IsAdmin() ) {
+ fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
+ return EACCES;
+ }
+#else
+ if (geteuid()) {
+ fprintf (stderr, "Permission denied: requires root access.\n");
+ return EACCES;
+ }
+#endif
+ inValue = 1; /* generate new UUID */
+ } else {
+ inValue = 0; /* just show the current UUID */
+ }
+
+ blob.in_size = sizeof(inValue);
+ blob.in = (char *) &inValue;
+ blob.out_size = sizeof(outValue);
+ blob.out = (char *) &outValue;
+
+ code = pioctl_utf8(NULL, VIOC_UUIDCTL, &blob, 1);
+ if (code || blob.out_size != sizeof(outValue)) {
+ Die(errno, NULL);
+ return code;
+ }
+
+ UuidToString((UUID *) &outValue, &uuidstring);
+
+ printf("%sUUID: %s",
+ ((inValue == 1)?"New ":""),
+ uuidstring);
+
+ if (uuidstring)
+ RpcStringFree(&uuidstring);
+
+ return 0;
+}
+
+static int
+TraceCmd(struct cmd_syndesc *asp, void *arock)
{
long code;
struct ViceIoctl blob;
blob.out_size = sizeof(long);
blob.out = (char *) &outValue;
- code = pioctl(NULL, VIOC_TRACECTL, &blob, 1);
- if (code) {
+ code = pioctl_utf8(NULL, VIOC_TRACECTL, &blob, 1);
+ if (code || blob.out_size != sizeof(long)) {
Die(errno, NULL);
return code;
}
/* fs sb -kbytes 9999 -files *.o -default 64 */
static int
-StoreBehindCmd(struct cmd_syndesc *as, char *arock)
+StoreBehindCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code = 0;
struct ViceIoctl blob;
return 1;
}
tsb.sb_thisfile = strtol(ti->data, &t, 10) * 1024;
- if ((tsb.sb_thisfile < 0) || (t != ti->data + strlen(ti->data))) {
+ if (errno == ERANGE) {
+ fprintf(stderr, "%s: ti->data must within long int range", pn);
+ return 1;
+ }
+ if ((tsb.sb_thisfile < 0) || (*t != '\0')) {
fprintf(stderr, "%s: %s must be 0 or a positive number.\n", pn,
ti->data);
return 1;
ti = as->parms[2].items; /* -allfiles */
if (ti) {
allfiles = strtol(ti->data, &t, 10) * 1024;
- if ((allfiles < 0) || (t != ti->data + strlen(ti->data))) {
+ if (errno == ERANGE) {
+ fprintf(stderr, "%s: ti->data must within long int range", pn);
+ return 1;
+ }
+ if ((allfiles < 0) || (*t != '\0')) {
fprintf(stderr, "%s: %s must be 0 or a positive number.\n", pn,
ti->data);
return 1;
/* once per -file */
for (ti = as->parms[1].items; ti; ti = ti->next) {
/* Do this solely to see if the file is there */
- code = pioctl(ti->data, VIOCWHEREIS, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOCWHEREIS, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
continue;
}
- code = pioctl(ti->data, VIOC_STOREBEHIND, &blob, 1);
+ code = pioctl_utf8(ti->data, VIOC_STOREBEHIND, &blob, 1);
if (code) {
Die(errno, ti->data);
error = 1;
*/
if (!as->parms[1].items || (allfiles != -1)) {
tsb.sb_default = allfiles;
- code = pioctl(0, VIOC_STOREBEHIND, &blob, 1);
+ code = pioctl_utf8(0, VIOC_STOREBEHIND, &blob, 1);
if (code) {
Die(errno, ((allfiles == -1) ? 0 : "-allfiles"));
error = 1;
}
static afs_int32
-SetCryptCmd(struct cmd_syndesc *as, char *arock)
+SetCryptCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code = 0, flag;
struct ViceIoctl blob;
flag = 1;
else if (strcmp(tp, "off") == 0)
flag = 0;
+ else if (strcmp(tp, "auth") == 0)
+ flag = 2;
else {
- fprintf (stderr, "%s: %s must be \"on\" or \"off\".\n", pn, tp);
+ fprintf (stderr, "%s: %s must be \"on\", \"auth\", or \"off\".\n", pn, tp);
return EINVAL;
}
blob.in = (char *) &flag;
blob.in_size = sizeof(flag);
blob.out_size = 0;
- code = pioctl(0, VIOC_SETRXKCRYPT, &blob, 1);
+ code = pioctl_utf8(0, VIOC_SETRXKCRYPT, &blob, 1);
if (code)
Die(code, NULL);
return 0;
}
static afs_int32
-GetCryptCmd(struct cmd_syndesc *as, char *arock)
+GetCryptCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code = 0, flag;
struct ViceIoctl blob;
char *tp;
+ errno_t err;
blob.in = NULL;
blob.in_size = 0;
blob.out_size = sizeof(flag);
blob.out = space;
- code = pioctl(0, VIOC_GETRXKCRYPT, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GETRXKCRYPT, &blob, 1);
- if (code)
+ if (code || blob.out_size != sizeof(flag))
Die(code, NULL);
else {
- tp = space;
- memcpy(&flag, tp, sizeof(afs_int32));
+ tp = space;
+#if _MSC_VER < 1400
+ memcpy(&flag, tp, sizeof(afs_int32));
+#else
+ err = memcpy_s(&flag, sizeof(flag), tp, sizeof(afs_int32));
+ if ( err ) {
+ fprintf (stderr, "memcpy_s failure on flag");
+ exit(1);
+ }
+#endif
+
printf("Security level is currently ");
- if (flag == 1)
+ if (flag == 2)
+ printf("auth (data integrity).\n");
+ else if (flag == 1)
printf("crypt (data security).\n");
else
printf("clear.\n");
}
static int
-MemDumpCmd(struct cmd_syndesc *asp, char *arock)
+MemDumpCmd(struct cmd_syndesc *asp, void *arock)
{
long code;
struct ViceIoctl blob;
blob.out_size = sizeof(long);
blob.out = (char *) &outValue;
- code = pioctl(NULL, VIOC_TRACEMEMDUMP, &blob, 1);
- if (code) {
+ code = pioctl_utf8(NULL, VIOC_TRACEMEMDUMP, &blob, 1);
+ if (code || blob.out_size != sizeof(long)) {
Die(errno, NULL);
return code;
}
- if (outValue) {
+ if (!outValue) {
printf("AFS memdump created.\n");
return 0;
} else {
}
static int
-MiniDumpCmd(struct cmd_syndesc *asp, char *arock)
+MiniDumpCmd(struct cmd_syndesc *asp, void *arock)
{
BOOL success = 0;
SERVICE_STATUS status;
}
static int
-CSCPolicyCmd(struct cmd_syndesc *asp, char *arock)
+CSCPolicyCmd(struct cmd_syndesc *asp, void *arock)
{
struct cmd_item *ti;
char *share = NULL;
HKEY hkCSCPolicy;
+ size_t len;
if ( !IsAdmin() ) {
fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
0,
"AFS",
REG_OPTION_NON_VOLATILE,
- KEY_WRITE,
+ (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE,
NULL,
&hkCSCPolicy,
NULL );
}
policy = "manual";
+ len = 6;
- if (asp->parms[1].items)
+ if (asp->parms[1].items) {
policy = "manual";
- if (asp->parms[2].items)
+ len = 6;
+ }
+ if (asp->parms[2].items) {
policy = "programs";
- if (asp->parms[3].items)
+ len = 8;
+ }
+ if (asp->parms[3].items) {
policy = "documents";
- if (asp->parms[4].items)
+ len = 9;
+ }
+ if (asp->parms[4].items) {
policy = "disable";
-
- RegSetValueEx( hkCSCPolicy, share, 0, REG_SZ, policy, strlen(policy)+1);
+ len = 7;
+ }
+ RegSetValueEx( hkCSCPolicy, share, 0, REG_SZ, policy, (DWORD)len+1);
printf("CSC policy on share \"%s\" changed to \"%s\".\n\n", share, policy);
printf("Close all applications that accessed files on this share or restart AFS Client for the change to take effect.\n");
0,
"AFS",
REG_OPTION_NON_VOLATILE,
- KEY_READ|KEY_QUERY_VALUE,
+ (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ|KEY_QUERY_VALUE,
NULL,
&hkCSCPolicy,
NULL );
#ifndef WIN32
/* get clients interface addresses */
static int
-GetClientAddrsCmd(struct cmd_syndesc *as, char *arock)
+GetClientAddrsCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct cmd_item *ti;
blob.in_size = sizeof(struct sprefrequest);
blob.in = (char *)in;
blob.out = space;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
in->num_servers =
- (MAXSIZE - 2 * sizeof(short)) / sizeof(struct spref);
+ (AFS_PIOCTL_MAXSIZE - 2 * sizeof(short)) / sizeof(struct spref);
/* returns addr in network byte order */
- code = pioctl(0, VIOC_GETCPREFS, &blob, 1);
+ code = pioctl_utf8(0, VIOC_GETCPREFS, &blob, 1);
if (code) {
perror("getClientInterfaceAddr pioctl");
return 1;
afs_int32 addr;
char tbuffer[32];
addr = ntohl(out->servers[i].server.s_addr);
- sprintf(tbuffer, "%d.%d.%d.%d", (addr >> 24) & 0xff,
- (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
+ if( FAILED(StringCbPrintf(tbuffer, sizeof(tbuffer), "%d.%d.%d.%d", (addr >> 24) & 0xff,
+ (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff))) {
+ fprintf (stderr, "tbuffer - cannot be populated");
+ exit(1);
+ }
printf("%-50s\n", tbuffer);
}
in->offset = out->next_offset;
}
static int
-SetClientAddrsCmd(struct cmd_syndesc *as, char *arock)
+SetClientAddrsCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code, addr;
struct cmd_item *ti;
ssp->num_servers = 0;
blob.in = space;
blob.out = space;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
if (geteuid()) {
fprintf(stderr, "Permission denied: requires root access.\n");
}
blob.in_size = sizeUsed - sizeof(struct spref);
- code = pioctl(0, VIOC_SETCPREFS, &blob, 1); /* network order */
+ code = pioctl_utf8(0, VIOC_SETCPREFS, &blob, 1); /* network order */
if (code) {
Die(errno, 0);
error = 1;
}
static int
-FlushMountCmd(struct cmd_syndesc *as, char *arock)
+FlushMountCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
struct ViceIoctl blob;
int link_chars_read; /*Num chars read in readlink() */
int thru_symlink; /*Did we get to a mount point via a symlink? */
int error = 0;
+ size_t len;
for (ti = as->parms[0].items; ti; ti = ti->next) {
/* once per file */
thru_symlink = 0;
- sprintf(orig_name, "%s%s", (ti->data[0] == '/') ? "" : "./",
- ti->data);
+ if( FAILED(StringCbPrintf(orig_name, sizeof(orig_name), "%s%s", (ti->data[0] == '/') ? "" : "./",
+ ti->data))) {
+ fprintf (stderr, "orig_name - cannot be populated");
+ exit(1);
+ }
if (lstat(orig_name, &statbuff) < 0) {
/* if lstat fails, we should still try the pioctl, since it
*/
if (true_name[0] != '/') {
last_component = (char *)strrchr(orig_name, '/');
- strcpy(++last_component, true_name);
- strcpy(true_name, orig_name);
+ if( FAILED(StringCbCopy(++last_component, sizeof(orig_name) - (last_component - orig_name) * sizeof(char), true_name))) {
+ fprintf (stderr, "last_component - not enough space");
+ exit(1);
+ }
+ if( FAILED(StringCbCopy(true_name, sizeof(true_name), orig_name))) {
+ fprintf (stderr, "true_name - not enough space");
+ exit(1);
+ }
}
- } else
- strcpy(true_name, orig_name);
-
+ } else {
+ if( FAILED(StringCbCopy(true_name, sizeof(true_name), orig_name))) {
+ fprintf (stderr, "true_name - not enough space");
+ exit(1);
+ }
+ }
/*
* Find rightmost slash, if any.
*/
* Found it. Designate everything before it as the parent directory,
* everything after it as the final component.
*/
- strncpy(parent_dir, true_name, last_component - true_name);
+ if( FAILED(StringCchCopyN(parent_dir, sizeof(parent_dir) / sizeof(char), true_name, last_component - true_name))) {
+ fprintf (stderr, "parent_dir - not enough space");
+ exit(1);
+ }
parent_dir[last_component - true_name] = 0;
last_component++; /*Skip the slash */
} else {
* No slash appears in the given file name. Set parent_dir to the current
* directory, and the last component as the given name.
*/
- strcpy(parent_dir, ".");
+ if( FAILED(StringCbCopy(parent_dir, sizeof(parent_dir), "."))) {
+ fprintf (stderr, "parent_dir - not enough space");
+ exit(1);
+ }
last_component = true_name;
}
}
blob.in = last_component;
- blob.in_size = strlen(last_component) + 1;
+ if( FAILED(StringCbLength(last_component, sizeof(true_name) - (last_component - true_name), &len))) {
+ fprintf (stderr, "StringCbLength failure on last_component");
+ exit(1);
+ }
+ blob.in_size = len + 1;
blob.out_size = 0;
- memset(space, 0, MAXSIZE);
+ memset(space, 0, AFS_PIOCTL_MAXSIZE);
- code = pioctl(parent_dir, VIOC_AFS_FLUSHMOUNT, &blob, 1);
+ code = pioctl_utf8(parent_dir, VIOC_AFS_FLUSHMOUNT, &blob, 1);
if (code != 0) {
if (errno == EINVAL) {
}
return error;
}
+#endif /* WIN32 */
static int
-RxStatProcCmd(struct cmd_syndesc *as, char *arock)
+RxStatProcCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
afs_int32 flags = 0;
struct ViceIoctl blob;
- struct cmd_item *ti;
if (as->parms[0].items) { /* -enable */
flags |= AFSCALL_RXSTATS_ENABLE;
blob.in_size = sizeof(afs_int32);
blob.out_size = 0;
- code = pioctl(NULL, VIOC_RXSTAT_PROC, &blob, 1);
+ code = pioctl_utf8(NULL, VIOC_RXSTAT_PROC, &blob, 1);
if (code != 0) {
Die(errno, NULL);
return 1;
}
static int
-RxStatPeerCmd(struct cmd_syndesc *as, char *arock)
+RxStatPeerCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
afs_int32 flags = 0;
struct ViceIoctl blob;
- struct cmd_item *ti;
if (as->parms[0].items) { /* -enable */
flags |= AFSCALL_RXSTATS_ENABLE;
blob.in_size = sizeof(afs_int32);
blob.out_size = 0;
- code = pioctl(NULL, VIOC_RXSTAT_PEER, &blob, 1);
+ code = pioctl_utf8(NULL, VIOC_RXSTAT_PEER, &blob, 1);
if (code != 0) {
Die(errno, NULL);
return 1;
return 0;
}
-#endif /* WIN32 */
+
+static int
+TestVolStatCmd(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 code;
+ struct VolStatTest test;
+ struct ViceIoctl blob;
+ char * tp;
+ afs_uint32 n;
+
+ memset(&test, 0, sizeof(test));
+
+ if (as->parms[0].items) { /* -network */
+ tp = as->parms[0].items->data;
+ if (strcmp(tp, "up") == 0)
+ test.flags |= VOLSTAT_TEST_NETWORK_UP;
+ else if (strcmp(tp, "down") == 0)
+ test.flags |= VOLSTAT_TEST_NETWORK_DOWN;
+ else {
+ fprintf (stderr, "%s: %s must be \"up\" or \"down\".\n", pn, tp);
+ return EINVAL;
+ }
+ }
+ if (as->parms[1].items) { /* check */
+ test.flags |= VOLSTAT_TEST_CHECK_VOLUME;
+ }
+ if (as->parms[2].items) { /* cell */
+ tp = as->parms[2].items->data;
+ n = atoi(tp);
+ if (n != 0)
+ test.fid.cell = n;
+ else {
+ if( FAILED(StringCbCopy(test.cellname, sizeof(test.cellname), tp))) {
+ fprintf (stderr, "cellname - not enough space");
+ exit(1);
+ }
+ test.cellname[sizeof(test.cellname)-1] = '\0';
+ }
+ }
+ if (as->parms[3].items) { /* volume */
+ tp = as->parms[3].items->data;
+ n = atoi(tp);
+ if (n != 0)
+ test.fid.volume = n;
+ else {
+ if( FAILED(StringCbCopy(test.volname, sizeof(test.volname), tp))) {
+ fprintf (stderr, "volname - not enough space");
+ exit(1);
+ }
+ test.volname[sizeof(test.volname)-1] = '\0';
+ }
+ }
+ if (as->parms[4].items) { /* state */
+ tp = as->parms[4].items->data;
+ if (strcmp(tp, "online") == 0)
+ test.state = vl_online;
+ else if (strcmp(tp, "busy") == 0)
+ test.state = vl_busy;
+ else if (strcmp(tp, "offline") == 0)
+ test.state = vl_offline;
+ else if (strcmp(tp, "down") == 0)
+ test.state = vl_alldown;
+ else {
+ fprintf (stderr, "%s: %s must be \"online\", \"busy\", \"offline\" or \"down\".\n", pn, tp);
+ return EINVAL;
+ }
+ }
+
+ if ((test.fid.cell || test.cellname[0]) && !(test.fid.volume || test.volname[0]) ||
+ !(test.fid.cell || test.cellname[0]) && (test.fid.volume || test.volname[0])) {
+ fprintf (stderr, "%s: both a cell and a volume must be specified.\n", pn, tp);
+ return EINVAL;
+ }
+
+ blob.in = (char *)&test;
+ blob.in_size = sizeof(test);
+ blob.out_size = 0;
+
+ code = pioctl_utf8(NULL, VIOC_VOLSTAT_TEST, &blob, 1);
+ if (code != 0) {
+ Die(errno, NULL);
+ return 1;
+ }
+
+ return 0;
+}
+
+static int
+ChOwnCmd(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 code;
+ struct ViceIoctl blob;
+ struct cmd_item *ti;
+ int error = 0;
+ int literal = 0;
+ struct {
+ cm_ioctlQueryOptions_t options;
+ afs_uint32 owner;
+ } inData;
+ afs_uint32 ownerId;
+ char * ownerStr;
+ char confDir[257];
+
+ cm_GetConfigDir(confDir, sizeof(confDir));
+
+ if (as->parms[2].items)
+ literal = 1;
+
+ ownerStr = as->parms[0].items->data;
+ ownerId = atoi(ownerStr);
+
+ SetDotDefault(&as->parms[1].items);
+ for(ti=as->parms[1].items; ti; ti=ti->next) {
+ cm_fid_t fid;
+ afs_uint32 filetype;
+ char cell[CELL_MAXNAMELEN];
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&inData, 0, sizeof(inData));
+ filetype = 0;
+ inData.options.size = sizeof(inData.options);
+ inData.options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ inData.options.literal = literal;
+ blob.in_size = inData.options.size; /* no variable length data */
+ blob.in = &inData;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl_utf8(ti->data, VIOCGETFID, &blob, 1) &&
+ blob.out_size == sizeof(cm_fid_t)) {
+ inData.options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ inData.options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ /*
+ * if the owner was specified as a numeric value,
+ * then we can just use it. Otherwise, we need
+ * to know the cell of the path to determine which
+ * ptserver to contact in order to convert the name
+ * to a numeric value.
+ */
+ if (ownerId == 0) {
+ blob.out_size = CELL_MAXNAMELEN;
+ blob.out = cell;
+
+ code = pioctl_utf8(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
+ if (code) {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+ cell[CELL_MAXNAMELEN - 1] = '\0';
+ /*
+ * We now know the cell for the target and we need to
+ * convert the ownerStr to the Id for this user
+ */
+ pr_Initialize(1, confDir, cell);
+ code = pr_SNameToId(ownerStr, &inData.owner);
+ pr_End();
+
+ if (code || inData.owner == ANONYMOUSID ) {
+ Die(ECHILD, ti->data);
+ error = 1;
+ continue;
+ }
+ } else {
+ inData.owner = ownerId;
+ }
+
+ blob.in_size = sizeof(inData);
+ blob.out = NULL;
+ blob.out_size = 0;
+ code = pioctl_utf8(ti->data, VIOC_SETOWNER, &blob, 1);
+ if (code) {
+ Die(errno, ti->data);
+ }
+ }
+ return error;
+}
+
+static int
+ChGrpCmd(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 code;
+ struct ViceIoctl blob;
+ struct cmd_item *ti;
+ int error = 0;
+ int literal = 0;
+ struct {
+ cm_ioctlQueryOptions_t options;
+ afs_uint32 group;
+ } inData;
+ afs_uint32 groupId;
+ char * groupStr;
+ char confDir[257];
+
+ cm_GetConfigDir(confDir, sizeof(confDir));
+
+ if (as->parms[2].items)
+ literal = 1;
+
+ groupStr = as->parms[0].items->data;
+ groupId = atoi(groupStr);
+
+ SetDotDefault(&as->parms[1].items);
+ for(ti=as->parms[1].items; ti; ti=ti->next) {
+ cm_fid_t fid;
+ afs_uint32 filetype;
+ char cell[CELL_MAXNAMELEN];
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&inData, 0, sizeof(inData));
+ filetype = 0;
+ inData.options.size = sizeof(inData.options);
+ inData.options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ inData.options.literal = literal;
+ blob.in_size = inData.options.size; /* no variable length data */
+ blob.in = &inData;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl_utf8(ti->data, VIOCGETFID, &blob, 1) &&
+ blob.out_size == sizeof(cm_fid_t)) {
+ inData.options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ inData.options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ /*
+ * if the group was specified as a numeric value,
+ * then we can just use it. Otherwise, we need
+ * to know the cell of the path to determine which
+ * ptserver to contact in order to convert the name
+ * to a numeric value.
+ */
+ if (groupId == 0) {
+ blob.out_size = CELL_MAXNAMELEN;
+ blob.out = cell;
+
+ code = pioctl_utf8(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
+ if (code) {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+ cell[CELL_MAXNAMELEN - 1] = '\0';
+ /*
+ * We now know the cell for the target and we need to
+ * convert the groupStr to the Id for this user
+ */
+ pr_Initialize(1, confDir, cell);
+ code = pr_SNameToId(groupStr, &inData.group);
+ pr_End();
+
+ if (code || inData.group == ANONYMOUSID ) {
+ Die(ECHILD, ti->data);
+ error = 1;
+ continue;
+ }
+ } else {
+ inData.group = groupId;
+ }
+
+ blob.in_size = sizeof(inData);
+ blob.out = NULL;
+ blob.out_size = 0;
+ code = pioctl_utf8(ti->data, VIOC_SETGROUP, &blob, 1);
+ if (code) {
+ Die(errno, ti->data);
+ }
+ }
+ return error;
+}
#ifndef WIN32
#include "AFS_component_version_number.c"
#endif
-main(int argc, char **argv)
+static void
+FreeUtf8CmdLine(int argc, char ** argv)
+{
+ int i;
+ for (i=0; i < argc; i++) {
+ if (argv[i])
+ free(argv[i]);
+ }
+ free(argv);
+}
+
+static char **
+MakeUtf8Cmdline(int argc, const wchar_t **wargv)
+{
+ char ** argv;
+ int i;
+
+ argv = calloc(argc, sizeof(argv[0]));
+ if (argv == NULL)
+ return NULL;
+
+ for (i=0; i < argc; i++) {
+ int s;
+
+ s = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, FALSE);
+ if (s == 0 ||
+ (argv[i] = calloc(s+1, sizeof(char))) == NULL) {
+ break;
+ }
+
+ s = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, argv[i], s+1, NULL, FALSE);
+ if (s == 0) {
+ break;
+ }
+ }
+
+ if (i < argc) {
+ FreeUtf8CmdLine(argc, argv);
+ return NULL;
+ }
+
+ return argv;
+}
+
+int wmain(int argc, wchar_t **wargv)
{
afs_int32 code;
struct cmd_syndesc *ts;
+ char ** argv;
#ifdef AFS_AIX32_ENV
/*
WSAStartup(0x0101, &WSAjunk);
#endif /* WIN32 */
+ argv = MakeUtf8Cmdline(argc, wargv);
+
/* try to find volume location information */
osi_Init();
#ifndef WIN32
- ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, 0,
+ ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL,
"get client network interface addresses");
cmd_CreateAlias(ts, "gc");
- ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, 0,
+ ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL,
"set client network interface addresses");
cmd_AddParm(ts, "-address", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS,
"client network interfaces");
cmd_CreateAlias(ts, "sc");
#endif /* WIN32 */
- ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, 0, "set server ranks");
+ ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, "set server ranks");
cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL|CMD_EXPANDS, "fileserver names and ranks");
cmd_AddParm(ts, "-vlservers", CMD_LIST, CMD_OPTIONAL|CMD_EXPANDS, "VL server names and ranks");
cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "input from named file");
cmd_AddParm(ts, "-stdin", CMD_FLAG, CMD_OPTIONAL, "input from stdin");
cmd_CreateAlias(ts, "sp");
- ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, 0, "get server ranks");
+ ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, "get server ranks");
cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "output to named file");
cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only");
cmd_AddParm(ts, "-vlservers", CMD_FLAG, CMD_OPTIONAL, "VL servers");
/* cmd_AddParm(ts, "-cell", CMD_FLAG, CMD_OPTIONAL, "cellname"); */
cmd_CreateAlias(ts, "gp");
- ts = cmd_CreateSyntax("setacl", SetACLCmd, 0, "set access control list");
+ ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, "set access control list");
cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory");
cmd_AddParm(ts, "-acl", CMD_LIST, 0, "access list entries");
cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "clear access list");
cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl (DFS only)");
cmd_CreateAlias(ts, "sa");
- ts = cmd_CreateSyntax("listacl", ListACLCmd, 0, "list access control list");
+ ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, "list access control list");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
parm_listacl_id = ts->nParms;
cmd_AddParm(ts, "-id", CMD_FLAG, CMD_OPTIONAL, "initial directory acl");
cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl");
+ cmd_AddParm(ts, "-cmd", CMD_FLAG, CMD_OPTIONAL, "output as 'fs setacl' command");
cmd_CreateAlias(ts, "la");
- ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, 0, "clean up access control list");
+ ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, "clean up access control list");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
- ts = cmd_CreateSyntax("copyacl", CopyACLCmd, 0, "copy access control list");
+ ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, "copy access control list");
cmd_AddParm(ts, "-fromdir", CMD_SINGLE, 0, "source directory (or DFS file)");
cmd_AddParm(ts, "-todir", CMD_LIST, 0, "destination directory (or DFS file)");
cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "first clear dest access list");
cmd_CreateAlias(ts, "ca");
- ts = cmd_CreateSyntax("flush", FlushCmd, 0, "flush file from cache");
+ ts = cmd_CreateSyntax("flush", FlushCmd, NULL, "flush file from cache");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
#ifndef WIN32
- ts = cmd_CreateSyntax("flushmount", FlushMountCmd, 0,
+ ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL,
"flush mount symlink from cache");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
#endif
- ts = cmd_CreateSyntax("setvol", SetVolCmd, 0, "set volume status");
+ ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, "set volume status");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_OPTIONAL, "disk space quota in 1K units");
#ifdef notdef
cmd_AddParm(ts, "-offlinemsg", CMD_SINGLE, CMD_OPTIONAL, "offline message");
cmd_CreateAlias(ts, "sv");
- ts = cmd_CreateSyntax("messages", MessagesCmd, 0, "control Cache Manager messages");
+ ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, "control Cache Manager messages");
cmd_AddParm(ts, "-show", CMD_SINGLE, CMD_OPTIONAL, "[user|console|all|none]");
- ts = cmd_CreateSyntax("examine", ExamineCmd, 0, "display file/volume status");
+ ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, "display file/volume status");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
cmd_CreateAlias(ts, "lv");
cmd_CreateAlias(ts, "listvol");
- ts = cmd_CreateSyntax("listquota", ListQuotaCmd, 0, "list volume quota");
+ ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, "list volume quota");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
cmd_CreateAlias(ts, "lq");
- ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, 0, "show server disk space usage");
+ ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, "show server disk space usage");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
cmd_CreateAlias(ts, "df");
- ts = cmd_CreateSyntax("quota", QuotaCmd, 0, "show volume quota usage");
+ ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, "show volume quota usage");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
- ts = cmd_CreateSyntax("lsmount", ListMountCmd, 0, "list mount point");
+ ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, "list mount point");
cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory");
- ts = cmd_CreateSyntax("mkmount", MakeMountCmd, 0, "make mount point");
+ ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, "make mount point");
cmd_AddParm(ts, "-dir", CMD_SINGLE, 0, "directory");
cmd_AddParm(ts, "-vol", CMD_SINGLE, 0, "volume name");
cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");
*/
- ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, 0, "remove mount point");
+ ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, "remove mount point");
cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory");
- ts = cmd_CreateSyntax("checkservers", CheckServersCmd, 0, "check local cell's servers");
+ ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, "check local cell's servers");
cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell to check");
cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "check all cells");
cmd_AddParm(ts, "-fast", CMD_FLAG, CMD_OPTIONAL, "just list, don't check");
cmd_AddParm(ts,"-interval",CMD_SINGLE,CMD_OPTIONAL,"seconds between probes");
- ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd,0, "check volumeID/name mappings");
+ ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, "check volumeID/name mappings");
cmd_CreateAlias(ts, "checkbackups");
- ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, 0, "set cache size");
+ ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, "set cache size");
cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL, "size in 1K byte blocks (0 => reset)");
cmd_CreateAlias(ts, "cachesize");
cmd_AddParm(ts, "-reset", CMD_FLAG, CMD_OPTIONAL, "reset size back to boot value");
- ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, 0, "get cache usage info");
+ ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, NULL, "get cache usage info");
- ts = cmd_CreateSyntax("listcells", ListCellsCmd, 0, "list configured cells");
+ ts = cmd_CreateSyntax("listcells", ListCellsCmd, NULL, "list configured cells");
cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only");
- ts = cmd_CreateSyntax("setquota", SetQuotaCmd, 0, "set volume quota");
+ ts = cmd_CreateSyntax("setquota", SetQuotaCmd, NULL, "set volume quota");
cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "dir/file path");
cmd_AddParm(ts, "-max", CMD_SINGLE, 0, "max quota in kbytes");
#ifdef notdef
#endif
cmd_CreateAlias(ts, "sq");
- ts = cmd_CreateSyntax("newcell", NewCellCmd, 0, "configure new cell");
-#ifndef WIN32
- cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name");
- cmd_AddParm(ts, "-servers", CMD_LIST, CMD_REQUIRED, "primary servers");
+ ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, "configure new cell");
+ cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "cell name");
+ cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL, "primary servers");
cmd_AddParm(ts, "-linkedcell", CMD_SINGLE, CMD_OPTIONAL, "linked cell name");
-#ifdef FS_ENABLE_SERVER_DEBUG_PORTS
/*
* Turn this on only if you wish to be able to talk to a server which is listening
* on alternative ports. This is not intended for general use and may not be
*/
cmd_AddParm(ts, "-fsport", CMD_SINGLE, CMD_OPTIONAL, "cell's fileserver port");
cmd_AddParm(ts, "-vlport", CMD_SINGLE, CMD_OPTIONAL, "cell's vldb server port");
-#endif
+ cmd_AddParm(ts, "-registry", CMD_FLAG, CMD_OPTIONAL, "add cell info to registry cellservdb");
+ cmd_AddParm(ts, "-dns", CMD_FLAG, CMD_OPTIONAL, "force use of dns");
- ts = cmd_CreateSyntax("newalias", NewAliasCmd, 0,
+#ifndef WIN32
+ ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL,
"configure new cell alias");
cmd_AddParm(ts, "-alias", CMD_SINGLE, 0, "alias name");
cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "real name of cell");
#endif
- ts = cmd_CreateSyntax("whichcell", WhichCellCmd, 0, "list file's cell");
+ ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, "list file's cell");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
- ts = cmd_CreateSyntax("whereis", WhereIsCmd, 0, "list file's location");
+ ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, "list file's location");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
- ts = cmd_CreateSyntax("wscell", WSCellCmd, 0, "list workstation's cell");
+ ts = cmd_CreateSyntax("wscell", WSCellCmd, NULL, "list workstation's cell");
/*
ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, 0, "obsolete (listed primary cell)");
*/
- ts = cmd_CreateSyntax("monitor", MonitorCmd, 0, "set cache monitor host address");
+#ifndef AFS_NT40_ENV
+ ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, "set cache monitor host address");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "host name or 'off'");
cmd_CreateAlias(ts, "mariner");
-
-
- ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, 0, "get cell status");
+#endif
+
+ ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, "get cell status");
cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name");
- ts = cmd_CreateSyntax("setcell", SetCellCmd, 0, "set cell status");
+ ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, "set cell status");
cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name");
cmd_AddParm(ts, "-suid", CMD_FLAG, CMD_OPTIONAL, "allow setuid programs");
cmd_AddParm(ts, "-nosuid", CMD_FLAG, CMD_OPTIONAL, "disallow setuid programs");
- ts = cmd_CreateSyntax("flushall", FlushAllCmd, 0, "flush all data");
+ ts = cmd_CreateSyntax("flushall", FlushAllCmd, NULL, "flush all data");
- ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, 0, "flush all data in volume");
+ ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, "flush all data in volume");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
- ts = cmd_CreateSyntax("sysname", SysNameCmd, 0, "get/set sysname (i.e. @sys) value");
+ ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, "get/set sysname (i.e. @sys) value");
cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname");
- ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, 0, "enable/disable translators to AFS");
+#ifndef AFS_NT40_ENV
+ ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, "enable/disable translators to AFS");
cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name");
cmd_AddParm(ts, "-start", CMD_SINGLE, CMD_OPTIONAL, "start/stop translator ('on' or 'off')");
cmd_AddParm(ts, "-convert", CMD_SINGLE, CMD_OPTIONAL, "convert from afs to unix mode ('on or 'off')");
cmd_AddParm(ts, "-uidcheck", CMD_SINGLE, CMD_OPTIONAL, "run on strict 'uid check' mode ('on' or 'off')");
cmd_AddParm(ts, "-submounts", CMD_SINGLE, CMD_OPTIONAL, "allow nfs mounts to subdirs of /afs/.. ('on' or 'off')");
+#endif
-
- ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, 0,
+ ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL,
"store to server after file close");
cmd_AddParm(ts, "-kbytes", CMD_SINGLE, CMD_OPTIONAL, "asynchrony for specified names");
cmd_AddParm(ts, "-files", CMD_LIST, CMD_OPTIONAL, "specific pathnames");
cmd_AddParm(ts, "-allfiles", CMD_SINGLE, CMD_OPTIONAL, "new default (KB)");
cmd_CreateAlias(ts, "sb");
- ts = cmd_CreateSyntax("setcrypt", SetCryptCmd, 0, "set cache manager encryption flag");
+ ts = cmd_CreateSyntax("setcrypt", SetCryptCmd, NULL, "set cache manager encryption flag");
cmd_AddParm(ts, "-crypt", CMD_SINGLE, 0, "on or off");
- ts = cmd_CreateSyntax("getcrypt", GetCryptCmd, 0, "get cache manager encryption flag");
+ ts = cmd_CreateSyntax("getcrypt", GetCryptCmd, NULL, "get cache manager encryption flag");
-#ifndef WIN32
- ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, 0,
+ ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, NULL,
"Manage per process RX statistics");
cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats");
cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats");
cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats");
- ts = cmd_CreateSyntax("rxstatpeer", RxStatPeerCmd, 0,
+ ts = cmd_CreateSyntax("rxstatpeer", RxStatPeerCmd, NULL,
"Manage per peer RX statistics");
cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats");
cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats");
cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats");
- ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, 0, "configure callback connection address");
+#ifndef WIN32
+ ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, NULL, "configure callback connection address");
cmd_AddParm(ts, "-addr", CMD_SINGLE, CMD_OPTIONAL, "host name or address");
#endif
- ts = cmd_CreateSyntax("trace", TraceCmd, 0, "enable or disable CM tracing");
+ ts = cmd_CreateSyntax("trace", TraceCmd, NULL, "enable or disable CM tracing");
cmd_AddParm(ts, "-on", CMD_FLAG, CMD_OPTIONAL, "enable tracing");
cmd_AddParm(ts, "-off", CMD_FLAG, CMD_OPTIONAL, "disable tracing");
cmd_AddParm(ts, "-reset", CMD_FLAG, CMD_OPTIONAL, "reset log contents");
cmd_AddParm(ts, "-dump", CMD_FLAG, CMD_OPTIONAL, "dump log contents");
cmd_CreateAlias(ts, "tr");
- ts = cmd_CreateSyntax("memdump", MemDumpCmd, 0, "dump memory allocs in debug builds");
+ ts = cmd_CreateSyntax("uuid", UuidCmd, NULL, "manage the UUID for the cache manager");
+ cmd_AddParm(ts, "-generate", CMD_FLAG, CMD_OPTIONAL, "generate a new UUID");
+
+ ts = cmd_CreateSyntax("memdump", MemDumpCmd, NULL, "dump memory allocs in debug builds");
cmd_AddParm(ts, "-begin", CMD_FLAG, CMD_OPTIONAL, "set a memory checkpoint");
cmd_AddParm(ts, "-end", CMD_FLAG, CMD_OPTIONAL, "dump memory allocs");
- ts = cmd_CreateSyntax("cscpolicy", CSCPolicyCmd, 0, "change client side caching policy for AFS shares");
+ ts = cmd_CreateSyntax("cscpolicy", CSCPolicyCmd, NULL, "change client side caching policy for AFS shares");
cmd_AddParm(ts, "-share", CMD_SINGLE, CMD_OPTIONAL, "AFS share");
cmd_AddParm(ts, "-manual", CMD_FLAG, CMD_OPTIONAL, "manual caching of documents");
cmd_AddParm(ts, "-programs", CMD_FLAG, CMD_OPTIONAL, "automatic caching of programs and documents");
cmd_AddParm(ts, "-documents", CMD_FLAG, CMD_OPTIONAL, "automatic caching of documents");
cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "disable caching");
- ts = cmd_CreateSyntax("minidump", MiniDumpCmd, 0, "Generate MiniDump of current service state");
+ ts = cmd_CreateSyntax("minidump", MiniDumpCmd, NULL, "Generate MiniDump of current service state");
+
+ ts = cmd_CreateSyntax("test_volstat", TestVolStatCmd, NULL, (char *)CMD_HIDDEN);
+ cmd_AddParm(ts, "-network", CMD_SINGLE, CMD_OPTIONAL, "set network state up or down");
+ cmd_AddParm(ts, "-check", CMD_FLAG, CMD_OPTIONAL, "check state of offline volumes");
+ cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name or number");
+ cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or number");
+ cmd_AddParm(ts, "-state", CMD_SINGLE, CMD_OPTIONAL, "new volume state: online, busy, offline, down");
+
+ ts = cmd_CreateSyntax("smbunicode", SmbUnicodeCmd, NULL, "enable or disable Unicode on new SMB connections");
+ cmd_AddParm(ts, "-on", CMD_FLAG, CMD_OPTIONAL, "enable Unicode on new connections");
+ cmd_AddParm(ts, "-off", CMD_FLAG, CMD_OPTIONAL, "disable Unicode on new connections");
+
+ ts = cmd_CreateSyntax("getfid", GetFidCmd, NULL, "get file id for object(s) in afs");
+ cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
+
+ ts = cmd_CreateSyntax("chown", ChOwnCmd, NULL, "set owner for object(s) in afs");
+ cmd_AddParm(ts, "-owner", CMD_SINGLE, 0, "user name or id");
+ cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
+
+ ts = cmd_CreateSyntax("chgrp", ChGrpCmd, NULL, "set owner for object(s) in afs");
+ cmd_AddParm(ts, "-group", CMD_SINGLE, 0, "user/group name or id");
+ cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
code = cmd_Dispatch(argc, argv);
-#ifndef WIN32
if (rxInitDone)
rx_Finalize();
-#endif /* not WIN32 */
+
+ FreeUtf8CmdLine(argc, argv);
return code;
}
else if (code == ENODEV) {
fprintf(stderr,"%s: AFS service may not have started.\n", pn);
}
- else if (code == ESRCH) {
+ else if (code == ESRCH) { /* hack */
fprintf(stderr,"%s: Cell name not recognized.\n", pn);
}
- else if (code == EPIPE) {
+ else if (code == EPIPE) { /* hack */
fprintf(stderr,"%s: Volume name or ID not recognized.\n", pn);
}
else if (code == EFBIG) {
else
fprintf(stderr,"%s: Connection timed out", pn);
}
+ else if (code == EBUSY) {
+ if (filename)
+ fprintf(stderr,"%s: All servers are busy on which '%s' resides\n", pn, filename);
+ else
+ fprintf(stderr,"%s: All servers are busy\n", pn);
+ }
+ else if (code == ENXIO) {
+ if (filename)
+ fprintf(stderr,"%s: All volume instances are offline on which '%s' resides\n", pn, filename);
+ else
+ fprintf(stderr,"%s: All volume instances are offline\n", pn);
+ }
+ else if (code == ENOSYS) {
+ if (filename)
+ fprintf(stderr,"%s: All servers are down on which '%s' resides\n", pn, filename);
+ else
+ fprintf(stderr,"%s: All servers are down\n", pn);
+ }
+ else if (code == ECHILD) { /* hack */
+ if (filename)
+ fprintf(stderr,"%s: Invalid owner specified for '%s'\n", pn, filename);
+ else
+ fprintf(stderr,"%s: Invalid owner specified\n", pn);
+ }
else {
if (filename)
fprintf(stderr,"%s:'%s'", pn, filename);
#ifdef WIN32
fprintf(stderr, ": code 0x%x\n", code);
#else /* not WIN32 */
- fprintf(stderr,": %s\n", error_message(code));
+ fprintf(stderr,": %s\n", afs_error_message(code));
#endif /* not WIN32 */
}
} /*Die*/
git://git.openafs.org / openafs.git / blobdiff