From 1ade4ed2096a5dbf5306e66bbaba15959b066a2b Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 27 Jan 2007 06:31:01 +0000 Subject: [PATCH] Delete olcInclude stuff --- doc/guide/admin/config_dit.gif | Bin 4592 -> 4599 bytes doc/guide/admin/slapdconf2.sdf | 42 ++++----------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/doc/guide/admin/config_dit.gif b/doc/guide/admin/config_dit.gif index c58af04454626a169103bafe88effca1346f394f..2327d03c72b10f9edee0971d3a9d8771517511f4 100644 GIT binary patch delta 3698 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 Q!aKagTfD|g76AbOJ6$$Vr~m)} delta 3715 zcmV-}4t(+VBk&`z4FeY;`2+y~01yBy00000{s9{S00{p8{|S>E1BriECyKv-0}CEZ zxUk{Fh!ZPb%($`RzbdbDYzrB7!}t-AG3);1}_ z_Bz|O?VGh{<_5d_w(pm{VFvFy{I_wGwE+*@tlVMq<(CCAk1qIMY30S8WOj?wjctfHXU3!1l1qmc}OE#%xg%M`C z<(DLO86cQsCWsnsWu|FRk1RokrkZdbxh0!%9!KYGch>1!p04q!XP;&I`KM~{xf$h} zT!ti@cR+3==%A)$H|3-YZTG00ijH(Cq@PKOXrrG#bm^vtc0?+tm=*Wkm6Se5C6sGU z|LIZ7t7Lyhf@h(#R~A`hvr(QZY-Ge% z%3+NrvUVeaIbyh@oI*;A9<-Hg;9IVFnF06kc$JAy#F2)qY=qY~tLY%P5 zjo#OZz5{RkYQ-ZwJM70(EtEZxqrkx*zn=DE z#Qb>s-+$Wtorz8U{AaQO(hny9Bw*YOXeyp0P=VZeU`hJt90o!VG#1QMP$YOk&T#N; zX3Jm)>+(UBP>^^h9AQ;TSU07xP=#uFVM|h|5gEb|bTphu4jm=J8}g`!F4>`}|A6R2 z(-D6WI9JJA5qWdOmed2C0X7nR zh7^-tl&DBiJ#vPXN#q4JIh9NHgp=h1B~^bs`I<=PPLx(5HmLNRD^vNK zSOU(LAd28D*M&O!mc30d2~r63WJvFf@o<99BaYhqlbn>7m*|BSkGIoTyyXIfd*ezLZzd zMKTMdt|L+dHJGS?6^lyoQr85X7#jV#RHa3eDNaj@B&4ZJKzZ7srCy4(LXD569(u@bf-@<>P&xar=IrZtyWcgUDTlUI%W3gJ6{W{&79>lH<4#Q zQUlgkiziiToeoQIm0nd7B%brN=&n$z5nf@6wZcL#kO&LU&#@rYCTK%@tb4ZC)RBr0r;ddzV@G>Zh=q%^MU`1;1%}ui|7m}1wkf)8 z%^p@Il7jHG^xEyjR@KypQO&sZLhZ#w_Oi*&_NunM*{47zT;>AJus4P3$dtBSk{Xw{ z@k-oT@g*eU@(!~rJMM6u3flHs_qp)RZg-zrT?J8>WOc0_Q(0On9DVjx8w1yWd#l=S zjyJkB3$VMgx>~T+>cIvZaBzP!yDj$87rOlw@M<|m;fzUGw(-?(L^FKh=2lpFz2)vv zD;r$ot{10w&}xaS<#73mSFchSg3WbTECJ=*)ZDCNpDVXCLD21`ONDwTa?Mt z#5GS(-AQ4anzFyP^{sz(D(M;~ad;S>XtLe>qrH-F#nY|`tus30wP8C|z;>ptH+twy zhFhZD7UZ|ht!$Hx+i>e9kw}^S+j>(~*7Vk4ucy0jXg8bK(eC$t{oT6+58T(r4snU4 zZEt-CT;T^_xQm@V>~m*XyB8;TkT>3L9UD5=Ag6Yik^^uu^P7L+@&6V%NN4?U-?|Ou z`QBDrAw1TcR*%zNy|k`u{?>)ZoJb^(tI$O|R&U{|)T&nNtQ0%*zUmz3TekSfX@t4I zK3&OTef7;r{b?anJmVX>v!J;?uaL32XK<-M+PrsmejGwKztVz0E)Z=Uy!r#;vSo?pzb z70fq2edbvX+}k34!H-`nSjh|h)@J(k4o~>;Bj(mz<>r6By`NeC=q&B~ttrvk@-05+ zlg|17UX1DIPx)aZ4YRV-*Tp}Ueew%$TJO8R$tGrS$cK8d7kI{(A|{u86_g>;RelFJ zWwcdZ0{3|X7kY2@G8Tw=;OBbFCw24HVj9Rd8+a%L2xndvHRFPQ+9zeehk}lmdG=C* z9LIK1Cs==lMrfV~Gje8q`!|CLSUa5db}J(~a#wfu6=j@-dYAQsE!Tf(M}jkxFl2>i zL6c@x=!5sBGhbzXE;4>Z$3NARXkKW2m^Nk;C^k2;XoEFCvGdHZVfj{dsm4F_ZEV)ZJ*ePc7kkfAzr2kMQqfHt29q-QBC|*i?)au^K^^4 zxQq3aPrUexjT1w#RY}AsC4yLtUle!9xQzL+jKt_W1m%oyV=1sGjq?Fi*0@9x5{=mi zDHeZJjonBn(G!mTBPifVj+rzn=ZKDbVJ+*(j)P-4?+A~Hh>7&5IJ?A+_n3~DUbmoLH%WDp*N9Ogsglq3k}ioSn!$gOG5K#iQj?MYGLJ2ZlShG(G|7_`NKQc6 zjz7tNL%D3|RFp@#g5tE4mpF?`>6BI@NKxsORmqf6`4v}LL0LJFpxBkfv6ZqWmKjNw zh6t7`)G21Uk2~2-XlXj&^p*-GlXCfyeX^F$*p{P&m(MsLd`U=uc|~>UK!ItKgQkf~29q?hUAPpP7qv&a_A*C`4_mIL)a<;X{>I2xFF77NvNb#$8i z^=FdDkny9MJ(Zd;H)3~{OQEESc{Vqr*oir~khjTIqDEIB26d>(T1sb$K^ay^$7ioM zbY&$jZrEnpV_rrGX@ZA?P&SO{m7IU=_8*I7DA<>GIR99kS7?vFb9-H;cs`|D(T9b@ zcW#~cT;VA*Kjwf&Nr~s_aYCkkdWV6>cx)7Sdm6WP0(yji7IM?6pWX6dd-!5Q_K(mqo0EDvGA=nWD%Up-xzAZ@P+b z3T}6rnQO|Kd#agv%5FMZk8FRcr-S;Gq3A*D(=^QgL^#(omWM-0J*R(-HmQ<0r%S4Z zQ<O2lzXyOFNPQ#7gCxePbxL`Ynqth7p(Dy=57@0Av#7Odu6k%%=}M|5>Zzqg zc|FQ68OX1}r!fVKeYESqp8uv}=O@aHtKx^$O@ufh6W zLp84g=x8!Xv0!>$>eYXC84IKM2Z1~&gU#xdE6r%1>4|0i3a{%*r}XBku!pi5t5Wf) zd5<-&hsu?4=Ai={g9bRWFo>-M7iXc`psZ42;t6B1d7y0?JB*sFBse;A)ud4>v8{HW z70XwV%B))`h772sRoaDVWwyJAwwlA2QVW{oDvYL@Z3#+>qlsTZ_p_E?N}8d`r-AFY zBFnesW~c;2nU*;|HA|5l6q%O$w&`=Zn)^06V^jT^RrX diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf index c237363409..595d3dc517 100644 --- a/doc/guide/admin/slapdconf2.sdf +++ b/doc/guide/admin/slapdconf2.sdf @@ -18,7 +18,10 @@ configuration uses a single file, normally installed as {{F:/usr/local/etc/openldap/slapd.conf}}, the new style uses a slapd backend database to store the configuration. The configuration database normally resides in the -{{F:/usr/local/etc/openldap/slapd.d}} directory. +{{F:/usr/local/etc/openldap/slapd.d}} directory. When +converting from the slapd.conf format to slapd.d format, any +include files will also be integrated into the resulting configuration +database. An alternate configuration directory (or file) can be specified via a command-line option to {{slapd}}(8). This chapter describes the @@ -52,10 +55,6 @@ the illustration for clarity. The {{slapd-config}} configuration tree has a very specific structure. The root of the tree is named {{EX:cn=config}} and contains global configuration settings. Additional settings are contained in separate child entries: -* Include files -.. Usually these are just pathnames left over from a converted -{{EX:slapd.conf}} file. -.. Otherwise use of Include files is deprecated. * Dynamically loaded modules .. These may only be used if the {{EX:--enable-modules}} option was used to configure the software. @@ -244,39 +243,6 @@ H4: Sample Entry >olcReferral: ldap://root.openldap.org - -H3: cn=include - -An include entry holds the pathname of one include file. Include files -are part of the old style slapd.conf configuration system and must be in -slapd.conf format. Include files were commonly used to load schema -specifications. While they are still supported, their use is deprecated. -Include entries must have the {{EX:olcIncludeFile}} objectClass. - - -H4: olcInclude: - -This directive specifies that slapd should read additional -configuration information from the given file. - -Note: You should be careful when using this directive - there is -no small limit on the number of nested include directives, and no -loop detection is done. - - -H4: Sample Entries - ->dn: cn=include{0},cn=config ->objectClass: olcIncludeFile ->cn: include{0} ->olcInclude: ./schema/core.schema -> ->dn: cn=include{1},cn=config ->objectClass: olcIncludeFile ->cn: include{1} ->olcInclude: ./schema/cosine.schema - - H3: cn=module If support for dynamically loaded modules was enabled when configuring -- 2.39.5