/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
+#include <afs/stds.h>
-RCSID
- ("$Header$");
+#include <afs/procmgmt.h>
+#include <roken.h>
+
+#include <hcrypto/ui.h>
-#include <afs/stds.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <strings.h>
-#endif /* AFS_NT40_ENV */
-#include <string.h>
-#include <afs/procmgmt.h> /* signal(), kill(), wait(), etc. */
-#include <time.h>
#include "bnode.h"
-#include <errno.h>
#include <afs/afsutil.h>
#include <afs/cellconfig.h>
#include <rx/rx.h>
#include <rx/xdr.h>
#include <afs/auth.h>
#include <afs/cellconfig.h>
-#include <stdio.h>
#include <afs/cmd.h>
#include <afs/com_err.h>
#include <ubik.h>
#include <afs/ktime.h>
+#include <afs/kautils.h>
+#include <afs/volser.h>
-static IStatServer();
-static DoStat();
+static int IStatServer(struct cmd_syndesc *as, int int32p);
+static int DoStat(char *aname, struct rx_connection *aconn,
+ int aint32p, int firstTime);
#include "bosint.h"
+#include "bosprototypes.h"
/* command offsets for bos salvage command */
#define MRAFS_OFFSET 10
/* dummy routine for the audit work. It should do nothing since audits */
/* occur at the server level and bos is not a server. */
-osi_audit()
+int osi_audit(void )
{
return 0;
}
/* keep those lines small */
static char *
-em(acode)
- afs_int32 acode;
+em(afs_int32 acode)
{
if (acode == -1)
return "communications failure (-1)";
}
/* get partition id from a name */
+/* XXX - unused code - could be removed? */
+#if 0
static afs_int32
-GetPartitionID(aname)
- char *aname;
+GetPartitionID(char *aname)
{
- register char tc;
+ char tc;
char ascii[3];
tc = *aname;
return (ascii[0] - 'a') * 26 + (ascii[1] - 'a') + 26;
}
}
+#endif
/* make ctime easier to use */
static char *
-DateOf(atime)
- afs_int32 atime;
+DateOf(afs_int32 atime)
{
static char tbuffer[30];
- register char *tp;
+ char *tp;
time_t t = (time_t) atime;
tp = ctime(&t);
if (tp) {
return tbuffer;
}
-/* global stuff from main for communicating with GetConn */
-static struct rx_securityClass *sc[3];
-static int scIndex;
/* use the syntax descr to get a connection, authenticated appropriately.
* aencrypt is set if we want to encrypt the data on the wire.
*/
static struct rx_connection *
-GetConn(as, aencrypt)
- int aencrypt;
- struct cmd_syndesc *as;
+GetConn(struct cmd_syndesc *as, int aencrypt)
{
struct hostent *th;
char *hostname;
- register afs_int32 code;
- register struct rx_connection *tconn;
- afs_int32 addr;
- register struct afsconf_dir *tdir;
- int encryptLevel;
- struct ktc_principal sname;
- struct ktc_token ttoken;
- int localauth;
+ char *cellname = NULL;
const char *confdir;
+ afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 addr;
+ struct afsconf_dir *tdir = NULL;
+ afsconf_secflags secFlags;
+ struct rx_securityClass *sc;
+ afs_int32 scIndex;
hostname = as->parms[0].items->data;
th = hostutil_GetHostByName(hostname);
}
memcpy(&addr, th->h_addr, sizeof(afs_int32));
- /* get tokens for making authenticated connections */
- localauth = (as->parms[ADDPARMOFFSET + 2].items != 0);
- confdir =
- (localauth ? AFSDIR_SERVER_ETC_DIRPATH : AFSDIR_CLIENT_ETC_DIRPATH);
- tdir = afsconf_Open(confdir);
- if (tdir) {
- struct afsconf_cell info;
- char *tname;
+ secFlags = AFSCONF_SECOPTS_FALLBACK_NULL;
- if (as->parms[ADDPARMOFFSET].items)
- tname = as->parms[ADDPARMOFFSET].items->data;
- else
- tname = NULL;
- /* next call expands cell name abbrevs for us and handles looking up
- * local cell */
- code = afsconf_GetCellInfo(tdir, tname, NULL, &info);
- if (code) {
- afs_com_err("bos", code, "(can't find cell '%s' in cell database)",
- (tname ? tname : "<default>"));
- exit(1);
- } else
- strcpy(sname.cell, info.name);
+ if (as->parms[ADDPARMOFFSET + 2].items) { /* -localauth */
+ secFlags |= AFSCONF_SECOPTS_LOCALAUTH;
+ confdir = AFSDIR_SERVER_ETC_DIRPATH;
} else {
- printf("bos: can't open cell database (%s)\n", confdir);
- exit(1);
+ confdir = AFSDIR_CLIENT_ETC_DIRPATH;
}
- sname.instance[0] = 0;
- strcpy(sname.name, "afs");
- sc[0] = rxnull_NewClientSecurityObject();
- sc[1] = 0;
- sc[2] = 0;
- scIndex = 0;
- if (!as->parms[ADDPARMOFFSET + 1].items) { /* not -noauth */
- if (as->parms[ADDPARMOFFSET + 2].items) { /* -localauth */
- code = afsconf_GetLatestKey(tdir, 0, 0);
- if (code)
- afs_com_err("bos", code, "(getting key from local KeyFile)");
- else {
- if (aencrypt)
- code = afsconf_ClientAuthSecure(tdir, &sc[2], &scIndex);
- else
- code = afsconf_ClientAuth(tdir, &sc[2], &scIndex);
- if (code)
- afs_com_err("bos", code, "(calling ClientAuth)");
- else if (scIndex != 2) /* this shouldn't happen */
- sc[scIndex] = sc[2];
- }
- } else { /* not -localauth, check for tickets */
- code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
- if (code == 0) {
- /* have tickets, will travel */
- if (ttoken.kvno >= 0 && ttoken.kvno <= 256);
- else {
- fprintf(stderr,
- "bos: funny kvno (%d) in ticket, proceeding\n",
- ttoken.kvno);
- }
- /* kerberos tix */
- if (aencrypt)
- encryptLevel = rxkad_crypt;
- else
- encryptLevel = rxkad_clear;
- sc[2] = (struct rx_securityClass *)
- rxkad_NewClientSecurityObject(encryptLevel,
- &ttoken.sessionKey,
- ttoken.kvno,
- ttoken.ticketLen,
- ttoken.ticket);
- scIndex = 2;
- } else
- afs_com_err("bos", code, "(getting tickets)");
- }
- if ((scIndex == 0) || (sc[scIndex] == 0)) {
- fprintf(stderr, "bos: running unauthenticated\n");
- scIndex = 0;
+ if (as->parms[ADDPARMOFFSET + 1].items) { /* -noauth */
+ secFlags |= AFSCONF_SECOPTS_NOAUTH;
+ } else {
+ /* If we're running with -noauth, we don't need a configuration
+ * directory */
+ tdir = afsconf_Open(confdir);
+ if (tdir == NULL) {
+ printf("bos: can't open cell database (%s)\n", confdir);
+ exit(1);
}
}
+
+ if (as->parms[ADDPARMOFFSET].items) /* -cell */
+ cellname = as->parms[ADDPARMOFFSET].items->data;
+
+ code = afsconf_PickClientSecObj(tdir, secFlags, NULL, cellname,
+ &sc, &scIndex, NULL);
+ if (code) {
+ afs_com_err("bos", code, "(configuring connection security)");
+ exit(1);
+ }
+
+ if (scIndex == RX_SECIDX_NULL)
+ fprintf(stderr, "bos: running unauthenticated\n");
+
tconn =
- rx_NewConnection(addr, htons(AFSCONF_NANNYPORT), 1, sc[scIndex],
- scIndex);
+ rx_NewConnection(addr, htons(AFSCONF_NANNYPORT), 1, sc, scIndex);
if (!tconn) {
fprintf(stderr, "bos: could not create rx connection\n");
exit(1);
}
- rxs_Release(sc[scIndex]);
+ rxs_Release(sc);
return tconn;
}
static int
SetAuth(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
- register struct rx_connection *tconn;
+ afs_int32 code;
+ struct rx_connection *tconn;
afs_int32 flag;
- register char *tp;
+ char *tp;
tconn = GetConn(as, 0);
tp = as->parms[1].items->data;
/* take a name (e.g. foo/bar, and a dir e.g. /usr/afs/bin, and construct
* /usr/afs/bin/bar */
-static
-ComputeDestDir(aname, adir, aresult, alen)
- char *aname, *adir, *aresult;
- afs_int32 alen;
+static int
+ComputeDestDir(char *aname, char *adir, char *aresult, afs_int32 alen)
{
- register char *tp;
+ char *tp;
strcpy(aresult, adir);
tp = strrchr(aname, '/');
}
/* copy data from fd afd to rx call acall */
-static
-CopyBytes(afd, acall)
- int afd;
- register struct rx_call *acall;
+static int
+CopyBytes(int afd, struct rx_call *acall)
{
- register afs_int32 code;
- register afs_int32 len;
+ afs_int32 code;
+ afs_int32 len;
char tbuffer[256];
while (1) {
}
static int
-Prune(register struct cmd_syndesc *as, void *arock)
+Prune(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
- register struct rx_connection *tconn;
- register afs_int32 flags;
+ afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 flags;
tconn = GetConn(as, 0);
flags = 0;
}
static int
-Exec(register struct cmd_syndesc *as, void *arock)
+Exec(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
tconn = GetConn(as, 0);
code = BOZO_Exec(tconn, as->parms[1].items->data);
}
static int
-GetDate(register struct cmd_syndesc *as, void *arock)
+GetDate(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
+ afs_int32 code;
char tbuffer[256];
char destDir[256];
afs_int32 time, bakTime, oldTime;
- register struct rx_connection *tconn;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ struct cmd_item *ti;
tconn = GetConn(as, 0);
if (!as->parms[1].items) {
}
static int
-UnInstall(register struct cmd_syndesc *as, void *arock)
+UnInstall(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
+ afs_int32 code;
char tbuffer[256];
char destDir[256];
- register struct cmd_item *ti;
- register struct rx_connection *tconn;
+ struct cmd_item *ti;
+ struct rx_connection *tconn;
tconn = GetConn(as, 0);
if (!as->parms[1].items) {
}
static afs_int32
-GetServerGoal(aconn, aname)
- char *aname;
- struct rx_connection *aconn;
+GetServerGoal(struct rx_connection *aconn, char *aname)
{
char buffer[500];
char *tp;
- register afs_int32 code;
+ afs_int32 code;
struct bozo_status istatus;
tp = buffer;
Install(struct cmd_syndesc *as, void *arock)
{
struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ afs_int32 code;
+ struct cmd_item *ti;
struct stat tstat;
char tbuffer[256];
int fd;
static int
Shutdown(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
tconn = GetConn(as, 0);
if (as->parms[1].items == 0) {
static int
BlockScannerCmd(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
+ afs_int32 code;
struct rx_connection *tconn;
char BlockCommand[] = "/usr/afs/bin/scanner -block";
static int
UnBlockScannerCmd(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
+ afs_int32 code;
struct rx_connection *tconn;
char UnBlockCommand[] = "/usr/afs/bin/scanner -unblock";
static int
GetRestartCmd(struct cmd_syndesc *as, void *arock)
{
- register afs_int32 code;
+ afs_int32 code;
struct ktime generalTime, newBinaryTime;
char messageBuffer[256];
struct rx_connection *tconn;
hostp = as->parms[0].items->data; /* host name for messages */
tconn = GetConn(as, 0);
- code = BOZO_GetRestartTime(tconn, 1, &generalTime);
+ code = BOZO_GetRestartTime(tconn, 1, (struct bozo_netKTime *) &generalTime);
if (code) {
printf("bos: failed to retrieve restart information (%s)\n",
em(code));
return code;
}
- code = BOZO_GetRestartTime(tconn, 2, &newBinaryTime);
+ code = BOZO_GetRestartTime(tconn, 2, (struct bozo_netKTime *) &newBinaryTime);
if (code) {
printf("bos: failed to retrieve restart information (%s)\n",
em(code));
static int
SetRestartCmd(struct cmd_syndesc *as, void *arock)
{
- afs_int32 count;
- register afs_int32 code;
+ afs_int32 count = 0;
+ afs_int32 code;
struct ktime restartTime;
- afs_int32 type;
+ afs_int32 type = 0 ;
struct rx_connection *tconn;
count = 0;
if (count == 0)
type = 1; /* by default set general restart time */
- if (code = ktime_ParsePeriodic(as->parms[1].items->data, &restartTime)) {
+ if ((code = ktime_ParsePeriodic(as->parms[1].items->data, &restartTime))) {
printf("bos: failed to parse '%s' as periodic restart time(%s)\n",
as->parms[1].items->data, em(code));
return code;
}
- code = BOZO_SetRestartTime(tconn, type, &restartTime);
+ code = BOZO_SetRestartTime(tconn, type, (struct bozo_netKTime *) &restartTime);
if (code) {
printf("bos: failed to set restart time at server (%s)\n", em(code));
return code;
static int
Startup(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
tconn = GetConn(as, 0);
if (as->parms[1].items == 0) {
static int
Restart(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
tconn = GetConn(as, 0);
if (as->parms[2].items) {
static int
SetCellName(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
tconn = GetConn(as, 0);
code = BOZO_SetCellName(tconn, as->parms[1].items->data);
}
static int
-AddHost(register struct cmd_syndesc *as, void *arock)
+AddHost(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
char name[MAXHOSTCHARS];
tconn = GetConn(as, 0);
}
static int
-RemoveHost(register struct cmd_syndesc *as, void *arock)
+RemoveHost(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
tconn = GetConn(as, 0);
for (ti = as->parms[1].items; ti; ti = ti->next) {
}
static int
-ListHosts(register struct cmd_syndesc *as, void *arock)
+ListHosts(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
char tbuffer[256];
char *tp;
- register afs_int32 i;
+ afs_int32 i;
tp = tbuffer;
tconn = GetConn(as, 0);
}
static int
-AddKey(register struct cmd_syndesc *as, void *arock)
+AddKey(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
struct ktc_encryptionKey tkey;
afs_int32 temp;
char *tcell;
strcpy(buf, as->parms[1].items->data);
else {
/* prompt for key */
- code = des_read_pw_string(buf, sizeof(buf), "input key: ", 0);
+ code = UI_UTIL_read_pw_string(buf, sizeof(buf), "input key: ", 0);
if (code || strlen(buf) == 0) {
fprintf(stderr, "Bad key: \n");
exit(1);
}
- code = des_read_pw_string(ver, sizeof(ver), "Retype input key: ", 0);
+ code = UI_UTIL_read_pw_string(ver, sizeof(ver), "Retype input key: ", 0);
if (code || strlen(ver) == 0) {
fprintf(stderr, "Bad key: \n");
exit(1);
ka_StringToKey(buf, tcell, &tkey);
}
tconn = GetConn(as, 1);
- code = BOZO_AddKey(tconn, temp, &tkey);
+ code = BOZO_AddKey(tconn, temp, ktc_to_bozoptr(&tkey));
if (code) {
printf("bos: failed to set key %d (%s)\n", temp, em(code));
exit(1);
}
static int
-RemoveKey(register struct cmd_syndesc *as, void *arock)
+RemoveKey(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
afs_int32 temp;
- register struct cmd_item *ti;
+ struct cmd_item *ti;
tconn = GetConn(as, 0);
for (ti = as->parms[1].items; ti; ti = ti->next) {
}
static int
-ListKeys(register struct cmd_syndesc *as, void *arock)
+ListKeys(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
struct ktc_encryptionKey tkey;
afs_int32 kvno;
struct bozo_keyInfo keyInfo;
int everWorked;
- register afs_int32 i;
+ afs_int32 i;
tconn = GetConn(as, 1);
everWorked = 0;
for (i = 0;; i++) {
- code = BOZO_ListKeys(tconn, i, &kvno, &tkey, &keyInfo);
+ code = BOZO_ListKeys(tconn, i, &kvno, ktc_to_bozoptr(&tkey), &keyInfo);
if (code)
break;
everWorked = 1;
/* first check if key is returned */
- if ((!ka_KeyIsZero(&tkey, sizeof(tkey))) && (as->parms[1].items)) {
+ if ((!ka_KeyIsZero(ktc_to_charptr(&tkey), sizeof(tkey))) && (as->parms[1].items)) {
printf("key %d is '", kvno);
- ka_PrintBytes(&tkey, sizeof(tkey));
+ ka_PrintBytes(ktc_to_charptr(&tkey), sizeof(tkey));
printf("'\n");
} else {
if (keyInfo.keyCheckSum == 0) /* shouldn't happen */
}
static int
-AddSUser(register struct cmd_syndesc *as, void *arock)
+AddSUser(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
int failed;
- register struct cmd_item *ti;
+ struct cmd_item *ti;
failed = 0;
tconn = GetConn(as, 0);
}
static int
-RemoveSUser(register struct cmd_syndesc *as, void *arock)
+RemoveSUser(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register struct cmd_item *ti;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ struct cmd_item *ti;
+ afs_int32 code;
int failed;
failed = 0;
#define NPERLINE 10 /* dudes to print per line */
static int
-ListSUsers(register struct cmd_syndesc *as, void *arock)
+ListSUsers(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register int i;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ int i;
+ afs_int32 code;
char tbuffer[256];
char *tp;
int lastNL, printGreeting;
}
static int
-StatServer(register struct cmd_syndesc *as, void *arock)
+StatServer(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register int i;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ int i;
char ibuffer[BOZO_BSSIZE];
char *tp;
int int32p;
}
static int
-CreateServer(register struct cmd_syndesc *as, void *arock)
+CreateServer(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
+ struct rx_connection *tconn;
+ afs_int32 code;
char *parms[6];
- register struct cmd_item *ti;
- register int i;
+ struct cmd_item *ti;
+ int i;
char *type, *name, *notifier = NONOTIFIER;
tconn = GetConn(as, 0);
}
name = as->parms[1].items->data;
type = as->parms[2].items->data;
- if (ti = as->parms[4].items) {
+ if ((ti = as->parms[4].items)) {
notifier = ti->data;
}
code =
}
static int
-DeleteServer(register struct cmd_syndesc *as, void *arock)
+DeleteServer(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
code = 0;
tconn = GetConn(as, 0);
}
static int
-StartServer(register struct cmd_syndesc *as, void *arock)
+StartServer(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
code = 0;
tconn = GetConn(as, 0);
}
static int
-StopServer(register struct cmd_syndesc *as, void *arock)
+StopServer(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ afs_int32 code;
+ struct cmd_item *ti;
code = 0;
tconn = GetConn(as, 0);
#define PARMBUFFERSSIZE 32
static afs_int32
-DoSalvage(struct rx_connection * aconn, char * aparm1, char * aparm2,
- char * aoutName, afs_int32 showlog, char * parallel,
- char * atmpDir, char * orphans, int dafs,
+DoSalvage(struct rx_connection * aconn, char * aparm1, char * aparm2,
+ char * aoutName, afs_int32 showlog, char * parallel,
+ char * atmpDir, char * orphans, int dafs,
struct MRAFSSalvageParms * mrafsParm)
{
- register afs_int32 code;
+ afs_int32 code;
char *parms[6];
char buffer;
char tbuffer[BOZO_BSSIZE];
printf("bos: command line too big\n");
return (E2BIG);
}
- strcat(tbuffer, " -f ");
+ strcat(tbuffer, " -force ");
strcat(tbuffer, partName);
}
/* For DAFS, specifying a single volume does not result in a standard
* salvager call. Instead, it simply results in a SALVSYNC call to the
* online salvager daemon. This interface does not give us the same rich
- * set of call flags. Thus, we skip these steps for DAFS single-volume
+ * set of call flags. Thus, we skip these steps for DAFS single-volume
* calls */
if (!dafs || (*aparm2 == 0)) {
/* add the parallel option if given */
if (mrafsParm->OptDontAskFS)
strcat(tbuffer, " -DontAskFS");
if (mrafsParm->OptLogLevel) {
- sprintf(pbuffer, " -LogLevel %ld", mrafsParm->OptLogLevel);
+ sprintf(pbuffer, " -LogLevel %ld", afs_printable_int32_ld(mrafsParm->OptLogLevel));
strcat(tbuffer, pbuffer);
}
if (mrafsParm->OptRxDebug)
strcat(tbuffer, " -rxdebug");
if (mrafsParm->OptResidencies) {
- sprintf(pbuffer, " -Residencies %lu", mrafsParm->OptResidencies);
+ sprintf(pbuffer, " -Residencies %lu",
+ afs_printable_uint32_lu(mrafsParm->OptResidencies));
strcat(tbuffer, pbuffer);
}
}
}
static int
-GetLogCmd(register struct cmd_syndesc *as, void *arock)
+GetLogCmd(struct cmd_syndesc *as, void *arock)
{
struct rx_connection *tconn;
- register struct rx_call *tcall;
- register afs_int32 code;
+ struct rx_call *tcall;
+ afs_int32 code;
char buffer;
int error;
}
static int
+IsDAFS(struct rx_connection *aconn)
+{
+ char buffer[BOZO_BSSIZE];
+ char *tp;
+ struct bozo_status istatus;
+ afs_int32 code;
+
+ tp = &buffer[0];
+
+ code = BOZO_GetInstanceInfo(aconn, "dafs", &tp, &istatus);
+ if (code) {
+ /* no dafs bnode; cannot be dafs */
+ return 0;
+ }
+ if (istatus.goal) {
+ /* dafs bnode is running; we must be dafs */
+ return 1;
+ }
+
+ /* At this point, either we have neither a dafs nor fs bnode running, or
+ * we have an fs bnode running but the dafs bnode is stopped.
+ *
+ * If an fs bnode is running, we are obviously not DAFS. If an fs bnode
+ * is not running and a dafs bnode is not running... it's not certain if
+ * we are DAFS or not DAFS. Just return 0 in that case; it shouldn't much
+ * matter what we return, anyway */
+ return 0;
+}
+
+static int
SalvageCmd(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
- register afs_int32 code, rc, i;
+ struct rx_connection *tconn;
+ afs_int32 code, rc, i;
char *outName;
char tname[BOZO_BSSIZE];
afs_int32 newID;
tp = &tname[0];
/* find out whether fileserver is running demand attach fs */
- if (code = BOZO_GetInstanceParm(tconn, "dafs", 0, &tp) == 0) {
+ if (IsDAFS(tconn)) {
dafs = 1;
serviceName = "dafs";
/* Find out whether fileserver is running MR-AFS (has a scanner instance) */
/* XXX this should really be done some other way, potentially by RPC */
- if (code = BOZO_GetInstanceParm(tconn, serviceName, 4, &tp) == 0)
+ if ((code = BOZO_GetInstanceParm(tconn, serviceName, 4, &tp) == 0))
mrafs = 1;
} else {
serviceName = "fs";
/* Find out whether fileserver is running MR-AFS (has a scanner instance) */
/* XXX this should really be done some other way, potentially by RPC */
- if (code = BOZO_GetInstanceParm(tconn, serviceName, 3, &tp) == 0)
+ if ((code = BOZO_GetInstanceParm(tconn, serviceName, 3, &tp) == 0))
mrafs = 1;
}
&mrafsParm.OptResidencies);
if (code) {
printf("bos: '%s' is not a valid residency mask.\n",
- as->parms[MRAFS_OFFSET + 13].items->data);
+ as->parms[MRAFS_OFFSET + 17].items->data);
return code;
}
}
return 0;
}
-static
-IStatServer(as, int32p)
- int int32p;
- register struct cmd_syndesc *as;
+static int
+IStatServer(struct cmd_syndesc *as, int int32p)
{
- register struct rx_connection *tconn;
- register struct cmd_item *ti;
+ struct rx_connection *tconn;
+ struct cmd_item *ti;
int firstTime = 1;
tconn = GetConn(as, 0);
return 0;
}
-static
-DoStat(aname, aconn, aint32p, firstTime)
- IN char *aname;
- IN register struct rx_connection *aconn;
- IN int aint32p;
- IN int firstTime; /* true iff first instance in cmd */
+static int
+DoStat(IN char *aname,
+ IN struct rx_connection *aconn,
+ IN int aint32p,
+ IN int firstTime) /* true iff first instance in cmd */
{
afs_int32 temp;
char buffer[500];
- register afs_int32 code;
- register afs_int32 i;
+ afs_int32 code;
+ afs_int32 i;
struct bozo_status istatus;
char *tp;
char *is1, *is2, *is3, *is4; /* instance strings */
return 0;
}
-#ifdef BOS_RESTRICTED_MODE
static int
GetRestrict(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
+ struct rx_connection *tconn;
afs_int32 code, val;
tconn = GetConn(as, 0);
static int
SetRestrict(struct cmd_syndesc *as, void *arock)
{
- register struct rx_connection *tconn;
+ struct rx_connection *tconn;
afs_int32 code, val;
tconn = GetConn(as, 0);
printf("bos: failed to set restricted mode (%s)\n", em(code));
return 0;
}
-#endif
static void
-add_std_args(ts)
- register struct cmd_syndesc *ts;
+add_std_args(struct cmd_syndesc *ts)
{
cmd_Seek(ts, ADDPARMOFFSET);
/* + 0 */ cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");
#include "AFS_component_version_number.c"
-main(argc, argv)
- int argc;
- char **argv;
+int
+main(int argc, char **argv)
{
- register afs_int32 code;
- register struct cmd_syndesc *ts;
+ afs_int32 code;
+ struct cmd_syndesc *ts;
extern int afsconf_SawCell;
#ifdef AFS_AIX32_ENV
/*
- * The following signal action for AIX is necessary so that in case of a
- * crash (i.e. core is generated) we can include the user's data section
+ * The following signal action for AIX is necessary so that in case of a
+ * crash (i.e. core is generated) we can include the user's data section
* in the core dump. Unfortunately, by default, only a partial core is
* generated which, in many cases, isn't too useful.
*/
cmd_AddParm(ts, "-newbinary", CMD_FLAG, CMD_OPTIONAL,
"set new binary restart time");
add_std_args(ts);
+ cmd_CreateAlias(ts, "setr");
ts = cmd_CreateSyntax("getrestart", GetRestartCmd, NULL,
"get restart times");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name");
add_std_args(ts);
+ cmd_CreateAlias(ts, "getr");
ts = cmd_CreateSyntax("salvage", SalvageCmd, NULL,
"salvage partition or volumes");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name");
add_std_args(ts);
-#ifdef BOS_RESTRICTED_MODE
ts = cmd_CreateSyntax("getrestricted", GetRestrict, NULL,
"get restrict mode");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-mode", CMD_SINGLE, 0, "mode to set");
add_std_args(ts);
#endif
-#endif
code = cmd_Dispatch(argc, argv);
rx_Finalize();
git://git.openafs.org / openafs.git / blobdiff