From a24b0c1c70ff0d98cac21e9c504cb47573b2230e Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 9 Mar 1999 01:59:49 +0000
Subject: [PATCH] Integrate saucer in OpenLDAP build environment: Add
 saucer/Makefile.in, add saucer to configure and top-level Makefile, include
 "portable.h" and <ac/*.h>, replace ldap_debug/lber_debug with
 ldap_set_option/lber_set_option.

---
 Makefile.in                |  2 +-
 configure                  |  2 ++
 configure.in               |  1 +
 contrib/saucer/Makefile.in | 17 +++++++++++++++++
 contrib/saucer/main.c      | 17 ++++++++++++-----
 5 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 contrib/saucer/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f832bd07e9..2aac1dd25a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@
 ##
 
 SUBDIRS= include libraries clients servers tests # contrib
-CLEANDIRS= doc # tests doc
+CLEANDIRS= contrib/saucer doc
 INSTALLDIRS= doc
 
 makefiles:	FORCE
diff --git a/configure b/configure
index 1c55abbd55..08de9284e1 100755
--- a/configure
+++ b/configure
@@ -10327,6 +10327,7 @@ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
+contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
  include/portable.h include/ldap_features.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -10495,6 +10496,7 @@ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
+contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index 6c978f2901..87fd04add3 100644
--- a/configure.in
+++ b/configure.in
@@ -1821,6 +1821,7 @@ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
+contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 ,[
 date > stamp-h
 echo Please \"make depend\" to build dependencies
diff --git a/contrib/saucer/Makefile.in b/contrib/saucer/Makefile.in
new file mode 100644
index 0000000000..2dbac4e899
--- /dev/null
+++ b/contrib/saucer/Makefile.in
@@ -0,0 +1,17 @@
+PROGRAMS= saucer
+
+SRCS=	main.c
+OBJS=	main.o
+
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
+
+XLIBS =  -lldap -llber -llutil
+XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
+
+saucer:	${OBJS} $(LDAP_LIBDEPEND)
+	$(LTLINK) -o $@ $(OBJS) $(LIBS)
+
+install-local: $(PROGRAMS) FORCE
+	-$(MKDIR) $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 saucer $(libexecdir)
diff --git a/contrib/saucer/main.c b/contrib/saucer/main.c
index 4028904dfd..12d967a3b6 100644
--- a/contrib/saucer/main.c
+++ b/contrib/saucer/main.c
@@ -15,13 +15,18 @@
  * Author: Eric Rosenquist, 1994.
  */
 
-#include <ctype.h>
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <unistd.h>
+#include <stdlib.h>
+
+#include <ac/ctype.h>
+#include <ac/string.h>
+#include <ac/unistd.h>
 
 #include <lber.h>
 #include <ldap.h>
+#include <ldap_log.h>
 
 #define DN_MAXLEN	4096
 
@@ -548,6 +553,7 @@ int is_whitespace(register char *s)
 int main(int argc, char **argv)
 {
 	int		error_flag = 0;
+	int		tmp;
 	FILE	*rc;
 
 	progname = argv[0];
@@ -558,8 +564,9 @@ int main(int argc, char **argv)
 			break;
 		case 'd':
 #ifdef LDAP_DEBUG
-			lber_debug = atoi(optarg);
-			ldap_debug = atoi(optarg);
+			tmp = atoi(optarg);
+			lber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &tmp);
+			ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &tmp);
 #endif
 			break;
 		case 'h':
-- 
2.39.5