Author: rhafer Date: Mon May 11 14:34:41 2009 New Revision: 57118 URL: http://svn.opensuse.org/viewcvs/yast?rev=57118&view=rev Log: Merged bnc#492441 fix from trunk Modified: branches/SuSE-Code-11-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes branches/SuSE-Code-11-Branch/ldap-server/src/lib/slapd-config.h Modified: branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes?rev=57118&r1=57117&r2=57118&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes Mon May 11 14:34:41 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 11 14:26:59 CEST 2009 - rhafer@suse.de + +- error out on unsupported access levels when creating ACLs + (bnc#492441) + +------------------------------------------------------------------- Thu Apr 30 13:25:12 CEST 2009 - rhafer@novell.com - call SuSEFirewall::Read() in installation proposal to avoid Modified: branches/SuSE-Code-11-Branch/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-server/src/lib/slapd-config.h?rev=57118&r1=57117&r2=57118&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-server/src/lib/slapd-config.h (original) +++ branches/SuSE-Code-11-Branch/ldap-server/src/lib/slapd-config.h Mon May 11 14:34:41 2009 @@ -128,7 +128,10 @@ inline OlcAclBy( const std::string& level, const std::string& type, const std::string& value = "" ) : - m_level(level), m_type(type), m_value(value) {}; + m_type(type), m_value(value) + { + setLevel(level); + } inline std::string getLevel() const { @@ -147,6 +150,13 @@ inline void setLevel( const std::string &level ) { + + if ( level != "none" && level != "disclose" && level != "auth" && + level != "compare" && level != "read" && + level != "write" && level != "manage" ) + { + throw std::runtime_error( "Unsupported access level" ); + } m_level = level; } inline void setType( const std::string &type ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org