From: Howard Chu Date: Thu, 5 Apr 2007 23:28:06 +0000 (+0000) Subject: slurpd is strongly deprecated X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~546 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=819cf670f387bb71b67bdc121a14a29d3772043a;p=openldap slurpd is strongly deprecated --- diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf deleted file mode 100644 index b77357b1e7..0000000000 --- a/tests/data/slapd-repl-master.conf +++ /dev/null @@ -1,58 +0,0 @@ -# master slapd config -- for testing of replication -# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-master.conf,v 1.27.2.4 2003/12/15 - 22:05:29 kurt Exp $ -## This work is part of OpenLDAP Software . -## -## Copyright 1998-2007 The OpenLDAP Foundation. -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted only as authorized by the OpenLDAP -## Public License. -## -## A copy of this license is available in the file LICENSE in the -## top-level directory of the distribution or, alternatively, at -## . - -include @SCHEMADIR@/core.schema -include @SCHEMADIR@/cosine.schema -include @SCHEMADIR@/inetorgperson.schema -include @SCHEMADIR@/openldap.schema -include @SCHEMADIR@/nis.schema -# -pidfile @TESTDIR@/slapd.1.pid -argsfile @TESTDIR@/slapd.1.args - -#mod#modulepath ../servers/slapd/back-@BACKEND@/ -#mod#moduleload back_@BACKEND@.la -#monitormod#modulepath ../servers/slapd/back-monitor/ -#monitormod#moduleload back_monitor.la - -####################################################################### -# database definitions -####################################################################### - -database @BACKEND@ -#ldbm#cachesize 0 -suffix "dc=example,dc=com" -directory @TESTDIR@/db.1.a -rootdn "cn=Manager,dc=example,dc=com" -rootpw secret -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub - -replogfile @TESTDIR@/slapd.1.replog - -replica-argsfile @TESTDIR@/replica.1.args -replica-pidfile @TESTDIR@/replica.1.pid - -replica host=localhost:@PORT2@ - binddn="cn=Replica,dc=example,dc=com" - bindmethod=simple - credentials=secret - -#monitor#database monitor diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf deleted file mode 100644 index 0ae0f5f361..0000000000 --- a/tests/data/slapd-repl-slave.conf +++ /dev/null @@ -1,59 +0,0 @@ -# slave slapd config -- for testing of replication -# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-slave.conf,v 1.31.2.4 2003/12/15 2 - 2:05:29 kurt Exp $ -## This work is part of OpenLDAP Software . -## -## Copyright 1998-2007 The OpenLDAP Foundation. -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted only as authorized by the OpenLDAP -## Public License. -## -## A copy of this license is available in the file LICENSE in the -## top-level directory of the distribution or, alternatively, at -## . - -include @SCHEMADIR@/core.schema -include @SCHEMADIR@/cosine.schema -include @SCHEMADIR@/inetorgperson.schema -include @SCHEMADIR@/openldap.schema -include @SCHEMADIR@/nis.schema -# -pidfile @TESTDIR@/slapd.2.pid -argsfile @TESTDIR@/slapd.2.args - -#mod#modulepath ../servers/slapd/back-@BACKEND@/ -#mod#moduleload back_@BACKEND@.la -#monitormod#modulepath ../servers/slapd/back-monitor/ -#monitormod#moduleload back_monitor.la -#ldapmod#modulepath ../servers/slapd/back-ldap/ -#ldapmod#moduleload back_ldap.la - -#ldapyes#overlay chain -#ldapyes#chain-uri @URI1@ -#ldapyes#chain-idassert-bind bindmethod=simple binddn="cn=Manager,dc=example,dc=com" credentials=secret mode=self -#ldapmod#overlay chain -#ldapmod#chain-uri @URI1@ -#ldapmod#chain-idassert-bind bindmethod=simple binddn="cn=Manager,dc=example,dc=com" credentials=secret mode=self - -####################################################################### -# database definitions -####################################################################### - -database @BACKEND@ -#ldbm#cachesize 0 -suffix "dc=example,dc=com" -directory @TESTDIR@/db.2.a -rootdn "cn=Replica,dc=example,dc=com" -rootpw secret -updatedn "cn=Replica,dc=example,dc=com" -updateref @URI1@ -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#ldbm#index objectClass eq -#ldbm#index cn,sn,uid pres,eq,sub - -#monitor#database monitor diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index e1c2902252..7ae0f22e8f 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -79,11 +79,9 @@ PWCONF=$DATADIR/slapd-pw.conf WHOAMICONF=$DATADIR/slapd-whoami.conf ACLCONF=$DATADIR/slapd-acl.conf RCONF=$DATADIR/slapd-referrals.conf -MASTERCONF=$DATADIR/slapd-repl-master.conf SRMASTERCONF=$DATADIR/slapd-syncrepl-master.conf DSRMASTERCONF=$DATADIR/slapd-deltasync-master.conf DSRSLAVECONF=$DATADIR/slapd-deltasync-slave.conf -SLAVECONF=$DATADIR/slapd-repl-slave.conf PPOLICYCONF=$DATADIR/slapd-ppolicy.conf PROXYCACHECONF=$DATADIR/slapd-proxycache.conf CACHEMASTERCONF=$DATADIR/slapd-cache-master.conf @@ -170,7 +168,6 @@ CMP="diff -i" BCMP="diff -iB" CMPOUT=/dev/null SLAPD="$TESTWD/../servers/slapd/slapd -s0" -SLURPD="$TESTWD/../servers/slurpd/slurpd" LDAPPASSWD="$CLIENTDIR/ldappasswd $TOOLARGS" LDAPSASLSEARCH="$CLIENTDIR/ldapsearch $TOOLPROTO $LDAP_TOOLARGS -LLL" LDAPSEARCH="$CLIENTDIR/ldapsearch $TOOLPROTO $TOOLARGS -LLL" diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication deleted file mode 100755 index 4ae4e89bd3..0000000000 --- a/tests/scripts/test007-replication +++ /dev/null @@ -1,348 +0,0 @@ -#! /bin/sh -# $OpenLDAP$ -## This work is part of OpenLDAP Software . -## -## Copyright 1998-2007 The OpenLDAP Foundation. -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted only as authorized by the OpenLDAP -## Public License. -## -## A copy of this license is available in the file LICENSE in the -## top-level directory of the distribution or, alternatively, at -## . - -echo "running defines.sh" -. $SRCDIR/scripts/defines.sh - -if test ! -x $SLURPD ; then - echo ">>>>> $SLURPD is not executable or does not exist." - echo ">>>>> Test skipped." - exit 0 -fi - -mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR2 - -# -# Test replication: -# - start master (slapd1) -# - start slave (slapd2) -# - start slurpd -# - populate over ldap -# - perform some modifies and deleted -# - attempt to modify the slave (referral or chain) -# - retrieve database over ldap and compare against expected results -# - -echo "Starting master slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $MASTERCONF > $CONF1 -$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & -PID=$! -if test $WAIT != 0 ; then - echo PID $PID - read foo -fi -KILLPIDS="$PID" - -echo "Starting slave slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $SLAVECONF > $CONF2 -$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! -if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID - read foo -fi -KILLPIDS="$KILLPIDS $SLAVEPID" - -sleep 1 - -echo "Using ldapsearch to check that master slapd is running..." -for i in 0 1 2 3 4 5; do - $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ - 'objectclass=*' > /dev/null 2>&1 - RC=$? - if test $RC = 0 ; then - break - fi - echo "Waiting 5 seconds for slapd to start..." - sleep 5 -done - -echo "Using ldapsearch to check that slave slapd is running..." -for i in 0 1 2 3 4 5; do - $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ - 'objectclass=*' > /dev/null 2>&1 - RC=$? - if test $RC = 0 ; then - break - fi - echo "Waiting 5 seconds for slapd to start..." - sleep 5 -done - -echo "Starting slurpd..." -$SLURPD -f $CONF1 -d ${SLURPD_DEBUG-5} -t $DBDIR1B > $SLURPLOG 2>&1 & -SLURPPID=$! -if test $WAIT != 0 ; then - echo SLURPPID $SLURPPID - read foo -fi -KILLPIDS="$KILLPIDS $SLURPPID" - -echo "Using ldapadd to populate the master directory..." -$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ - $LDIFORDERED > /dev/null 2>&1 -RC=$? -if test $RC != 0 ; then - echo "ldapadd failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC -fi - -echo "Waiting 15 seconds for slurpd to send changes..." -sleep 15 - -echo "Using ldapmodify to modify master directory..." - -# -# Do some modifications -# - -$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ - $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com -changetype: modify -add: drink -drink: Orange Juice -- -delete: sn -sn: Jones -- -add: sn -sn: Jones - -dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example, dc=com -changetype: modify -replace: drink -drink: Iced Tea -drink: Mad Dog 20/20 - -dn: cn=ITD Staff,ou=Groups,dc=example, dc=com -changetype: modify -delete: uniqueMember -uniqueMember: cn=James A Jones 2, ou=Information Technology Division, - ou=People, dc=example, dc=com -uniqueMember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example, dc=com -- -add: uniqueMember -uniqueMember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, dc=example, dc=com -uniqueMember: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com - -dn: cn=All Staff,ou=Groups,dc=example, dc=com -changetype: modify -delete: description - -dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, dc=example, dc=com -changetype: add -objectclass: OpenLDAPperson -cn: Gern Jensen -sn: Jensen -uid: gjensen -title: Chief Investigator, ITD -postaladdress: ITD $ 535 W. William St $ Ann Arbor, MI 48103 -seealso: cn=All Staff, ou=Groups, dc=example, dc=com -drink: Coffee -homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 -description: Very odd -facsimiletelephonenumber: +1 313 555 7557 -telephonenumber: +1 313 555 8343 -mail: gjensen@mailgw.example.com -homephone: +1 313 555 8844 - -dn: ou=Retired, ou=People, dc=example, dc=com -changetype: add -objectclass: organizationalUnit -ou: Retired - -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example, dc=com -changetype: add -objectclass: OpenLDAPperson -cn: Rosco P. Coltrane -sn: Coltrane -uid: rosco - -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example, dc=com -changetype: modrdn -newrdn: cn=Rosco P. Coltrane -deleteoldrdn: 1 -newsuperior: ou=Retired, ou=People, dc=example, dc=com - -dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example, dc=com -changetype: delete - -EOMODS - -RC=$? -if test $RC != 0 ; then - echo "ldapmodify failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC -fi - -echo "Waiting 15 seconds for slurpd to send changes..." -sleep 15 - -echo "Stopping the slave..." -kill -HUP $SLAVEPID -KILLPIDS="$PID $SLURPPID" - -echo "Waiting for slave slapd to die..." -wait $SLAVEPID - -echo "Applying more changes to the master slapd..." -$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ - $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com -changetype: modify -add: description -description: This change was applied after killing the slave slapd... - -EOMODS - -RC=$? - -if test $RC != 0 ; then - echo "ldapmodify failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC -fi - - -echo "Stopping slurpd..." -kill -HUP $SLURPPID -KILLPIDS="$PID" - -echo "Waiting for slurpd to die..." -wait $SLURPPID - -echo "Applying more changes to the master slapd..." -$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ - $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com -changetype: modify -add: description -description: This change was applied after killing slurpd... - -EOMODS - -RC=$? - -if test $RC != 0 ; then - echo "ldapmodify failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC -fi - -echo "Restarting slave slapd on TCP/IP port $PORT2..." -echo "RESTART" >> $LOG2 -$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & -SLAVEPID=$! -if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID - read foo -fi -KILLPIDS="$KILLPIDS $SLAVEPID" - -sleep 1 - -echo "Using ldapsearch to check that slave slapd is running..." -for i in 0 1 2 3 4 5; do - $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ - 'objectclass=*' > /dev/null 2>&1 - RC=$? - if test $RC = 0 ; then - break - fi - echo "Waiting 5 seconds for slapd to start..." - sleep 5 -done - -echo "Restarting slurpd..." -echo "RESTART" >> $SLURPLOG -$SLURPD -f $CONF1 -d ${SLURPD_DEBUG-5} -t $DBDIR1B >> $SLURPLOG 2>&1 & -SLURPPID=$! -if test $WAIT != 0 ; then - echo SLURPPID $SLURPPID - read foo -fi -KILLPIDS="$KILLPIDS $SLURPPID" - -echo "Waiting 15 seconds for slurpd to send changes..." -sleep 15 - -if test ! $BACKLDAP = "ldapno" ; then - echo "Try updating the slave slapd..." - $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \ - $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com -changetype: modify -add: description -description: This write must fail because directed to a shadow context, -description: unless the chain overlay is configured appropriately ;) - -EOMODS - - RC=$? - if test $RC != 0 ; then - echo "ldapmodify failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC - fi - - echo "Waiting 15 seconds for slurpd to send changes..." - sleep 15 -fi - -echo "Using ldapsearch to read all the entries from the master..." -$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - 'objectclass=*' > $MASTEROUT 2>&1 -RC=$? - -if test $RC != 0 ; then - echo "ldapsearch failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC -fi - -echo "Using ldapsearch to read all the entries from the slave..." -$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - 'objectclass=*' > $SLAVEOUT 2>&1 -RC=$? - -if test $RC != 0 ; then - echo "ldapsearch failed ($RC)!" - test $KILLSERVERS != no && kill -HUP $KILLPIDS - exit $RC -fi - -test $KILLSERVERS != no && kill -HUP $KILLPIDS - -echo "Filtering master results..." -. $LDIFFILTER < $MASTEROUT > $MASTERFLT -echo "Filtering slave results..." -. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT - -echo "Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT - -if test $? != 0 ; then - echo "test failed - master and slave databases differ" - exit 1 -fi - -echo ">>>>> Test succeeded" - -test $KILLSERVERS != no && wait - -exit 0