jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

generic-client-init-function-20041009

Browse Source 
FIXES 15464

so we can have this code in just one place
This commit is contained in:
Derrick Brashear 2004-10-10 02:53:32 +00:00
parent d764e768f9
commit d4d2fc4386
14 changed files with 249 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/WINNT/afsd/fs.c
View File

@ -2447,7 +2447,7 @@ struct afsconf_cell *info;
}
else {
/* got a ticket */
if (ttoken.kvno >= 0 && ttoken.kvno <= 255) scIndex = 2; /* kerberos */
if (ttoken.kvno >= 0 && ttoken.kvno <= 256) scIndex = 2; /* kerberos */
else {
fprintf (stderr, "fs: funny kvno (%d) in ticket, proceeding\n",
ttoken.kvno);

2
src/bozo/bos.c
View File

@ -239,7 +239,7 @@ GetConn(as, aencrypt)
code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
if (code == 0) {
/* have tickets, will travel */
if (ttoken.kvno >= 0 && ttoken.kvno <= 255);
if (ttoken.kvno >= 0 && ttoken.kvno <= 256);
else {
fprintf(stderr,
"bos: funny kvno (%d) in ticket, proceeding\n",

4
src/libafsauthent/Makefile.in
View File

@ -48,6 +48,7 @@ KAUTHOBJS = \
read_passwd.o
UBIKOBJS = \
uinit.o \
ubikclient.o \
uerrors.o \
ubik_int.cs.o \
@ -160,6 +161,9 @@ read_passwd.o: ${KAUTH}/read_passwd.c
ubikclient.o: ${UBIK}/ubikclient.c
${CCRULE}
uinit.o: ${UBIK}/uinit.c
${CCRULE}
uerrors.o: ${UBIK}/uerrors.c
${CCRULE}

1
src/libafsauthent/NTMakefile
View File

@ -53,6 +53,7 @@ KAUTHOBJS = \
$(OUT)\user_nt.obj
UBIKOBJS = \
$(OUT)\uinit.obj \
$(OUT)\ubikclient.obj \
$(OUT)\uerrors.obj \
$(OUT)\ubik_int.cs.obj \

2
src/ptserver/ptuser.c
View File

@ -168,7 +168,7 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
if (code)
scIndex = 0;
else {
if (ttoken.kvno >= 0 && ttoken.kvno <= 255)
if (ttoken.kvno >= 0 && ttoken.kvno <= 256)
/* this is a kerberos ticket, set scIndex accordingly */
scIndex = 2;
else {

2
src/scout/Makefile.in
View File

@ -24,6 +24,7 @@ INCLS=${TOP_INCDIR}/afs/gtxobjects.h \
LIBS=${TOP_LIBDIR}/libgtx.a \
${TOP_LIBDIR}/libfsprobe.a \
${TOP_LIBDIR}/libvolser.a \
${TOP_LIBDIR}/libubik.a \
${TOP_LIBDIR}/libkauth.a \
${TOP_LIBDIR}/libauth.a \
${TOP_LIBDIR}/librxkad.a \
@ -31,7 +32,6 @@ LIBS=${TOP_LIBDIR}/libgtx.a \
${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \
${TOP_LIBDIR}/libvldb.a \
${TOP_LIBDIR}/libubik.a \
${TOP_LIBDIR}/libafsint.a \
${TOP_LIBDIR}/libsys.a \
${TOP_LIBDIR}/librx.a \

4
src/shlibafsauthent/Makefile.in
View File

@ -53,6 +53,7 @@ KAUTHOBJS = \
read_passwd.o
UBIKOBJS = \
uinit.o \
ubikclient.o \
uerrors.o \
ubik_int.cs.o \
@ -175,6 +176,9 @@ read_passwd.o: ${KAUTH}/read_passwd.c
ubikclient.o: ${UBIK}/ubikclient.c
${CCRULE}
uinit.o: ${UBIK}/uinit.c
${CCRULE}
uerrors.o: ${UBIK}/uerrors.c
${CCRULE}

3
src/ubik/Makefile.in
View File

@ -10,7 +10,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \
ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \
ubikclient.o uerrors.o
ubikclient.o uerrors.o uinit.o
INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
@ -99,6 +99,7 @@ libubik.a: ${LIBOBJS} AFS_component_version_number.o
$(RANLIB) $@
disk.o: disk.c ${INCLS}
uinit.o: uinit.c ${INCLS}
remote.o: remote.c ${INCLS}
beacon.o: beacon.c ${INCLS}
lock.o: lock.c ${INCLS}

1
src/ubik/NTMakefile
View File

@ -31,6 +31,7 @@ LIBOBJS =\
$(OUT)\beacon.obj \
$(OUT)\recovery.obj \
$(OUT)\ubik.obj \
$(OUT)\uinit.obj \
$(OUT)\vote.obj \
$(OUT)\lock.obj \
$(OUT)\phys.obj \

11
src/ubik/ubik.p.h
View File

@ -359,4 +359,15 @@ extern int ubik_BeginTrans(register struct ubik_dbase *dbase,
afs_int32 transMode, struct ubik_trans **transPtr);
extern int ubik_EndTrans(register struct ubik_trans *transPtr);
/* uinit.c */
extern afs_int32 ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName,
afs_int32 sauth,
struct ubik_client **uclientp,
int (*secproc) (), char *funcName,
afs_int32 gen_rxkad_level,
afs_int32 maxservers, afs_int32 serviceid,
afs_int32 deadtime, afs_uint32 server,
afs_uint32 port, afs_int32 usrvid);
#endif /* UBIK_H */

206
src/ubik/uinit.c Normal file
View File

@ -0,0 +1,206 @@
/*
* 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>
RCSID
("$Header$");
#include <afs/stds.h>
#ifdef AFS_NT40_ENV
#include <fcntl.h>
#include <winsock2.h>
#else
#include <sys/types.h>
#include <sys/file.h>
#include <netdb.h>
#include <netinet/in.h>
#endif /* AFS_NT40_ENV */
#include <sys/stat.h>
#ifdef AFS_AIX_ENV
#include <sys/statfs.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#else
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#endif
#include <afs/dirpath.h>
#include <errno.h>
#include <lock.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <rx/rx_globals.h>
#include <afs/auth.h>
#include <afs/cellconfig.h>
#include <afs/keys.h>
#include <ubik.h>
#include <afs/afsint.h>
#include <afs/cmd.h>
#include <rx/rxkad.h>
/*
Get the appropriate type of ubik client structure out from the system.
*/
afs_int32
ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName, afs_int32 sauth,
struct ubik_client **uclientp, int (*secproc) (),
char *funcName, afs_int32 gen_rxkad_level,
afs_int32 maxservers, afs_int32 serviceid, afs_int32 deadtime,
afs_uint32 server, afs_uint32 port, afs_int32 usrvid)
{
afs_int32 code, scIndex, i;
struct afsconf_cell info;
struct afsconf_dir *tdir;
struct ktc_principal sname;
struct ktc_token ttoken;
struct rx_securityClass *sc;
/* This must change if VLDB_MAXSERVERS becomes larger than MAXSERVERS */
static struct rx_connection *serverconns[MAXSERVERS];
char cellstr[64];
code = rx_Init(0);
if (code) {
fprintf(stderr, "%s: could not initialize rx.\n", funcName);
return code;
}
rx_SetRxDeadTime(deadtime);
if (sauth) { /* -localauth */
tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
if (!tdir) {
fprintf(stderr,
"%s: Could not process files in configuration directory (%s).\n",
funcName, AFSDIR_SERVER_ETC_DIRPATH);
return -1;
}
code = afsconf_ClientAuth(tdir, &sc, &scIndex); /* sets sc,scIndex */
if (code) {
fprintf(stderr,
"%s: Could not get security object for -localAuth\n",
funcName);
return -1;
}
code =
afsconf_GetCellInfo(tdir, tdir->cellName, serviceid,
&info);
if (code) {
fprintf(stderr,
"%s: can't find cell %s's hosts in %s/%s\n",
funcName, cellName, AFSDIR_SERVER_ETC_DIRPATH,
AFSDIR_CELLSERVDB_FILE);
exit(1);
}
} else { /* not -localauth */
tdir = afsconf_Open(confDir);
if (!tdir) {
fprintf(stderr,
"%s: Could not process files in configuration directory (%s).\n",
funcName, confDir);
return -1;
}
if (!cellName) {
code = afsconf_GetLocalCell(tdir, cellstr, sizeof(cellstr));
if (code) {
fprintf(stderr,
"%s: can't get local cellname, check %s/%s\n",
funcName, confDir, AFSDIR_THISCELL_FILE);
exit(1);
}
cellName = cellstr;
}
code =
afsconf_GetCellInfo(tdir, cellName, serviceid, &info);
if (code) {
fprintf(stderr,
"%s: can't find cell %s's hosts in %s/%s\n",
funcName, cellName, confDir, AFSDIR_CELLSERVDB_FILE);
exit(1);
}
if (noAuthFlag) /* -noauth */
scIndex = 0;
else { /* not -noauth */
strcpy(sname.cell, info.name);
sname.instance[0] = 0;
strcpy(sname.name, "afs");
code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
if (code) { /* did not get ticket */
fprintf(stderr,
"%s: Could not get afs tokens, running unauthenticated.\n",
funcName);
scIndex = 0;
} else { /* got a ticket */
scIndex = 2;
if ((ttoken.kvno < 0) || (ttoken.kvno > 256)) {
fprintf(stderr,
"%s: funny kvno (%d) in ticket, proceeding\n",
funcName, ttoken.kvno);
}
}
}
switch (scIndex) {
case 0:
sc = rxnull_NewClientSecurityObject();
break;
case 2:
sc = rxkad_NewClientSecurityObject(gen_rxkad_level,
&ttoken.sessionKey,
ttoken.kvno, ttoken.ticketLen,
ttoken.ticket);
break;
default:
fprintf(stderr, "%s: unsupported security index %d\n",
funcName, scIndex);
exit(1);
break;
}
}
afsconf_Close(tdir);
if (secproc) /* tell UV module about default authentication */
(*secproc) (sc, scIndex);
if (server) {
serverconns[0] = rx_NewConnection(server, port,
usrvid, sc, scIndex);
} else {
if (info.numServers > maxservers) {
fprintf(stderr,
"%s: info.numServers=%d (> maxservers=%d)\n",
funcName, info.numServers, maxservers);
exit(1);
}
for (i = 0; i < info.numServers; i++) {
serverconns[i] =
rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
info.hostAddr[i].sin_port, usrvid,
sc, scIndex);
}
}
/* Are we just setting up connections, or is this really ubik stuff? */
if (uclientp) {
*uclientp = 0;
code = ubik_ClientInit(serverconns, uclientp);
if (code) {
fprintf(stderr, "%s: ubik client init failed.\n", funcName);
return code;
}
}
return 0;
}

73
src/venus/fs.c
View File

@ -2659,75 +2659,14 @@ static int
VLDBInit(int noAuthFlag, struct afsconf_cell *info)
{
afs_int32 code;
struct ktc_principal sname;
struct ktc_token ttoken;
afs_int32 scIndex;
struct rx_securityClass *sc;
struct rx_connection *serverconns[VLDB_MAXSERVERS];
afs_int32 i;
code = rx_Init(0);
if (code) {
fprintf(stderr, "%s: could not initialize rx.\n", pn);
return code;
}
code = ugen_ClientInit(noAuthFlag, AFSDIR_CLIENT_ETC_DIRPATH,
info->name, 0, &uclient,
NULL, pn, rxkad_clear,
VLDB_MAXSERVERS, AFSCONF_VLDBSERVICE, 50,
0, 0, USER_SERVICE_ID);
rxInitDone = 1;
rx_SetRxDeadTime(50);
if (!noAuthFlag) { /* we don't need tickets for null */
strcpy(sname.cell, info->name);
sname.instance[0] = 0;
strcpy(sname.name, "afs");
code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
if (code) {
fprintf(stderr,
"%s: Could not get afs tokens, running unauthenticated.\n",
pn);
scIndex = 0;
} else {
/* got a ticket */
if (ttoken.kvno >= 0 && ttoken.kvno <= 255)
scIndex = 2; /* kerberos */
else {
fprintf(stderr, "%s: funny kvno (%d) in ticket, proceeding\n",
pn, ttoken.kvno);
scIndex = 2;
}
}
} else
scIndex = 0; /* don't authenticate */
switch (scIndex) {
case 0:
sc = rxnull_NewClientSecurityObject();
break;
case 1:
break;
case 2:
sc = (struct rx_securityClass *)
rxkad_NewClientSecurityObject(rxkad_clear, &ttoken.sessionKey,
ttoken.kvno, ttoken.ticketLen,
ttoken.ticket);
break;
}
if (info->numServers > VLDB_MAXSERVERS) {
fprintf(stderr, "%s: info.numServers=%d (> VLDB_MAXSERVERS=%d)\n", pn,
info->numServers, VLDB_MAXSERVERS);
exit(1);
}
memset(serverconns, 0, sizeof(serverconns));
for (i = 0; i < info->numServers; i++)
serverconns[i] =
rx_NewConnection(info->hostAddr[i].sin_addr.s_addr,
info->hostAddr[i].sin_port, USER_SERVICE_ID, sc,
scIndex);
code = ubik_ClientInit(serverconns, &uclient);
if (code) {
fprintf(stderr, "%s: ubik client init failed.\n", pn);
return code;
}
return 0;
return code;
}
static struct ViceIoctl gblob;

97
src/vlserver/vlclient.c
View File

@ -162,102 +162,17 @@ GetVolume(vol, entry)
/* Almost identical's to pr_Initialize in vlserver/pruser.c */
afs_int32
vl_Initialize(auth, confDir, server, cellp)
int auth, server;
char *confDir, *cellp;
vl_Initialize(int auth, char *confDir, int server, char *cellp)
{
afs_int32 code;
struct afsconf_dir *tdir;
struct ktc_principal sname;
struct ktc_token ttoken;
afs_int32 scIndex = 0;
struct rx_securityClass *sc;
struct afsconf_cell info;
afs_int32 i;
code = rx_Init(0);
if (code) {
fprintf(stderr, "vl_Initialize: Could not initialize rx.\n");
return code;
}
rx_SetRxDeadTime(50);
if (!server) {
tdir = afsconf_Open(confDir);
if (!tdir) {
fprintf(stderr, "Could not open configuration directory (%s).\n",
confDir);
return -1;
}
}
if (auth) { /* we don't need tickets for null */
if (!server) {
code = afsconf_GetLocalCell(tdir, sname.cell, sizeof(sname.cell));
if (code) {
fprintf(stderr,
"vl_Initialize: Could not get local cell name.\n");
return code;
}
} else
strncpy(sname.cell, cellp, sizeof(sname.cell));
sname.instance[0] = 0;
strcpy(sname.name, "afs");
code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
if (code) {
fprintf(stderr,
"vl_Initialize: Could not get afs tokens, running unauthenticated.\n");
scIndex = 0;
} else if (ttoken.kvno <= 255)
scIndex = 2;
else { /* bcrypt */
fprintf(stderr,
"vl_Initialize: funny kvno (%d) in ticket, proceeding\n",
ttoken.kvno);
scIndex = 2;
}
}
switch (scIndex) {
case 0:
sc = rxnull_NewClientSecurityObject();
break;
case 1:
return -1;
case 2:
sc = rxkad_NewClientSecurityObject(rxkad_clear, &ttoken.sessionKey,
ttoken.kvno, ttoken.ticketLen,
ttoken.ticket);
}
if (!server) {
code = afsconf_GetCellInfo(tdir, NULL, AFSCONF_VLDBSERVICE, &info);
if (info.numServers > MAXSERVERS) {
fprintf(stderr,
"vl_Initialize: info.numServers=%d (> MAXSERVERS=%d)\n",
info.numServers, MAXSERVERS);
exit(1);
}
for (i = 0; i < info.numServers; i++)
serverconns[i] =
rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
info.hostAddr[i].sin_port, USER_SERVICE_ID,
sc, scIndex);
} else {
serverconns[0] =
rx_NewConnection(server, htons(AFSCONF_VLDBPORT), USER_SERVICE_ID,
sc, scIndex);
}
code = ubik_ClientInit(serverconns, &cstruct);
if (code) {
fprintf(stderr, "vl_Initialize: ubik client init failed.\n");
return code;
}
return 0;
return ugen_ClientInit(auth?0:1, confDir, cellp, 0,
&cstruct, NULL, "vl_Initialize", rxkad_clear,
MAXSERVERS, AFSCONF_VLDBSERVICE, 50, server,
htons(AFSCONF_VLDBPORT), USER_SERVICE_ID);
}
/* return host address in network byte order */
afs_int32
GetServer(aname)
char *aname;
GetServer(char *aname)
{
register struct hostent *th;
afs_int32 addr;

126
src/volser/vsutils.c
View File

@ -445,128 +445,10 @@ vsu_ClientInit(noAuthFlag, confDir, cellName, sauth, uclientp, secproc)
static struct rx_connection *serverconns[VLDB_MAXSERVERS];
char cellstr[64];
code = rx_Init(0);
if (code) {
fprintf(STDERR, "vsu_ClientInit: could not initialize rx.\n");
return code;
}
rx_SetRxDeadTime(90);
if (sauth) { /* -localauth */
tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
if (!tdir) {
fprintf(STDERR,
"vsu_ClientInit: Could not process files in configuration directory (%s).\n",
AFSDIR_SERVER_ETC_DIRPATH);
return -1;
}
code = afsconf_ClientAuth(tdir, &sc, &scIndex); /* sets sc,scIndex */
if (code) {
fprintf(STDERR,
"vsu_ClientInit: Could not get security object for -localAuth\n");
return -1;
}
code =
afsconf_GetCellInfo(tdir, tdir->cellName, AFSCONF_VLDBSERVICE,
&info);
if (code) {
fprintf(STDERR,
"vsu_ClientInit: can't find cell %s's hosts in %s/%s\n",
cellName, AFSDIR_SERVER_ETC_DIRPATH,
AFSDIR_CELLSERVDB_FILE);
exit(1);
}
} else { /* not -localauth */
tdir = afsconf_Open(confDir);
if (!tdir) {
fprintf(STDERR,
"vsu_ClientInit: Could not process files in configuration directory (%s).\n",
confDir);
return -1;
}
if (!cellName) {
code = afsconf_GetLocalCell(tdir, cellstr, sizeof(cellstr));
if (code) {
fprintf(STDERR,
"vsu_ClientInit: can't get local cellname, check %s/%s\n",
confDir, AFSDIR_THISCELL_FILE);
exit(1);
}
cellName = cellstr;
}
code =
afsconf_GetCellInfo(tdir, cellName, AFSCONF_VLDBSERVICE, &info);
if (code) {
fprintf(STDERR,
"vsu_ClientInit: can't find cell %s's hosts in %s/%s\n",
cellName, confDir, AFSDIR_CELLSERVDB_FILE);
exit(1);
}
if (noAuthFlag) /* -noauth */
scIndex = 0;
else { /* not -noauth */
strcpy(sname.cell, info.name);
sname.instance[0] = 0;
strcpy(sname.name, "afs");
code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
if (code) { /* did not get ticket */
fprintf(STDERR,
"vsu_ClientInit: Could not get afs tokens, running unauthenticated.\n");
scIndex = 0;
} else { /* got a ticket */
scIndex = 2;
if ((ttoken.kvno < 0) || (ttoken.kvno > 255)) {
fprintf(STDERR,
"vsu_ClientInit: funny kvno (%d) in ticket, proceeding\n",
ttoken.kvno);
}
}
}
switch (scIndex) {
case 0:
sc = rxnull_NewClientSecurityObject();
break;
case 2:
sc = rxkad_NewClientSecurityObject(vsu_rxkad_level,
&ttoken.sessionKey,
ttoken.kvno, ttoken.ticketLen,
ttoken.ticket);
break;
default:
fprintf(STDERR, "vsu_ClientInit: unsupported security index %d\n",
scIndex);
exit(1);
break;
}
}
afsconf_Close(tdir);
if (secproc) /* tell UV module about default authentication */
(*secproc) (sc, scIndex);
if (info.numServers > VLDB_MAXSERVERS) {
fprintf(STDERR,
"vsu_ClientInit: info.numServers=%d (> VLDB_MAXSERVERS=%d)\n",
info.numServers, VLDB_MAXSERVERS);
exit(1);
}
for (i = 0; i < info.numServers; i++) {
serverconns[i] =
rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
info.hostAddr[i].sin_port, USER_SERVICE_ID, sc,
scIndex);
}
*uclientp = 0;
code = ubik_ClientInit(serverconns, uclientp);
if (code) {
fprintf(STDERR, "vsu_ClientInit: ubik client init failed.\n");
return code;
}
return 0;
return ugen_ClientInit(noAuthFlag, confDir, cellName, sauth, uclientp,
secproc, "vsu_ClientInit", vsu_rxkad_level,
VLDB_MAXSERVERS, AFSCONF_VLDBSERVICE, 90,
0, 0, USER_SERVICE_ID);
}