mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-17 14:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix schema install w/ VPATH

Browse Source 
update bprint
This commit is contained in:
Kurt Zeilenga 2000-09-28 20:14:46 +00:00
parent 6d65b51ccb
commit 2cab70fd1f
4 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ OpenLDAP 2.0.X Engineering
Fixed slapd/sasl no cred bug
Fixed slapd idletimeout lock bug (ITS#767)
Fixed slurpd TLS initialization bug (ITS#768)
Updated -llber bprint routine
Build Environment
Fixed VPATH schema install
OpenLDAP 2.0.4 Release
Fixed clients printf/usage bugs (ITS#749)

1
build/top.mk
View File

@ -34,6 +34,7 @@ moduledir = @libexecdir@$(ldap_subdir)
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@$(ldap_subdir)
schemadir = $(sysconfdir)/schema
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@

37
libraries/liblber/bprint.c
View File

@ -144,12 +144,49 @@ ber_bprint(
assert( data != NULL );
<<<<<<< bprint.c
memset( out, '\0', BPLEN );
for ( ;; ) {
if ( len < 1 ) {
sprintf( buf, "\t%s\n", ( i == 0 ) ? "(end)" : out );
(*ber_pvt_log_print)( buf );
break;
=======
/* in case len is zero */
line[0] = '\n';
line[1] = '\0';
for ( i = 0 ; i < len ; i++ ) {
int n = i % 16;
unsigned off;
if( !n ) {
if( i ) (*ber_pvt_log_print)( line );
memset( line, ' ', sizeof(line)-2 );
line[sizeof(line)-2] = '\n';
line[sizeof(line)-1] = '\0';
off = i % 0x0ffffU;
line[ 2 ] = hexdig[ 0x0f & (off >> 12) ];
line[ 3 ] = hexdig[ 0x0f & (off >> 8) ];
line[ 4 ] = hexdig[ 0x0f & (off >> 4) ];
line[ 5 ] = hexdig[ 0x0f & off ];
line[ 6 ] = ':';
}
off = BP_OFFSET + n*3 + ((n >= 8)?1:0);
line[ off ] = hexdig[ 0x0f & ( data[i] >> 4 ) ];
line[ off+1 ] = hexdig[ 0x0f & data[i] ];
off = BP_GRAPH + n;
if ( isprint( data[i] )) {
line[ BP_GRAPH + n ] = data[i];
} else {
line[ BP_GRAPH + n ] = '.';
}
>>>>>>> 1.34
}
#ifndef LDAP_HEX

18
servers/slapd/Makefile.in
View File

@ -251,17 +251,17 @@ all-cffiles: slapd
touch all-cffiles
install-schema: FORCE
@-$(MKDIR) $(DESTDIR)$(sysconfdir)/schema
@cd $(srcdir) ; \
for i in schema/*.schema ; do \
if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
echo "installing $$i in $(sysconfdir)"; \
echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(sysconfdir)/$$i; \
$(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(sysconfdir)/$$i; \
@-$(MKDIR) $(DESTDIR)$(schemadir)
@cd $(srcdir)/schema ; \
for i in *.schema ; do \
if test ! -f $(DESTDIR)$(schemadir)/$$i; then \
echo "installing $$i in $(schemadir)"; \
echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(schemadir)/$$i; \
$(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(schemadir)/$$i; \
else \
echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(sysconfdir)/$$i"; \
echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(schemadir)/$$i"; \
fi; \
$(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i.default ; \
$(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(schemadir)/$$i.default ; \
done
install-conf: FORCE