diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2005-03-07 14:45:22 +0000 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2005-03-07 14:45:22 +0000 |
| commit | ea64bb776b54e43e117d516e7e0e818d48287370 (patch) | |
| tree | 18c967080c35c3695426d2155f71f28bd8157f05 /lib/libaccess | |
| parent | 454c5dcf11a5fc41f5dc2bf280fec167d686bcdf (diff) | |
| download | ds-ea64bb776b54e43e117d516e7e0e818d48287370.tar.gz ds-ea64bb776b54e43e117d516e7e0e818d48287370.tar.xz ds-ea64bb776b54e43e117d516e7e0e818d48287370.zip | |
149510
More ACL system code cleanup. Fix several compiler warnings, simplify
some includes.
Diffstat (limited to 'lib/libaccess')
| -rw-r--r-- | lib/libaccess/Makefile | 62 | ||||
| -rw-r--r-- | lib/libaccess/aclerror.cpp | 4 |
2 files changed, 4 insertions, 62 deletions
diff --git a/lib/libaccess/Makefile b/lib/libaccess/Makefile index 8fb857b8..d7d270cd 100644 --- a/lib/libaccess/Makefile +++ b/lib/libaccess/Makefile @@ -40,11 +40,7 @@ $(UTESTDEST): OSOBJS = OBJS=$(addprefix $(OBJDEST)/, usi.o \ - attrec.o \ nseframe.o \ - nsdb.o \ - nsuser.o \ - nsgroup.o \ nsautherr.o \ symbols.o \ acltools.o \ @@ -67,23 +63,9 @@ OBJS=$(addprefix $(OBJDEST)/, usi.o \ acleval.o \ oneeval.o \ access_plhash.o \ - aclparse.o \ - aclbuild.o \ aclerror.o \ - nsadb.o \ - nscert.o \ - nsamgmt.o \ - nsgmgmt.o \ - nsdbmgmt.o \ - nsumgmt.o \ $(OSOBJS) \ ) - - -# -# AVA Mapping files. Currently not compiled in (FORTEZZA for reference only). -# -AVAMAPFILES = lex.yy.o y.tab.o avapfile.o avadb.o MODULE_CFLAGS=-I$(BUILD_ROOT)/include -DACL_LIB_INTERNAL $(TESTFLAGS) @@ -128,47 +110,3 @@ flex: $(LEX) -i aclscan.l sed -f yy-sed lex.yy.c > acl.yy.cpp rm lex.yy.c - -# -# more AVA mapping stuff, needs to be made to work with the other lexx/yacc -# code added for 3.0 -# -#ifeq ($(ARCH), WINNT) -#$(OBJDEST)/y.tab.o: $(OBJDEST)/y.tab.c $(VALUES) $(OBJDEST)/y.tab.h -# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I$(OBJDEST) -I. $< -Fo$*.o -#else -#$(OBJDEST)/y.tab.o: $(OBJDEST)/y.tab.c $(OBJDEST)/y.tab.h -# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I. -o $*.o $< -#endif -# -#ifeq ($(ARCH), WINNT) -#$(OBJDEST)/y.tab.h: wintab.h -# cp wintab.h $(OBJDEST)/y.tab.h -# -#$(OBJDEST)/y.tab.c: winnt.y -# cp winnt.y $(OBJDEST)/y.tab.c -# -#$(OBJDEST)/values.h: winnt.v -# cp winnt.v $(OBJDEST)/values.h -#else -#$(OBJDEST)/y.tab.h $(OBJDEST)/y.tab.c: avaparse.y -# yacc -d avaparse.y -# mv y.tab.h $(OBJDEST)/ -# mv y.tab.c $(OBJDEST)/ -#endif -# -#$(OBJDEST)/lex.yy.o: $(OBJDEST)/lex.yy.c $(OBJDEST)/y.tab.h -#ifeq ($(ARCH), WINNT) -# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I$(OBJDEST) -I. $< -Fo$*.o -#else -# $(CC) -c $(CFLAGS) $(MCC_INCLUDE) -I. -o $*.o $< -#endif -# -#ifeq ($(ARCH), WINNT) -#$(OBJDEST)/lex.yy.c: winnt.l -# cp winnt.l $(OBJDEST)/lex.yy.c -#else -#$(OBJDEST)/lex.yy.c: avascan.l -# lex avascan.l -# mv lex.yy.c $(OBJDEST)/ -#endif diff --git a/lib/libaccess/aclerror.cpp b/lib/libaccess/aclerror.cpp index 3f05e2e9..a3e7f8aa 100644 --- a/lib/libaccess/aclerror.cpp +++ b/lib/libaccess/aclerror.cpp @@ -12,6 +12,7 @@ */ #include "base/systems.h" +#include "public/nsapi.h" #ifdef NSPR20 #include "prprf.h" #else @@ -42,6 +43,9 @@ #define aclerrfail XP_GetAdminStr(DBT_AclerrfmtAclerrfail) #define aclerrio XP_GetAdminStr(DBT_AclerrfmtAclerrio) +char * NSAuth_Program = "NSAUTH"; +char * ACL_Program = "NSACL"; /* ACL facility name */ + /* * Description (aclErrorFmt) * |