#include <stdlib.h>
#include <malloc.h>
#include <string.h>
+#include <strsafe.h>
#include <stdio.h>
#include <time.h>
#include <winsock2.h>
#define CELL_MAXNAMELEN 256
#define MAXHOSTCHARS 64
-static char space[MAXSIZE];
+static char space[AFS_PIOCTL_MAXSIZE];
static char tspace[1024];
static struct ubik_client *uclient;
afs_int32 code;
blob.in_size = 0;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
code = pioctl_utf8(apath, VIOC_FILE_CELL_NAME, &blob, 1);
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 = (int)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;
+#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, ret;
+ size_t len;
char tname[MAXNAME];
struct AclEntry *first, *next, *last, *tl;
struct Acl *ta;
ta = EmptyAcl(NULL);
- if (astr == NULL || strlen(astr) == 0)
+ 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);
+#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;
last = 0;
first = 0;
for(i=0;i<nplus;i++) {
+#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);
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++) {
+#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);
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)
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;
}
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;
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. */
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_utf8(ti->data, VIOCGETAL, &blob, 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",
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",
}
blob.in = AclToString(ta);
blob.out_size=0;
- blob.in_size = 1+(long)strlen(blob.in);
+ 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) {
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_utf8(as->parms[0].items->data, VIOCGETAL, &blob, 1);
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",
}
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_utf8(ti->data, VIOCGETAL, &blob, 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",
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+(long)strlen(blob.in);
+ 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) {
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_utf8(ti->data, VIOCGETAL, &blob, 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",
if (changes) {
/* now set the acl */
blob.in=AclToString(ta);
- blob.in_size = (long)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_utf8(ti->data, VIOCSETAL, &blob, 1);
if (code) {
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_utf8(ti->data, VIOCGETAL, &blob, 1);
error = 1;
continue;
}
- ta = ParseAcl(space);
+ ta = ParseAcl(space, AFS_PIOCTL_MAXSIZE);
if (!ta) {
fprintf(stderr,
"fs: %s: invalid acl data returned from VIOCGETAL\n",
static int
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);
}
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;
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 += (long)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 += (long)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';
+ destRemaining -= sizeof(char);
+ }
code = pioctl_utf8(ti->data,VIOCSETVOLSTAT, &blob, 1);
if (code) {
Die(errno, ti->data);
int error = 0;
int literal = 0;
cm_ioctlQueryOptions_t options;
+ size_t len;
if (as->parms[1].items)
literal = 1;
for(ti=as->parms[0].items; ti; ti=ti->next) {
cm_fid_t fid;
afs_uint32 filetype;
- afs_uint32 owner[2];
+ afs_int32 owner[2];
char cell[CELL_MAXNAMELEN];
/* once per file */
pr_Initialize(1, confDir, cell);
pr_SIdToName(owner[0], oname);
pr_SIdToName(owner[1], gname);
- printf("Owner %s (%u) Group %s (%u)\n", oname, owner[0], gname, owner[1]);
+ printf("Owner %s (%d) Group %s (%d)\n", oname, owner[0], gname, owner[1]);
}
blob.out = space;
- blob.out_size = MAXSIZE;
+ 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);
- offmsg = name + strlen(name) + 1;
- motd = offmsg + strlen(offmsg) + 1;
+ 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);
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_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
error = 1;
continue;
}
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
memset(space, 0, sizeof(space));
code = pioctl_utf8(ti->data, VIOCWHEREIS, &blob, 1);
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]);
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_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
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_utf8(ti->data, VIOCGETVOLSTAT, &blob, 1);
- if (code || blob.out_size != sizeof(*status)) {
+ /*
+ * 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
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 = (int)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 = (long)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_utf8(parent_dir, VIOC_AFS_STAT_MT_PT, &blob, 1);
struct vldbentry vldbEntry;
struct ViceIoctl blob;
char * parent;
+ size_t len;
memset(&info, 0, sizeof(info));
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 = (int)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;
}
}
}
- 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 + (long)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_utf8(path, VIOC_AFS_CREATE_MT_PT, &blob, 0);
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=(afs_int32)(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 = (int)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 = (long)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_utf8(tbuffer, VIOC_AFS_STAT_MT_PT, &blob, 0);
}
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 = (long)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;
code = pioctl_utf8(tbuffer, VIOC_AFS_DELETE_MT_PT, &blob, 0);
if (code) {
Die(errno, ti->data);
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=(int)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;
}
Die(errno, 0);
return 1;
}
+#if _MSC_VER < 1400
memcpy(&temp, space, sizeof(afs_int32));
+#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",
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);
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 */
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;
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*sizeof(afs_int32) < MAXSIZE; 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);
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;
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);
}
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 */
static int
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_utf8(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_utf8((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
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.in_size = 0;
blob.in = NULL;
- blob.out_size = MAXSIZE;
+ blob.out_size = AFS_PIOCTL_MAXSIZE;
blob.out = space;
code = pioctl_utf8(NULL, VIOC_GET_WS_CELL, &blob, 1);
Die(errno, NULL);
return 1;
}
- space[MAXSIZE - 1] = '\0';
+ space[AFS_PIOCTL_MAXSIZE - 1] = '\0';
printf("This workstation belongs to cell '%s'\n", space);
return 0;
}
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 */
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 += (long)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));
+#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);
}
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");
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;
afs_int32 junk;
} args;
int error = 0;
+ size_t len;
memset(&info, 0, sizeof(info));
memset(&args, 0, sizeof(args)); /* avoid Purify UMR error */
}
if (info.linkedCell)
free(info.linkedCell);
- blob.in_size = 1+(long)strlen(info.name);
+ 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_utf8(0, VIOC_GETCELLSTATUS, &blob, 1);
if (code) {
}
if (info.linkedCell)
free(info.linkedCell);
- strcpy(args.cname, info.name);
+ 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;
static int
GetCellName(char *cellNamep, struct afsconf_cell *infop)
{
- strcpy(infop->name, cellNamep);
+ if( FAILED(StringCbCopy(infop->name, sizeof(infop->name), cellNamep))) {
+ fprintf (stderr, "name - not enough space");
+ exit(1);
+ }
return 0;
}
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++;
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 */
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 */
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_utf8(0, VIOC_GETSPREFS, &blob, 1);
}
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);
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_utf8(0, VIOC_GETSPREFS, &blob, 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);
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;
afs_int32 code = 0, flag;
struct ViceIoctl blob;
char *tp;
+ errno_t err;
blob.in = NULL;
blob.in_size = 0;
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 == 2)
printf("auth (data integrity).\n");
struct cmd_item *ti;
char *share = NULL;
HKEY hkCSCPolicy;
+ size_t len;
if ( !IsAdmin() ) {
fprintf (stderr,"Permission denied: requires AFS Client Administrator access.\n");
}
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, (DWORD)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");
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_utf8(0, VIOC_GETCPREFS, &blob, 1);
if (code) {
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;
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");
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_utf8(parent_dir, VIOC_AFS_FLUSHMOUNT, &blob, 1);
if (n != 0)
test.fid.cell = n;
else {
- strncpy(test.cellname, tp, sizeof(test.cellname));
+ 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 (n != 0)
test.fid.volume = n;
else {
- strncpy(test.volname, tp, sizeof(test.volname));
+ if( FAILED(StringCbCopy(test.volname, sizeof(test.volname), tp))) {
+ fprintf (stderr, "volname - not enough space");
+ exit(1);
+ }
test.volname[sizeof(test.volname)-1] = '\0';
}
}
cmd_CreateAlias(ts, "sq");
ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, "configure new cell");
-#ifndef WIN32
- cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name");
- cmd_AddParm(ts, "-servers", CMD_LIST, CMD_REQUIRED, "primary servers");
+ 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");
+#ifndef WIN32
ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL,
"configure new cell alias");
cmd_AddParm(ts, "-alias", CMD_SINGLE, 0, "alias name");
git://git.openafs.org / openafs.git / blobdiff