Sync with HEAD

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 63f9f4b5d92b2c3e94ca13fcd1401c6d95bf8fcb..65a80c5e053b9b713b80b2b885df2b7ca5e7da12 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -386,7 +386,7 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
                len = dn->bv_len + sizeof("uid=")-1 + sizeof(",cn=auth")-1;
 
                /* username may have embedded realm name */
-               if( realm = strchr( dn->bv_val, '@') ) {
+               if( ( realm = strchr( dn->bv_val, '@') ) ) {
                        *realm++ = '\0';
                        len += sizeof(",cn=")-2;
                } else if( user_realm && *user_realm ) {

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 103533d6f3806e02c42c36cd6bca0add25de7688..5e41856b58be662ae11b99203aea83b7a4756192 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2122,7 +2122,9 @@ printablesStringValidate(
                }
        }
 
-       if( len == 0 ) LDAP_INVALID_SYNTAX;
+       if( len == 0 ) {
+               return LDAP_INVALID_SYNTAX;
+       }
 
        return LDAP_SUCCESS;
 }