From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 5 Sep 2005 01:08:40 +0000 (+0000)
Subject: Move uidNumber and gidNumber into slapd(8)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~483
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b707e1e38c64c6d362d4d1f187bfa3dcb5b14871;p=openldap

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 1f1524ec13..c6b03a5291 100644
--- 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 a9cfd1e05b..592bfa1e5b 100644
--- 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 43da098957..4a20dc3903 100644
--- 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