Move uidNumber and gidNumber into slapd(8)

to ensure they are available for ldapi://.

diff --git a/servers/slapd/schema/nis.schema b/servers/slapd/schema/nis.schema
index 1f1524ec13735e11bd16317d9bc31d9a147fe04c..c6b03a52915c5c80d7be942c97f1c4be7efa0f23 100644 (file)
--- a/servers/slapd/schema/nis.schema
+++ b/servers/slapd/schema/nis.schema
@@ -34,15 +34,17 @@
 
 # Attribute Type Definitions
 
-attributetype ( 1.3.6.1.1.1.1.0 NAME 'uidNumber'
-       DESC 'An integer uniquely identifying a user in an administrative domain'
-       EQUALITY integerMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.1.1.1.1 NAME 'gidNumber'
-       DESC 'An integer uniquely identifying a group in an administrative domain'
-       EQUALITY integerMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+# builtin
+#attributetype ( 1.3.6.1.1.1.1.0 NAME 'uidNumber'
+#      DESC 'An integer uniquely identifying a user in an administrative domain'
+#      EQUALITY integerMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+# builtin
+#attributetype ( 1.3.6.1.1.1.1.1 NAME 'gidNumber'
+#      DESC 'An integer uniquely identifying a group in an administrative domain'
+#      EQUALITY integerMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
 attributetype ( 1.3.6.1.1.1.1.2 NAME 'gecos'
        DESC 'The GECOS field; the common name'

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index a9cfd1e05bdff7eb49988bbd198843245ccf6cae..592bfa1e5b90510dc6c5cb162565dba8220fb9ec 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -942,6 +942,26 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_uid) },
+       { "uidNumber", /* for ldapi:// "
+               "( 1.3.6.1.1.1.1.0 NAME 'uidNumber' "
+               "DESC 'An integer uniquely identifying a user "
+                               in an administrative domain' "
+               "EQUALITY integerMatch "
+               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )",
+               NULL, 0,
+               NULL, NULL,
+               NULL, NULL, NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_uidNumber) },
+       { "gidNumber", /* for ldapi:// */
+               "( 1.3.6.1.1.1.1.1 NAME 'gidNumber'
+               "DESC 'An integer uniquely identifying a group "
+                               in an administrative domain' "
+               "EQUALITY integerMatch"
+               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )"
+               NULL, 0,
+               NULL, NULL,
+               NULL, NULL, NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_gidNumber) },
        { "userPassword", "( 2.5.4.35 NAME 'userPassword' "
                        "DESC 'RFC2256/2307: password of user' "
                        "EQUALITY octetStringMatch "

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 43da09895764487fc5247648ba2ee75f15999d70..4a20dc3903b2d406338892ac80276aa00c22296a 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -911,6 +911,8 @@ struct slap_internal_schema {
        AttributeDescription *si_ad_name;
        AttributeDescription *si_ad_cn;
        AttributeDescription *si_ad_uid;
+       AttributeDescription *si_ad_uidNumber;
+       AttributeDescription *si_ad_gidNumber;
        AttributeDescription *si_ad_userPassword;
        AttributeDescription *si_ad_labeledURI;
 #ifdef SLAPD_AUTHPASSWD