#include <sys/time.h>
#include <stdio.h>
#include <ctype.h>
-#include <strings.h>
+#include <string.h>
#include <sys/file.h>
#include <afs/param.h>
#include "pterror.h"
#define IDHash(x) (abs(x) % HASHSIZE)
-#define print_id(x) ( ((flags&DO_SYS)==0 && (abs(x)>32767)) || \
- ((flags&DO_OTR)==0 && (abs(x)<32768)))
+#define print_id(x) ( ((flags&DO_SYS)==0 && (x<-32767 || x>97536)) || \
+ ((flags&DO_OTR)==0 && (x>-32768 && x<97537)))
extern char *optarg;
extern int optind;
struct usr_list *next;
char name[PR_MAXNAMELEN];
long uid;
- long oid;
- long cid;
- long flags;
- int quota;
};
static struct usr_list *usr_head=0;
int argc;
char **argv;
{
- int cc;
- int offset;
register int i;
- register struct ubik_hdr *uh;
- char *pfile = "/usr/afs/db/prdb.DB0";
+ register long code;
+ long cc, upos, gpos;
+ struct prentry uentry, gentry;
+ struct ubik_hdr *uh;
char *dfile = 0;
+ char *pfile = "/usr/afs/db/prdb.DB0";
while ((cc = getopt(argc, argv, "wugmxsnp:d:")) != EOF) {
switch (cc) {
break;
default:
fprintf(stderr,
- "Usage: ptdump [options] [-d data] [-p prdb]\n");
+ "Usage: pt_util [options] [-d data] [-p prdb]\n");
fputs(" Options:\n", stderr);
fputs(" -w Update prdb with contents of data file\n", stderr);
fputs(" -u Display users\n", stderr);
if (ntohl(uh->magic) != UBIK_MAGIC)
fprintf(stderr, "ptdump: %s: Bad UBIK_MAGIC. Is %x should be %x\n",
pfile, ntohl(uh->magic), UBIK_MAGIC);
- bcopy(&uh->version, &uv, sizeof(struct ubik_version));
+ memcpy(&uv, &uh->version, sizeof(struct ubik_version));
+ if (wflag && uv.epoch==0 && uv.counter==0) {
+ uv.epoch=2; /* a ubik version of 0 or 1 has special meaning */
+ memcpy(&uh->version, &uv, sizeof(struct ubik_version));
+ lseek(dbase_fd, 0, SEEK_SET);
+ if (write(dbase_fd, buffer, HDRSIZE) < 0) {
+ fprintf(stderr, "ptdump: error writing ubik version to %s: %s\n",
+ pfile, sys_errlist[errno]);
+ exit (1);
+ }
+ }
fprintf(stderr, "Ubik Version is: %d.%d\n",
uv.epoch, uv.counter);
if (read(dbase_fd, &prh, sizeof(struct prheader)) < 0) {
exit (1);
}
+ Initdb();
initialize_pt_error_table();
- initialize_rxk_error_table();
- initialize_acfg_error_table();
if (wflag) {
struct usr_list *u;
if (isspace(*buffer)) {
sscanf(buffer, "%s %d", mem, &uid);
+
for (u=usr_head; u; u=u->next)
if (u->uid && u->uid==uid) break;
if (u) {
- i = PR_INewEntry(u->cid, u->name, u->uid, u->oid);
+ /* Add user - deferred because it is probably foreign */
u->uid = 0;
- if (i) {
- fprintf(stderr, "Error while creating %s: %s\n",
- name, error_message(i));
- continue;
+ if (FindByID(0, uid))
+ code = PRIDEXIST;
+ else {
+ if (!code && (flags&(PRGRP|PRQUOTA))==(PRGRP|PRQUOTA)){
+ gentry.ngroups++;
+ code = pr_WriteEntry(0,0,gpos,&gentry);
+ if (code)
+ fprintf(stderr, "Error setting group count on %s: %s\n",
+ name, error_message(code));
+ }
+ code = CreateEntry
+ (0, u->name, &uid, 1/*idflag*/, 1/*gflag*/,
+ SYSADMINID/*oid*/, SYSADMINID/*cid*/);
}
- i = PR_SetFieldsEntry(NULL, id,
- ((flags&PRQUOTA)?PR_SF_NGROUPS:0)|
- ((flags&PRACCESS)?PR_SF_ALLBITS:0),
- flags >> PRIVATE_SHIFT,
- quota, 0, 0, 0);
- if (i)
- fprintf(stderr, "Error while setting flags on %s\n",
- name);
+ if (code)
+ fprintf(stderr, "Error while creating %s: %s\n",
+ u->name, error_message(code));
+ continue;
}
- i = PR_AddToGroup(NULL,uid,id);
- if (i==0 || i==PRIDEXIST) continue;
- fprintf(stderr, "Error while adding %s to %s: %s\n",
- mem, name, error_message(i));
+ /* Add user to group */
+ if (id==ANYUSERID || id==AUTHUSERID || uid==ANONYMOUSID) {
+ code = PRPERM;
+ } else if ((upos=FindByID(0,uid)) && (gpos=FindByID(0,id))) {
+ code = pr_ReadEntry(0,0,upos,&uentry);
+ if (!code) code = pr_ReadEntry(0,0,gpos,&gentry);
+ if (!code) code = AddToEntry (0, &gentry, gpos, uid);
+ if (!code) code = AddToEntry (0, &uentry, upos, id);
+ } else
+ code = PRNOENT;
+
+ if (code)
+ fprintf(stderr, "Error while adding %s to %s: %s\n",
+ mem, name, error_message(code));
} else {
sscanf(buffer, "%s %d/%d %d %d %d",
name, &flags, "a, &id, &oid, &cid);
- i = PR_INewEntry(cid, name, id, oid);
- if (i == PRBADNAM) {
+
+ if (FindByID(0, id))
+ code = PRIDEXIST;
+ else
+ code = CreateEntry(0, name, &id, 1/*idflag*/,
+ flags&PRGRP, oid, cid);
+ if (code == PRBADNAM) {
u = (struct usr_list *)malloc(sizeof(struct usr_list));
u->next = usr_head;
u->uid = id;
- u->oid = oid;
- u->cid = cid;
- u->flags = flags;
- u->quota = quota;
strcpy(u->name, name);
usr_head = u;
- continue;
- }
- if (i && i != PRIDEXIST) {
+ } else
+ if (code) {
fprintf(stderr, "Error while creating %s: %s\n",
- name, error_message(i));
- continue;
+ name, error_message(code));
+ } else if ((flags&PRACCESS) ||
+ (flags&(PRGRP|PRQUOTA))==(PRGRP|PRQUOTA)) {
+ gpos = FindByID(0, id);
+ code = pr_ReadEntry(0,0,gpos,&gentry);
+ if (!code) {
+ gentry.flags = flags;
+ gentry.ngroups = quota;
+ code = pr_WriteEntry(0,0,gpos,&gentry);
+ }
+ if (code)
+ fprintf(stderr,"Error while setting flags on %s: %s\n",
+ name, error_message(code));
}
- i = PR_SetFieldsEntry(NULL, id,
- ((flags&PRQUOTA) ? PR_SF_NGROUPS : 0)|
- ((flags&PRACCESS) ? PR_SF_ALLBITS : 0),
- flags >> PRIVATE_SHIFT,
- quota, 0, 0, 0);
- if (i)
- fprintf(stderr, "Error while setting flags on %s: %s\n",
- name, error_message(i));
}
}
for (u=usr_head; u; u=u->next)
u->name, error_message(PRBADNAM));
} else {
for (i = 0; i < HASHSIZE; i++) {
- offset = nflag ? ntohl(prh.nameHash[i]) : ntohl(prh.idHash[i]);
- while (offset)
- offset = display_entry(offset);
+ upos = nflag ? ntohl(prh.nameHash[i]) : ntohl(prh.idHash[i]);
+ while (upos)
+ upos = display_entry(upos);
}
if (flags & DO_GRP)
display_groups();
andersk / moira.git / blobdiff