-#define LDAP_DN_FORMAT_LDAPV3 0x0000U
-#define LDAP_DN_FORMAT_LDAPV2 0x0001U
-#define LDAP_DN_FORMAT_DCE 0x0002U
-#define LDAP_DN_FORMAT_UFN 0x0003U /* dn2str only */
-#define LDAP_DN_FORMAT_AD_CANONICAL 0x0004U /* dn2str only */
-#define LDAP_DN_FORMAT_MASK 0x000FU
-
-/* str2dn flags */
-#define LDAP_DN_P_LEADTRAILSPACES 0x1000U
+#define LDAP_DN_FORMAT_LDAP 0x0000U
+#define LDAP_DN_FORMAT_LDAPV3 0x0010U
+#define LDAP_DN_FORMAT_LDAPV2 0x0020U
+#define LDAP_DN_FORMAT_DCE 0x0030U
+#define LDAP_DN_FORMAT_UFN 0x0040U /* dn2str only */
+#define LDAP_DN_FORMAT_AD_CANONICAL 0x0050U /* dn2str only */
+#define LDAP_DN_FORMAT_MASK 0x00F0U
+
+/* DN flags */
+#define LDAP_DN_PRETTY 0x0100U
+#define LDAP_DN_SKIP 0x0200U
+#define LDAP_DN_P_NOLEADTRAILSPACES 0x1000U
+#define LDAP_DN_P_NOSPACEAFTERRDN 0x2000U