mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

hardcode "uid" into slapd & improve previous commit

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-12-07 10:01:48 +00:00
parent b70d375964
commit f3a959970e
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/sasl.c
View File

@ -1609,7 +1609,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id,
irdn = 0; irdn = 0;
DN[ irdn ] = RDNs[ irdn ]; DN[ irdn ] = RDNs[ irdn ];
RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; RDNs[ irdn ][ 0 ] = &AVAs[ irdn ];
BER_BVSTR( &AVAs[ irdn ].la_attr, "uid" ); AVAs[ irdn ].la_attr = slap_schema.si_ad_uid->ad_cname;
AVAs[ irdn ].la_value = *dn; AVAs[ irdn ].la_value = *dn;
AVAs[ irdn ].la_flags = LDAP_AVA_NULL; AVAs[ irdn ].la_flags = LDAP_AVA_NULL;
AVAs[ irdn ].la_private = NULL; AVAs[ irdn ].la_private = NULL;
@ -1619,7 +1619,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id,
irdn++; irdn++;
DN[ irdn ] = RDNs[ irdn ]; DN[ irdn ] = RDNs[ irdn ];
RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; RDNs[ irdn ][ 0 ] = &AVAs[ irdn ];
BER_BVSTR( &AVAs[ irdn ].la_attr, "cn" ); AVAs[ irdn ].la_attr = slap_schema.si_ad_cn->ad_cname;
ber_str2bv( user_realm, 0, 0, &AVAs[ irdn ].la_value ); ber_str2bv( user_realm, 0, 0, &AVAs[ irdn ].la_value );
AVAs[ irdn ].la_flags = LDAP_AVA_NULL; AVAs[ irdn ].la_flags = LDAP_AVA_NULL;
AVAs[ irdn ].la_private = NULL; AVAs[ irdn ].la_private = NULL;
@ -1630,7 +1630,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id,
irdn++; irdn++;
DN[ irdn ] = RDNs[ irdn ]; DN[ irdn ] = RDNs[ irdn ];
RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; RDNs[ irdn ][ 0 ] = &AVAs[ irdn ];
BER_BVSTR( &AVAs[ irdn ].la_attr, "cn" ); AVAs[ irdn ].la_attr = slap_schema.si_ad_cn->ad_cname;
AVAs[ irdn ].la_value = *mech; AVAs[ irdn ].la_value = *mech;
AVAs[ irdn ].la_flags = LDAP_AVA_NULL; AVAs[ irdn ].la_flags = LDAP_AVA_NULL;
AVAs[ irdn ].la_private = NULL; AVAs[ irdn ].la_private = NULL;
@ -1640,7 +1640,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id,
irdn++; irdn++;
DN[ irdn ] = RDNs[ irdn ]; DN[ irdn ] = RDNs[ irdn ];
RDNs[ irdn ][ 0 ] = &AVAs[ irdn ]; RDNs[ irdn ][ 0 ] = &AVAs[ irdn ];
BER_BVSTR( &AVAs[ irdn ].la_attr, "cn" ); AVAs[ irdn ].la_attr = slap_schema.si_ad_cn->ad_cname;
BER_BVSTR( &AVAs[ irdn ].la_value, "auth" ); BER_BVSTR( &AVAs[ irdn ].la_value, "auth" );
AVAs[ irdn ].la_flags = LDAP_AVA_NULL; AVAs[ irdn ].la_flags = LDAP_AVA_NULL;
AVAs[ irdn ].la_private = NULL; AVAs[ irdn ].la_private = NULL;

12
servers/slapd/schema/core.schema
View File

@ -525,12 +525,12 @@ objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
# #
# Derived from RFC 1274, but with new "short names" # Derived from RFC 1274, but with new "short names"
# #
attributetype ( 0.9.2342.19200300.100.1.1 #attributetype ( 0.9.2342.19200300.100.1.1
NAME ( 'uid' 'userid' ) # NAME ( 'uid' 'userid' )
DESC 'RFC1274: user identifier' # DESC 'RFC1274: user identifier'
EQUALITY caseIgnoreMatch # EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch # SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) # SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
attributetype ( 0.9.2342.19200300.100.1.3 attributetype ( 0.9.2342.19200300.100.1.3
NAME ( 'mail' 'rfc822Mailbox' ) NAME ( 'mail' 'rfc822Mailbox' )

9
servers/slapd/schema_prep.c
View File

@ -907,6 +907,15 @@ static struct slap_schema_ad_map {
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_cn) }, offsetof(struct slap_internal_schema, si_ad_cn) },
{ "uid", "( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) "
"DESC 'RFC1274: user identifier' "
"EQUALITY caseIgnoreMatch "
"SUBSTR caseIgnoreSubstringsMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )",
NULL, 0,
NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_uid) },
{ "userPassword", "( 2.5.4.35 NAME 'userPassword' " { "userPassword", "( 2.5.4.35 NAME 'userPassword' "
"DESC 'RFC2256/2307: password of user' " "DESC 'RFC2256/2307: password of user' "
"EQUALITY octetStringMatch " "EQUALITY octetStringMatch "

1
servers/slapd/slap.h
View File

@ -848,6 +848,7 @@ struct slap_internal_schema {
AttributeDescription *si_ad_distinguishedName; AttributeDescription *si_ad_distinguishedName;
AttributeDescription *si_ad_name; AttributeDescription *si_ad_name;
AttributeDescription *si_ad_cn; AttributeDescription *si_ad_cn;
AttributeDescription *si_ad_uid;
AttributeDescription *si_ad_userPassword; AttributeDescription *si_ad_userPassword;
AttributeDescription *si_ad_labeledURI; AttributeDescription *si_ad_labeledURI;
#ifdef SLAPD_AUTHPASSWD #ifdef SLAPD_AUTHPASSWD