From eeff9868d4465de5941182d2fc6110dd9a2c1dc2 Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@csclub.uwaterloo.ca>
Date: Sat, 29 Mar 2008 08:12:20 -0400
Subject: [PATCH] Fix build on Solaris

---
 src/Makefile | 2 +-
 src/ldap.c   | 4 +++-
 src/util.h   | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index fa5caf6..a66f7b5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@ CFLAGS ?= -ggdb -Wall -O2
 CFLAGS += -I../include
 
 LIBCEO_OBJECTS := util.o common.o config.o parser.o ldap.o krb5.o kadm.o addhomedir.o
-LIBCEO_LDFLAGS := -lacl -lldap $(shell krb5-config --libs krb5 kadm-client)
+LIBCEO_LDFLAGS := -lldap $(shell krb5-config --libs krb5 kadm-client)
 
 DESTDIR :=
 PREFIX := /usr/local
diff --git a/src/ldap.c b/src/ldap.c
index 6d871cc..55334e8 100644
--- a/src/ldap.c
+++ b/src/ldap.c
@@ -3,9 +3,11 @@
 #include <pwd.h>
 #include <grp.h>
 #include <sasl/sasl.h>
-#include <ldap.h>
 #include <krb5.h>
 
+#define LDAP_DEPRECATED 1
+#include <ldap.h>
+
 #include "ldap.h"
 #include "krb5.h"
 #include "config.h"
diff --git a/src/util.h b/src/util.h
index f8ad49c..bd01b11 100644
--- a/src/util.h
+++ b/src/util.h
@@ -11,6 +11,10 @@
 #define NORETURN
 #endif
 
+#ifndef LOG_AUTHPRIV
+#define LOG_AUTHPRIV LOG_AUTH
+#endif
+
 int spawnv(const char *, char *[]);
 
 NORETURN void fatal(const char *, ...);