From 35a41f5ef488b1a262fa44968d5b37465e5c503f Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 16 Aug 2002 18:56:11 +0000 Subject: [PATCH] Sync with HEAD --- servers/slapd/sasl.c | 2 +- servers/slapd/schema_init.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 63f9f4b5d9..65a80c5e05 100644 --- 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 103533d6f3..5e41856b58 100644 --- 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; } -- 2.39.5