[Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.7, 1.8 security.c, 1.5, 1.6
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Wed Feb 1 23:04:20 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/cgi-src40
Modified Files:
Makefile security.c
Log Message:
[179394] HP-UX IPF support (adminserver)
0) support HP-UX 11.23 ia64
1) adjusted to the components' path name change (suffix, version number)
2) added [admin] section to setup.inf (in pkgadmin.mk)
3) fixed type mismatch for the cert version
4) adjusted the admin jar names
5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34)
6) added "admin" to the component list: "Components = ..." in setup.inf
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 21 Oct 2005 19:19:11 -0000 1.7
+++ Makefile 1 Feb 2006 23:03:57 -0000 1.8
@@ -382,30 +382,33 @@
$*.c /link /INCREMENTAL:no /SUBSYSTEM:console
else
+ADMINSERVERLINKS = $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+SETUPADMINSERVERLINKS = $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+
$(BINDIR)/security: security.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/security \
$(SRCDIR)/security.c -L$(NSCP_DISTDIR)/lib \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/sec-activate: sec-activate.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-activate \
$(SRCDIR)/sec-activate.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/sec-migrate: sec-migrate.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-migrate \
$(SRCDIR)/sec-migrate.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/admpw: admpw.c $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o admpw \
$(SRCDIR)/admpw.c \
$(OBJDIR)/lib/libadmin.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/config: config.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -415,7 +418,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/dsconfig: dsconfig.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -424,7 +427,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/ugdsconfig: ugdsconfig.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -432,13 +435,13 @@
$(SRCDIR)/ugdsconfig.c \
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
- $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/mergeConfig: mergeConfig.cpp $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o mergeConfig \
$(SRCDIR)/mergeConfig.cpp \
- $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/monreplication: monreplication.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -448,7 +451,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/viewlog: viewlog.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -458,7 +461,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/viewdata: viewdata.c $(GLUEOBJS)
@@ -469,13 +472,13 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/statpingserv: statpingserv.c $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o statpingserv \
$(SRCDIR)/statpingserv.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/htmladmin: htmladmin.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -485,12 +488,12 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/%: %.c $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $* $(SRCDIR)/$*.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
endif
Index: security.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- security.c 22 Aug 2005 23:21:02 -0000 1.5
+++ security.c 1 Feb 2006 23:03:57 -0000 1.6
@@ -597,10 +597,10 @@
{
int version;
- switch ((int)(crl->crl.version.data)) {
+ switch ((int)DER_GetInteger(&(crl->crl.version))) {
case SEC_CRL_VERSION_1: version = 1; break;
case SEC_CRL_VERSION_2: version = 2; break;
- default: version = (int)((crl->crl.version.data)+1); break;
+ default: version = (int)(DER_GetInteger(&(crl->crl.version))+1); break;
}
fprintf(stdout, "\t<VERSION>%d</VERSION>\n", version);
}
More information about the Fedora-directory-commits
mailing list