small cleanup

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 6042e3e808f6f6da94a57990f0bcc3091a9da3ae..b4c0d795ddc04413288ca7c756755e214d0deee7 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -218,24 +218,26 @@ typedef struct slap_ssf_set {
 /*
  * represents schema information for a database
  */
-#define SLAP_SCHERR_OUTOFMEM           1
-#define SLAP_SCHERR_CLASS_NOT_FOUND    2
-#define SLAP_SCHERR_CLASS_BAD_USAGE    3
-#define SLAP_SCHERR_ATTR_NOT_FOUND     4
-#define SLAP_SCHERR_ATTR_BAD_USAGE     5
-#define SLAP_SCHERR_DUP_CLASS          6
-#define SLAP_SCHERR_DUP_ATTR           7
-#define SLAP_SCHERR_DUP_SYNTAX         8
-#define SLAP_SCHERR_DUP_RULE           9
-#define SLAP_SCHERR_NO_NAME            10
-#define SLAP_SCHERR_ATTR_INCOMPLETE    11
-#define SLAP_SCHERR_MR_NOT_FOUND       12
-#define SLAP_SCHERR_SYN_NOT_FOUND      13
-#define SLAP_SCHERR_MR_INCOMPLETE      14
-#define SLAP_SCHERR_NOT_SUPPORTED      15
-#define SLAP_SCHERR_BAD_DESCR          16
-#define SLAP_SCHERR_OIDM                       17
-#define SLAP_SCHERR_LAST                       SLAP_SCHERR_OIDM
+#define SLAP_SCHERR_OUTOFMEM                   1
+#define SLAP_SCHERR_CLASS_NOT_FOUND            2
+#define SLAP_SCHERR_CLASS_BAD_USAGE            3
+#define SLAP_SCHERR_CLASS_BAD_SUP              4
+#define SLAP_SCHERR_CLASS_DUP                  5
+#define SLAP_SCHERR_ATTR_NOT_FOUND             6
+#define SLAP_SCHERR_ATTR_BAD_USAGE             7
+#define SLAP_SCHERR_ATTR_BAD_SUP               8
+#define SLAP_SCHERR_ATTR_INCOMPLETE            9
+#define SLAP_SCHERR_ATTR_DUP                   10
+#define SLAP_SCHERR_MR_NOT_FOUND               11
+#define SLAP_SCHERR_MR_INCOMPLETE              12
+#define SLAP_SCHERR_MR_DUP                             13
+#define SLAP_SCHERR_SYN_NOT_FOUND              14
+#define SLAP_SCHERR_SYN_DUP                            15
+#define SLAP_SCHERR_NO_NAME                            16
+#define SLAP_SCHERR_NOT_SUPPORTED              17
+#define SLAP_SCHERR_BAD_DESCR                  18
+#define SLAP_SCHERR_OIDM                               19
+#define SLAP_SCHERR_LAST                               SLAP_SCHERR_OIDM
 
 typedef union slap_sockaddr {
        struct sockaddr sa_addr;
@@ -431,6 +433,11 @@ typedef struct slap_attribute_type {
        Syntax                                  *sat_syntax;
 
        AttributeTypeSchemaCheckFN      *sat_check;
+
+#define SLAP_AT_NONE           0x0000U
+#define SLAP_AT_ABSTRACT       0x0100U /* cannot be instantiated */
+#define SLAP_AT_FINAL          0x0200U /* cannot be subtyped */
+#define SLAP_AT_HIDE           0x8000U /* hide attribute */
        slap_mask_t                                     sat_flags;
 
        struct slap_attribute_type      *sat_next;
@@ -489,13 +496,15 @@ typedef struct slap_object_class {
        struct slap_object_class        *soc_next;
 } ObjectClass;
 
-#define        SLAP_OC_ALIAS           0x01
-#define        SLAP_OC_REFERRAL        0x02
-#define        SLAP_OC_SUBENTRY        0x04
-#define        SLAP_OC_DYNAMICOBJECT   0x08
-#define        SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY     0x10
-#define        SLAP_OC__MASK           0x1F
-#define        SLAP_OC__END            0x20
+#define        SLAP_OC_ALIAS           0x0001
+#define        SLAP_OC_REFERRAL        0x0002
+#define        SLAP_OC_SUBENTRY        0x0004
+#define        SLAP_OC_DYNAMICOBJECT   0x0008
+#define        SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY     0x0010
+#define        SLAP_OC__MASK           0x001F
+#define        SLAP_OC__END            0x0020
+#define SLAP_OC_OPERATIONAL    0x4000
+#define SLAP_OC_HIDE           0x8000
 
 #ifdef LDAP_EXTENDED_SCHEMA
 /*
@@ -609,6 +618,8 @@ struct slap_internal_schema {
        /* Access Control Internals */
        AttributeDescription *si_ad_entry;
        AttributeDescription *si_ad_children;
+       AttributeDescription *si_ad_saslAuthzTo;
+       AttributeDescription *si_ad_saslAuthzFrom;
 #ifdef SLAPD_ACI_ENABLED
        AttributeDescription *si_ad_aci;
 #endif
@@ -1540,7 +1551,7 @@ typedef struct slap_conn {
        /* only can be changed by binding thread */
        int             c_sasl_bind_in_progress;        /* multi-op bind in progress */
        struct berval   c_sasl_bind_mech;                       /* mech in progress */
-       struct berval   c_cdn;
+       struct berval   c_sasl_dn;      /* temporary storage */
 
        /* authorization backend */
        Backend *c_authz_backend;
@@ -1595,19 +1606,6 @@ typedef struct slap_conn {
 #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 )
 #endif
 
-
-#define SASLREGEX_REPLACE 10
-#define SASL_AUTHZ_SOURCE_ATTR "saslAuthzTo"
-#define SASL_AUTHZ_DEST_ATTR "saslAuthzFrom"
-
-typedef struct sasl_regexp {
-  char *sr_match;                                                      /* regexp match pattern */
-  char *sr_replace;                                                    /* regexp replace pattern */
-  regex_t sr_workspace;                                                /* workspace for regexp engine */
-  regmatch_t sr_strings[SASLREGEX_REPLACE];    /* strings matching $1,$2 ... */
-  int sr_offset[SASLREGEX_REPLACE+2];          /* offsets of $1,$2... in *replace */
-} SaslRegexp_t;
-
 /*
  * listener; need to access it from monitor backend
  */