Index: build/config.guess =================================================================== RCS file: /IX/LDAP/cvs/ldap/build/config.guess$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- config.guess 1998/12/16 20:19:00 1.1.1.1 +++ config.guess 1998/12/17 01:55:00 1.1.1.2 @@ -364,6 +364,9 @@ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; + *:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; 3050*:HI-UX:*:*) sed 's/^ //' << EOF >dummy.c #include Index: build/config.sub =================================================================== RCS file: /IX/LDAP/cvs/ldap/build/config.sub$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- config.sub 1998/12/16 20:19:01 1.1.1.1 +++ config.sub 1998/12/17 01:55:04 1.1.1.2 @@ -716,7 +716,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv*) + | -mingw32* | -linux-gnu* | -uxpv* | -mpeix*) # Remember, each alternative MUST END IN *, to match a version number. ;; -linux*) Index: build/man.mk =================================================================== RCS file: /IX/LDAP/cvs/ldap/build/man.mk$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- man.mk 1998/12/16 20:19:04 1.1.1.1 +++ man.mk 1998/12/17 01:55:10 1.1.1.2 @@ -25,7 +25,7 @@ if [ -f "$$page.links" ]; then \ for link in `$(CAT) $$page.links`; do \ echo "installing $(MANDIR)/$$link as link to $$page"; \ - $(RM) $(INSTDIR)/$$link $(MANDIR)/$$link$(MANCOMPRESSSUFFIX); \ + $(RM) $(MANDIR)/$$link $(MANDIR)/$$link$(MANCOMPRESSSUFFIX); \ ln -sf $$page$(MANCOMPRESSSUFFIX) $(MANDIR)/$$link$(MANCOMPRESSSUFFIX); \ done; \ fi; \ Index: build/top.mk =================================================================== RCS file: /IX/LDAP/cvs/ldap/build/top.mk$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- top.mk 1998/12/16 20:19:06 1.1.1.1 +++ top.mk 1998/12/17 01:55:07 1.1.1.2 @@ -36,7 +36,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ MV = mv -LN = ln +# fake ln to ln -s for MPE/iX +LN = ln -s LN_S = @LN_S@ RM = rm -f MAKEINFO = @MAKEINFO@ Index: libraries/libldbm/ldbm.c =================================================================== RCS file: /IX/LDAP/cvs/ldap/libraries/libldbm/ldbm.c$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- ldbm.c 1998/12/16 20:21:37 1.1.1.1 +++ ldbm.c 1998/12/17 01:56:59 1.1.1.2 @@ -281,7 +281,11 @@ return( NULL ); } if ( dbcachesize > 0 && stat( name, &st ) == 0 ) { +#ifdef mpeix + dbcachesize = (dbcachesize / 4096); +#else dbcachesize = (dbcachesize / st.st_blksize); +#endif gdbm_setopt( db, GDBM_CACHESIZE, &dbcachesize, sizeof(int) ); } Index: libraries/liblutil/detach.c =================================================================== RCS file: /IX/LDAP/cvs/ldap/libraries/liblutil/detach.c$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- detach.c 1998/12/16 20:21:42 1.1.1.1 +++ detach.c 1998/12/17 20:33:58 1.1.1.2 @@ -45,7 +45,11 @@ } #endif /* FD_SETSIZE */ +#ifdef mpeix + if ( 1 == 0 ) { +#else if ( debug == 0 ) { +#endif for ( i = 0; i < 5; i++ ) { #if HAVE_THR switch ( fork1() ) Index: servers/slapd/Makefile.in =================================================================== RCS file: /IX/LDAP/cvs/ldap/servers/slapd/Makefile.in$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- Makefile.in 1998/12/16 20:21:55 1.1.1.1 +++ Makefile.in 1998/12/17 01:59:20 1.1.1.2 @@ -56,8 +56,9 @@ @-for i in back-*/*.a; do \ ( \ cd tmp; \ - $(AR) x ../$$i; \ + echo "skipping $(AR) x ../$$i; and using cp instead"; \ pre=`echo $$i | sed -e 's/\/.*$$//' -e 's/back-//'`; \ + cp ../back-$$pre/*.o . ; \ for j in *.o; do \ mv $$j $${pre}$$j; \ done; \ Index: servers/slapd/daemon.c =================================================================== RCS file: /IX/LDAP/cvs/ldap/servers/slapd/daemon.c$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.3 diff -u -r1.1.1.1 -r1.1.1.3 --- daemon.c 1998/12/16 20:22:01 1.1.1.1 +++ daemon.c 1998/12/17 20:36:47 1.1.1.3 @@ -101,23 +101,36 @@ } i = 1; +#ifndef mpeix if ( setsockopt( tcps, SOL_SOCKET, SO_REUSEADDR, (char *) &i, sizeof(i) ) == -1 ) { Debug( LDAP_DEBUG_ANY, "setsockopt() failed errno %d (%s)", errno, errno > -1 && errno < sys_nerr ? sys_errlist[errno] : "unknown", 0 ); } +#endif (void) memset( (void *) &addr, '\0', sizeof(addr) ); addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; addr.sin_port = htons( (int)port ); +#ifdef mpeix + if ( ((int)port > 0) && ((int)port < 1024) ) GETPRIVMODE(); +#endif if ( bind( tcps, (struct sockaddr *) &addr, sizeof(addr) ) == -1 ) { +#ifdef mpeix + if ( ((int)port > 0) && ((int)port < 1024) ) GETUSERMODE(); +#endif Debug( LDAP_DEBUG_ANY, "bind() failed errno %d (%s)\n", errno, errno > -1 && errno < sys_nerr ? sys_errlist[errno] : "unknown", 0 ); exit( 1 ); } +#ifdef mpeix + else { + if ( ((int)port > 0) && ((int)port < 1024) ) GETUSERMODE(); + } +#endif if ( listen( tcps, 5 ) == -1 ) { Debug( LDAP_DEBUG_ANY, "listen() failed errno %d (%s)", Index: servers/slapd/main.c =================================================================== RCS file: /IX/LDAP/cvs/ldap/servers/slapd/main.c$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- main.c 1998/12/16 20:22:03 1.1.1.1 +++ main.c 1998/12/17 20:35:48 1.1.1.2 @@ -162,6 +162,11 @@ lutil_detach( 0, 0 ); #endif } +#ifdef mpeix + else { + close( 1 ); dup2( 0, 1 ); /* disconnect stdout from $STDLIST */ + } +#endif #ifdef LOG_LOCAL4 openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL4 ); #else Index: servers/slapd/back-ldbm/dbcache.c =================================================================== RCS file: /IX/LDAP/cvs/ldap/servers/slapd/back-ldbm/dbcache.c$v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -r1.1.1.1 -r1.1.1.2 --- dbcache.c 1998/12/16 20:22:15 1.1.1.1 +++ dbcache.c 1998/12/17 01:58:39 1.1.1.2 @@ -104,7 +104,11 @@ li->li_dbcache[i].dbc_refcnt = 1; li->li_dbcache[i].dbc_lastref = curtime; if ( stat( buf, &st ) == 0 ) { +#ifdef mpeix + li->li_dbcache[i].dbc_blksize = 4096; +#else li->li_dbcache[i].dbc_blksize = st.st_blksize; +#endif } else { li->li_dbcache[i].dbc_blksize = DEFAULT_BLOCKSIZE; }