jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

auth: Relocate NetRestrict support functions

Browse Source 
Pull the NetRestrict and NetInfo support functions out of libutil,
and into libauth. This starts to concentrate all of our configuration
file parsing functions into the same place.

It also gets rid of a circular dependency. NetRestrict parsing relies
on functions from rx, so with this in libutil, we had the dependency
chain util->rx->util

Change-Id: I250d4d8264da8db61f603a06d1b7fdab44384cd3
Reviewed-on: http://gerrit.openafs.org/8027
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Simon Wilkinson 2012-05-20 12:57:00 +01:00 committed by Derrick Brashear
parent 6705646e8d
commit 1e76c59ea5
35 changed files with 109 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/WINNT/install/wix/files.wxi
View File

@ -1589,7 +1589,6 @@
<File Id="filelockprocs_prototypes_H" Name="LOCKPROC.h" LongName="lockprocs_prototypes.h" DiskId="1" src="$(var.IncDir)afs\lockprocs_prototypes.h" />
<File Id="filemit_sipb_cr_H" Name="MITSIPBC.h" LongName="mit-sipb-cr.h" DiskId="1" src="$(var.IncDir)afs\mit-sipb-cr.h" />
<File Id="filenamei_ops_H" Name="nameiops.h" LongName="namei_ops.h" DiskId="1" src="$(var.IncDir)afs\namei_ops.h" />
<File Id="filenetutils_H" Name="netutil.h" LongName="netutils.h" DiskId="1" src="$(var.IncDir)afs\netutils.h" />
<File Id="filenfs_H" Name="nfs.h" LongName="nfs.h" DiskId="1" src="$(var.IncDir)afs\nfs.h" />
<File Id="filentops_H" Name="ntops.h" LongName="ntops.h" DiskId="1" src="$(var.IncDir)afs\ntops.h" />
<File Id="fileopr_H" Name="opr.h" LongName="opr.h" DiskId="1" src="$(var.IncDir)afs\opr.h" />

14
src/afsd/afsd.c
View File

