Set ciphers from slapd.conf.

[openldap] / libraries / libldap / tmplout.c

diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index ec82cfcba9afaf951708c740b10eac2496c3b165..cfa29ee2f57ea31250ae19e0978d0465ecc32a8d 100644 (file)
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -10,7 +10,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -27,7 +28,7 @@
 #include "disptmpl.h"
 
 #include "ldap-int.h"
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 
 #define writeptype ldap_writeptype
 
@@ -425,7 +426,7 @@ do_entry2text_search(
     struct ldap_disptmpl       *tmpl;
     struct timeval             timeout;
 
-    if ( dn == NULL && entry == NULLMSG ) {
+    if ( dn == NULL && entry == NULL ) {
        ld->ld_errno = LDAP_PARAM_ERROR;
        return( ld->ld_errno );
     }
@@ -466,7 +467,7 @@ do_entry2text_search(
 
 
     if ( tmpllist != NULL ) {
-       ldmp = NULLMSG;
+       ldmp = NULL;
 
        if ( entry == NULL ) {
            char        *ocattrs[2];