Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index ea61055e9d1744d31ebb869892b22c52ced1e1d6..d292ab91787d86afd8817d1089a15a2ff073291e 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1259,9 +1259,11 @@ static slap_verbmasks crlkeys[] = {
 
 static slap_verbmasks vfykeys[] = {
                { BER_BVC("never"),     LDAP_OPT_X_TLS_NEVER },
-               { BER_BVC("demand"),    LDAP_OPT_X_TLS_DEMAND },
+               { BER_BVC("allow"),     LDAP_OPT_X_TLS_ALLOW },
                { BER_BVC("try"),       LDAP_OPT_X_TLS_TRY },
+               { BER_BVC("demand"),    LDAP_OPT_X_TLS_DEMAND },
                { BER_BVC("hard"),      LDAP_OPT_X_TLS_HARD },
+               { BER_BVC("true"),      LDAP_OPT_X_TLS_HARD },
                { BER_BVNULL, 0 }
        };
 #endif