Renumber CB-specific error codes/flags

Assigned numbers had conflicted with those assigned by maintainer

diff --git a/include/sasl.h b/include/sasl.h
index 9c6d060..de0abf3 100755 (executable)
--- a/include/sasl.h
+++ b/include/sasl.h
@@ -171,7 +171,13 @@
 #define SASL_NOCHANGE   -22  /* requested change was not needed */
 #define SASL_WEAKPASS   -27  /* passphrase is too weak for security policy */
 #define SASL_NOUSERPASS -28  /* user supplied passwords not permitted */
-#define SASL_BADBINDING -29  /* channel binding failure */
+#define SASL_NEED_OLD_PASSWD   -29 /* sasl_setpass needs old password in order
+                                   to perform password change */
+#define SASL_CONSTRAINT_VIOLAT -30 /* a property can't be stored,
+                                      because of some constrains/policy violation */
+#define SASL_USER_EXISTS       -31 /* sasl_auxprop_rename_user has failed because
+                                      new_userid already exists */
+#define SASL_BADBINDING                -32 /* channel binding failure */
 
 /* max size of a sasl mechanism name */
 #define SASL_MECHNAMEMAX 20

diff --git a/include/saslplug.h b/include/saslplug.h
index 3e0555b..bd50367 100755 (executable)
--- a/include/saslplug.h
+++ b/include/saslplug.h
@@ -343,11 +343,17 @@ typedef struct sasl_client_params {
 /* This plugin allows proxying */
 #define SASL_FEAT_ALLOWS_PROXY 0x0020
 
+/* server plugin needs old password in order to change password */
+#define SASL_FEAT_NEED_OLD_PASSWD 0x0040
+
+/* server plugin don't use cleartext userPassword attribute */
+#define SASL_FEAT_DONTUSE_USERPASSWD 0x0080
+
 /* Underlying mechanism uses GSS framing */
-#define SASL_FEAT_GSS_FRAMING       0x0040
+#define SASL_FEAT_GSS_FRAMING       0x0100
 
 /* Underlying mechanism supports channel binding */
-#define SASL_FEAT_CHANNEL_BINDING  0x0080
+#define SASL_FEAT_CHANNEL_BINDING  0x0200
 
 /* client plug-in features */
 #define SASL_FEAT_NEEDSERVERFQDN 0x0001