@ -398,10 +398,9 @@ afsd_update_addresses(CFRunLoopTimerRef timer, void *info)
char reason[1024];
int code;
code =
parseNetFiles(addrbuf, maskbuf, mtubuf, MAXIPADDRS, reason,
AFSDIR_CLIENT_NETINFO_FILEPATH,
AFSDIR_CLIENT_NETRESTRICT_FILEPATH);
code = afsconf_ParseNetFiles(addrbuf, maskbuf, mtubuf, MAXIPADDRS,
reason, AFSDIR_CLIENT_NETINFO_FILEPATH,
AFSDIR_CLIENT_NETRESTRICT_FILEPATH);
if (code > 0) {
/* Note we're refreshing */
@ -2125,10 +2124,9 @@ afsd_run(void)
afs_uint32 addrbuf[MAXIPADDRS], maskbuf[MAXIPADDRS],
mtubuf[MAXIPADDRS];
char reason[1024];
code =
parseNetFiles(addrbuf, maskbuf, mtubuf, MAXIPADDRS, reason,
AFSDIR_CLIENT_NETINFO_FILEPATH,
AFSDIR_CLIENT_NETRESTRICT_FILEPATH);
code = afsconf_ParseNetFiles(addrbuf, maskbuf, mtubuf, MAXIPADDRS, reason,
AFSDIR_CLIENT_NETINFO_FILEPATH,
AFSDIR_CLIENT_NETRESTRICT_FILEPATH);
if (code > 0) {
if (enable_rxbind)
code = code | 0x80000000;

5
src/auth/Makefile.in
View File

@ -11,9 +11,9 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp
OBJS= cellconfig.o keys.o ktc.o userok.o writeconfig.o authcon.o \
acfg_errors.o ktc_errors.o token.xdr.o token.o realms.o
acfg_errors.o ktc_errors.o token.xdr.o token.o realms.o netrestrict.o
KOBJS= cellconfig.o keys.o ktc.krb.o userok.o writeconfig.o authcon.o \
acfg_errors.o ktc_errors.o token.xdr.o token.o realms.o
acfg_errors.o ktc_errors.o token.xdr.o token.o realms.o netrestrict.o
LIBS=libauth.a \
${TOP_LIBDIR}/librxkad.a \
@ -71,6 +71,7 @@ cellconfig.o: cellconfig.c ${INCLS}
copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o
setkey.o: setkey.c ${INCLS} AFS_component_version_number.o
realms.o: realms.c ${INCLS}
netrestrict.o: ${INCLS}
CFLAGS_ktc.krb.o = -DAFS_KERBEROS_ENV
ktc.krb.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h

1
src/auth/NTMakefile
View File

@ -47,6 +47,7 @@ AFSAUTH_LIBOBJS =\
$(OUT)\ktc_nt.obj \
$(OUT)\token.obj \
$(OUT)\token.xdr.obj \
$(OUT)\netrestrict.obj \
$(OUT)\AFS_component_version_number.obj
AFSDOBJS =\

12
src/auth/cellconfig.p.h
View File

@ -260,6 +260,18 @@ extern int afsconf_IsLocalRealmMatch(struct afsconf_dir *dir, afs_int32 * local,
const char *name, const char *instance,
const char *cell);
/* netrestrict.c */
extern int afsconf_ParseNetRestrictFile(afs_uint32 outAddrs[],
afs_uint32 * mask, afs_uint32 * mtu,
afs_uint32 maxAddrs, afs_uint32 * nAddrs,
char reason[], const char *fileName);
extern int afsconf_ParseNetFiles(afs_uint32 addrbuf[], afs_uint32 maskbuf[],
afs_uint32 mtubuf[], afs_uint32 max,
char reason[], const char *niFileName,
const char *nrFileName);
/* some well-known ports and their names; new additions to table in cellconfig.c, too */
#define AFSCONF_FILESERVICE "afs"
#define AFSCONF_FILEPORT 7000

32
src/util/netutils.c → src/auth/netrestrict.c
View File

@ -21,14 +21,14 @@
#include <rx/rx.h>
#include <afs/dirpath.h>
#include "afsutil.h"
#include "cellconfig.h"
#define AFS_IPINVALID 0xffffffff /* invalid IP address */
#define AFS_IPINVALIDIGNORE 0xfffffffe /* no input given to extractAddr */
#define MAX_NETFILE_LINE 2048 /* length of a line in the netrestrict file */
#define MAXIPADDRS 1024 /* from afsd.c */
int ParseNetInfoFile_int(afs_uint32 *, afs_uint32 *, afs_uint32 *,
static int ParseNetInfoFile_int(afs_uint32 *, afs_uint32 *, afs_uint32 *,
int, char reason[], const char *,
int);
/*
@ -105,7 +105,7 @@ extract_Addr(char *line, int maxSize)
const char *fileName; * filename to parse *
*/
int
static int
parseNetRestrictFile_int(afs_uint32 outAddrs[], afs_uint32 * mask,
afs_uint32 * mtu, afs_uint32 maxAddrs,
afs_uint32 * nAddrs, char reason[],
@ -207,10 +207,10 @@ parseNetRestrictFile_int(afs_uint32 outAddrs[], afs_uint32 * mask,
}
int
parseNetRestrictFile(afs_uint32 outAddrs[], afs_uint32 * mask,
afs_uint32 * mtu, afs_uint32 maxAddrs,
afs_uint32 * nAddrs, char reason[],
const char *fileName)
afsconf_ParseNetRestrictFile(afs_uint32 outAddrs[], afs_uint32 * mask,
afs_uint32 * mtu, afs_uint32 maxAddrs,
afs_uint32 * nAddrs, char reason[],
const char *fileName)
{
return parseNetRestrictFile_int(outAddrs, mask, mtu, maxAddrs, nAddrs, reason, fileName, NULL);
}
@ -223,7 +223,7 @@ parseNetRestrictFile(afs_uint32 outAddrs[], afs_uint32 * mask,
* be valid. This function returns the number of valid
* interface addresses. Pulled out from afsd.c
*/
int
static int
ParseNetInfoFile_int(afs_uint32 * final, afs_uint32 * mask, afs_uint32 * mtu,
int max, char reason[], const char *fileName,
int fakeonly)
@ -347,8 +347,8 @@ ParseNetInfoFile_int(afs_uint32 * final, afs_uint32 * mask, afs_uint32 * mtu,
}
int
ParseNetInfoFile(afs_uint32 * final, afs_uint32 * mask, afs_uint32 * mtu,
int max, char reason[], const char *fileName)
afsconf_ParseNetInfoFile(afs_uint32 * final, afs_uint32 * mask, afs_uint32 * mtu,
int max, char reason[], const char *fileName)
{
return ParseNetInfoFile_int(final, mask, mtu, max, reason, fileName, 0);
}
@ -358,7 +358,7 @@ ParseNetInfoFile(afs_uint32 * final, afs_uint32 * mask, afs_uint32 * mtu,
* and return them in the first buffer. Return number of common
* entries.
*/
int
static int
filterAddrs(afs_uint32 addr1[], afs_uint32 addr2[], afs_uint32 mask1[],
afs_uint32 mask2[], afs_uint32 mtu1[], afs_uint32 mtu2[], int n1,
int n2)
@ -420,9 +420,9 @@ filterAddrs(afs_uint32 addr1[], afs_uint32 addr2[], afs_uint32 mask1[],
*/
/* max - Entries in addrbuf, maskbuf and mtubuf */
int
parseNetFiles(afs_uint32 addrbuf[], afs_uint32 maskbuf[], afs_uint32 mtubuf[],
afs_uint32 max, char reason[], const char *niFileName,
const char *nrFileName)
afsconf_ParseNetFiles(afs_uint32 addrbuf[], afs_uint32 maskbuf[],
afs_uint32 mtubuf[], afs_uint32 max, char reason[],
const char *niFileName, const char *nrFileName)
{
afs_uint32 addrbuf1[MAXIPADDRS], maskbuf1[MAXIPADDRS],
mtubuf1[MAXIPADDRS];
@ -433,8 +433,8 @@ parseNetFiles(afs_uint32 addrbuf[], afs_uint32 maskbuf[], afs_uint32 mtubuf[],
int code, i;
nAddrs1 =
ParseNetInfoFile(addrbuf1, maskbuf1, mtubuf1, MAXIPADDRS, reason,
niFileName);
afsconf_ParseNetInfoFile(addrbuf1, maskbuf1, mtubuf1, MAXIPADDRS,
reason, niFileName);
code =
parseNetRestrictFile_int(addrbuf2, maskbuf2, mtubuf2, MAXIPADDRS,
&nAddrs2, reason, nrFileName, niFileName);

8
src/bozo/bosserver.c
View File

@ -1060,10 +1060,10 @@ main(int argc, char **argv, char **envp)
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else {
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
}

8
src/budb/server.c
View File

@ -514,10 +514,10 @@ main(int argc, char **argv)
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);

8
src/butc/tcmain.c
View File

@ -1028,10 +1028,10 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);

5
src/dviced/Makefile.in
View File

@ -34,7 +34,7 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o
DIROBJS=buffer.o dir.o salvage.o
@ -100,9 +100,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) -I../util $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

5
src/dvolser/Makefile.in
View File

@ -30,7 +30,7 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o
DIROBJS=buffer.o dir.o salvage.o
@ -110,9 +110,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) -I../util $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

8
src/kauth/kaserver.c
View File

@ -379,10 +379,10 @@ main(int argc, char *argv[])
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);

6
src/libafsauthent/Makefile.in
View File

@ -36,7 +36,8 @@ AUTHOBJS = \
acfg_errors.o \
token.o \
token.xdr.o \
realms.o
realms.o \
netrestrict.o
KAUTHOBJS = \
kauth.xdr.o \
@ -227,6 +228,9 @@ ptclient.o: ${PTSERVER}/ptclient.c
realms.o: ${AUTH}/realms.c
${AFS_CCRULE} -I../auth ${AUTH}/realms.c
netrestrict.o: ${AUTH}/netrestrict.c
${AFS_CCRULE} -I../auth ${AUTH}/netrestrict.c
ptuser.o: ${PTSERVER}/ptuser.c
${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptuser.c

3
src/libafsauthent/NTMakefile
View File

@ -45,7 +45,8 @@ AUTHOBJS = \
$(OUT)\keys.obj \
$(OUT)\token.obj \
$(OUT)\token.xdr.obj \
$(OUT)\acfg_errors.obj
$(OUT)\acfg_errors.obj \
$(OUT)\netrestrict.obj
KAUTHOBJS = \
$(OUT)\kauth.xdr.obj \

1
src/libafsauthent/afsauthent.def
View File

@ -154,3 +154,4 @@ EXPORTS
afsconf_SetSecurityFlags @153
afsconf_SetLocalRealm @154
afsconf_IsLocalRealmMatch @155
afsconf_ParseNetFiles @156

18
src/libuafs/Makefile.common.in
View File

@ -216,7 +216,7 @@ UAFSOBJ = \
$(UOBJ)/casestrcpy.o \
$(UOBJ)/dirpath.o \
$(UOBJ)/fileutil.o \
$(UOBJ)/netutils.o \
$(UOBJ)/netrestrict.o \
$(UOBJ)/et_name.o \
$(UOBJ)/com_err.o \
$(UOBJ)/error_msg.o \
@ -365,7 +365,7 @@ PICUAFSOBJ = \
$(PICOBJ)/casestrcpy.o \
$(PICOBJ)/dirpath.o \
$(PICOBJ)/fileutil.o \
$(PICOBJ)/netutils.o \
$(PICOBJ)/netrestrict.o \
$(PICOBJ)/et_name.o \
$(PICOBJ)/com_err.o \
$(PICOBJ)/error_msg.o \
@ -514,7 +514,7 @@ AFSWEBOBJ = \
$(WEBOBJ)/casestrcpy.o \
$(WEBOBJ)/dirpath.o \
$(WEBOBJ)/fileutil.o \
$(WEBOBJ)/netutils.o \
$(WEBOBJ)/netrestrict.o \
$(WEBOBJ)/et_name.o \
$(WEBOBJ)/com_err.o \
$(WEBOBJ)/error_msg.o \
@ -657,7 +657,7 @@ AFSWEBOBJKRB = \
$(WEBOBJ)/casestrcpy.o \
$(WEBOBJ)/dirpath.o \
$(WEBOBJ)/fileutil.o \
$(WEBOBJ)/netutils.o \
$(WEBOBJ)/netrestrict.o \
$(WEBOBJ)/et_name.o \
$(WEBOBJ)/com_err.o \
$(WEBOBJ)/error_msg.o \
@ -804,7 +804,7 @@ JUAFSOBJ = \
$(JUAFS)/casestrcpy.o \
$(JUAFS)/dirpath.o \
$(JUAFS)/fileutil.o \
$(JUAFS)/netutils.o \
$(JUAFS)/netrestrict.o \
$(JUAFS)/et_name.o \
$(JUAFS)/com_err.o \
$(JUAFS)/error_msg.o \
@ -1116,7 +1116,7 @@ $(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULE1)
$(UOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULE1)
$(UOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
$(UOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULE1)
$(UOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULE1)
@ -1421,7 +1421,7 @@ $(PICOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULEPIC)
$(PICOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULEPIC)
$(PICOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
$(PICOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULEPIC)
$(PICOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULEPIC)
@ -1735,7 +1735,7 @@ $(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULE1)
$(WEBOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULE1)
$(WEBOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
$(WEBOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULE1)
$(WEBOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULE2)
@ -2035,7 +2035,7 @@ $(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULE1)
$(JUAFS)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULE1)
$(JUAFS)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
$(JUAFS)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULE1)
$(JUAFS)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULE1)

8
src/ptserver/ptserver.c
View File

@ -492,10 +492,10 @@ main(int argc, char **argv)
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);

5
src/tbudb/Makefile.in
View File

@ -18,7 +18,7 @@ BUDB=$(srcdir)/../budb
RXOBJS= rx_pthread.o rxkad_errs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o
@ -90,9 +90,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

5
src/tptserver/Makefile.in
View File

@ -18,7 +18,7 @@ PTSERVER=$(srcdir)/../ptserver
RXOBJS= rx_pthread.o rxkad_errs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
@ -82,9 +82,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

5
src/tsalvaged/Makefile.in
View File

@ -34,7 +34,7 @@ DIROBJS=buffer.o dir.o salvage.o
LWPOBJS=lock.o threadname.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o
VLIBOBJS=volume.o vnode.o vutil.o partition.o fssync-client.o \
clone.o nuke.o devname.o listinodes.o ihandle.o \
@ -129,9 +129,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) -I../util $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

1
src/tsalvaged/NTMakefile
View File

@ -47,7 +47,6 @@ UTILOBJS =\
$(OUT)\uuid.obj \
$(OUT)\serverLog.obj \
$(OUT)\fileutil.obj \
$(OUT)\netutils.obj \
$(OUT)\dirpath.obj \
$(OUT)\volparse.obj \
$(OUT)\flipbase64.obj \

5
src/tubik/Makefile.in
View File

@ -26,7 +26,7 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
RXOBJS = rx_pthread.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
@ -72,9 +72,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

5
src/tvlserver/Makefile.in
View File

@ -18,7 +18,7 @@ VLSERVER=$(srcdir)/../vlserver
RXOBJS= rx_pthread.o rxkad_errs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
@ -75,9 +75,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

5
src/tvolser/Makefile.in
View File

@ -33,7 +33,7 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
DIROBJS=buffer.o dir.o salvage.o
@ -116,9 +116,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) -I../util $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

2
src/ubik/Makefile.in
View File

@ -18,7 +18,7 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
${TOP_INCDIR}/lock.h ubik.h ubik_int.h
LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libauth.a \
${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libafsutil.a \
${TOP_LIBDIR}/libopr.a ${XLIBS}

9
src/ubik/beacon.c
View File

@ -20,7 +20,6 @@
#include <afs/cellconfig.h>
#ifndef AFS_NT40_ENV
#include <afs/afsutil.h>
#include <afs/netutils.h>
#endif
#define UBIK_INTERNALS
@ -615,10 +614,10 @@ verifyInterfaceAddress(afs_uint32 *ame, struct afsconf_cell *info,
* host as returned by rx_getAllAddr (in NBO)
*/
char reason[1024];
count =
parseNetFiles(myAddr, NULL, NULL, UBIK_MAX_INTERFACE_ADDR, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
count = afsconf_ParseNetFiles(myAddr, NULL, NULL,
UBIK_MAX_INTERFACE_ADDR, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
if (count < 0) {
ubik_print("ubik: Can't register any valid addresses:%s\n",
reason);

8
src/update/server.c
View File

@ -264,10 +264,10 @@ main(int argc, char *argv[])
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);

14
src/util/Makefile.in
View File

@ -14,7 +14,7 @@ HELPER_SPLINT=@HELPER_SPLINT@
objects =base64.o ktime.o volparse.o hostparse.o exec.o \
hputil.o kreltime.o uuid.o serverLog.o \
dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
dirpath.o fileutil.o flipbase64.o fstab.o \
afs_atomlist.o afs_lhash.o pthread_glock.o tabular_output.o \
pthread_threadname.o ${REGEX_OBJ}
@ -30,7 +30,6 @@ objects_pic = \
serverLog_pic.o \
dirpath_pic.o \
fileutil_pic.o \
netutils_pic.o \
flipbase64_pic.o \
fstab_pic.o \
afs_atomlist_pic.o \
@ -47,7 +46,6 @@ includes = \
${TOP_INCDIR}/afs/vice.h \
${TOP_INCDIR}/afs/ktime.h \
${TOP_INCDIR}/afs/fileutil.h \
${TOP_INCDIR}/afs/netutils.h \
${TOP_INCDIR}/afs/afsutil.h \
${TOP_INCDIR}/afs/afsutil_prototypes.h \
${TOP_INCDIR}/afs/pthread_glock.h \
@ -89,9 +87,6 @@ ${TOP_INCDIR}/afs/ktime.h: ${srcdir}/ktime.h
${TOP_INCDIR}/afs/fileutil.h: ${srcdir}/fileutil.h
${INSTALL_DATA} $? $@
${TOP_INCDIR}/afs/netutils.h: ${srcdir}/netutils.h
${INSTALL_DATA} $? $@
${TOP_INCDIR}/afs/afsutil.h: ${srcdir}/afsutil.h
${INSTALL_DATA} $? $@
@ -214,9 +209,6 @@ dirpath_pic.o: ${srcdir}/dirpath.c ${includes}
fileutil_pic.o: ${srcdir}/fileutil.c ${includes}
$(SHD_CCRULE) ${srcdir}/fileutil.c
netutils_pic.o: ${srcdir}/netutils.c ${includes}
$(SHD_CCRULE) ${srcdir}/netutils.c
flipbase64_pic.o: ${srcdir}/flipbase64.c ${includes}
$(SHD_CCRULE) ${srcdir}/flipbase64.c
@ -257,7 +249,6 @@ install: dirpath.h util.a util_pic.a sys
${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
${INSTALL_DATA} ${srcdir}/ktime.h ${DESTDIR}${includedir}/afs/ktime.h
${INSTALL_DATA} ${srcdir}/fileutil.h ${DESTDIR}${includedir}/afs/fileutil.h
${INSTALL_DATA} ${srcdir}/netutils.h ${DESTDIR}${includedir}/afs/netutils.h
${INSTALL_DATA} ${srcdir}/afsutil.h ${DESTDIR}${includedir}/afs/afsutil.h
${INSTALL_DATA} ${srcdir}/afsutil_prototypes.h ${DESTDIR}${includedir}/afs/afsutil_prototypes.h
${INSTALL_DATA} ${srcdir}/pthread_glock.h ${DESTDIR}${includedir}/afs/pthread_glock.h
@ -284,7 +275,6 @@ dest: dirpath.h util.a util_pic.a sys
${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
${INSTALL_DATA} ${srcdir}/ktime.h ${DEST}/include/afs/ktime.h
${INSTALL_DATA} ${srcdir}/fileutil.h ${DEST}/include/afs/fileutil.h
${INSTALL_DATA} ${srcdir}/netutils.h ${DEST}/include/afs/netutils.h
${INSTALL_DATA} ${srcdir}/afsutil.h ${DEST}/include/afs/afsutil.h
${INSTALL_DATA} ${srcdir}/afsutil_prototypes.h ${DEST}/include/afs/afsutil_prototypes.h
${INSTALL_DATA} ${srcdir}/pthread_glock.h ${DEST}/include/afs/pthread_glock.h
@ -318,5 +308,5 @@ check-splint:
sh $(HELPER_SPLINT) $(CFLAGS) \
base64.c ktime.c volparse.c hostparse.c \
hputil.c kreltime.c uuid.c serverLog.c \
dirpath.c fileutil.c netutils.c flipbase64.c \
dirpath.c fileutil.c flipbase64.c \
afs_atomlist.c afs_lhash.c fstab.c

3
src/util/NTMakefile
View File

@ -17,7 +17,6 @@ INCFILES =\
$(INCFILEDIR)\afsutil.h \
$(INCFILEDIR)\errors.h \
$(INCFILEDIR)\vice.h \
$(INCFILEDIR)\netutils.h \
$(INCFILEDIR)\pthread_glock.h \
$(INCFILEDIR)\pthread_nosigs.h \
$(INCFILEDIR)\errmap_nt.h \
@ -44,7 +43,6 @@ LIBOBJS = \
$(OUT)\krb5_nt.obj \
$(OUT)\kreltime.obj \
$(OUT)\ktime.obj \
$(OUT)\netutils.obj \
$(OUT)\regex.obj \
$(OUT)\readdir_nt.obj \
$(OUT)\serverLog.obj \
@ -62,7 +60,6 @@ MT_LIBOBJS = \
$(OUT)\krb5_nt.obj \
$(OUT)\kreltime.obj \
$(OUT)\ktime.obj \
$(OUT)\netutils.obj \
$(OUT)\regex.obj \
$(OUT)\readdir_nt.obj \
$(OUT)\serverLog_mt.obj \

17
src/util/afsutil_prototypes.h
View File

@ -102,23 +102,6 @@ extern afs_int32 ktime_DateToInt32(char *adate, afs_int32 * aint32);
extern char *ktime_GetDateUsage(void);
extern afs_int32 ktime_InterpretDate(struct ktime_date *akdate);
/* netutils.c */
extern afs_uint32 extract_Addr(char *line, int maxSize);
extern int parseNetRestrictFile(afs_uint32 outAddrs[], afs_uint32 * mask,
afs_uint32 * mtu, afs_uint32 maxAddrs,
afs_uint32 * nAddrs, char reason[],
const char *fileName);
extern int ParseNetInfoFile(afs_uint32 * final, afs_uint32 * mask,
afs_uint32 * mtu, int max, char reason[],
const char *fileName);
extern int filterAddrs(afs_uint32 addr1[], afs_uint32 addr2[],
afs_uint32 mask1[], afs_uint32 mask2[],
afs_uint32 mtu1[], afs_uint32 mtu2[], int n1, int n2);
extern int parseNetFiles(afs_uint32 addrbuf[], afs_uint32 maskbuf[],
afs_uint32 mtubuf[], afs_uint32 max, char reason[],
const char *niFileName, const char *nrFileName);
/* pthread_glock.c */

15
src/util/netutils.h
View File

@ -1,15 +0,0 @@
/*
* 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
*/
#ifndef OPENAFS_NETUTILS_H
#define OPENAFS_NETUTILS_H
#include "afsutil_prototypes.h"
#endif /* OPENAFS_NETUTILS_H */

5
src/viced/Makefile.in
View File

@ -32,7 +32,7 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
DIROBJS=buffer.o dir.o salvage.o
@ -94,9 +94,6 @@ volparse.o: ${UTIL}/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
netutils.o: ${UTIL}/netutils.c
$(AFS_CCRULE) -I../util $(UTIL)/netutils.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c

11
src/viced/viced.c
View File

@ -68,7 +68,6 @@
#include <afs/partition.h>
#include <afs/dir.h>
#ifndef AFS_NT40_ENV
# include <afs/netutils.h>
# include <afs/softsig.h>
#endif
#include "viced_prototypes.h"
@ -1725,10 +1724,12 @@ SetupVL(void)
* /usr/afs/local/NetRestict)
*/
char reason[1024];
afs_int32 code = parseNetFiles(FS_HostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
afs_int32 code;
code = afsconf_ParseNetFiles(FS_HostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
if (code < 0) {
ViceLog(0, ("Can't register any valid addresses: %s\n", reason));
exit(1);

8
src/vlserver/vlserver.c
View File

@ -393,10 +393,10 @@ main(int argc, char **argv)
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
#endif
{

8
src/volser/volmain.c
View File

@ -446,10 +446,10 @@ main(int argc, char **argv)
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
ccode = afsconf_ParseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
} else
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);