Fix NULLxxx -> NULL

diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index 75c30ff9d96f007796ffdc5306e0cc5a323d0eb9..be85707a833e97fa3c79699b710817fc8ff66ba1 100644 (file)
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -42,7 +42,7 @@ ldap_enable_translation( LDAP *ld, LDAPMessage *entry, int enable )
 {
        short   *optionsp;
 
-       optionsp = ( entry == NULLMSG ) ? &ld->ld_lberoptions :
+       optionsp = ( entry == NULL ) ? &ld->ld_lberoptions :
            &entry->lm_ber->ber_options;
                
        if ( enable ) {

diff --git a/servers/slapd/tools/ldapsyntax.c b/servers/slapd/tools/ldapsyntax.c
index 542792b231a9bdbac6d08e413aa3e379c1a5431c..a8fd9fab3a9d8858123f9560720453e0fe1aecfc 100644 (file)
--- a/servers/slapd/tools/ldapsyntax.c
+++ b/servers/slapd/tools/ldapsyntax.c
@@ -414,7 +414,7 @@ photo2ldif( PS ps, AttributeValue av )
     if ( pe->pe_class == PE_CLASS_UNIV && pe->pe_form == PE_FORM_PRIM
            && pe->pe_id == PE_PRIM_BITS ) {
        len = ps_get_abs( pe );
-       if (( phber = der_alloc()) == NULLBER ) {
+       if (( phber = der_alloc()) == NULL ) {
            return( -1 );
        }
        if ( ber_printf( phber, "t{[tB]{B}}",