389-commits June 2008

389-commits@lists.fedoraproject.org

1 participants
52 discussions

[Fedora-directory-commits] dsgw doauth.c, 1.5, 1.6 newentry.c, 1.5, 1.6
by Doctor Conrad 12 Jun '08

12 Jun '08

Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13576/dsgw Modified Files: doauth.c newentry.c Log Message: Resolves: bug 450971 Bug Description: Continue after auth for new entry does not work Reviewed by: nkinder (Thanks!) Fix Description: I had previously changed the way authdesturl worked. I wanted to disallow the user to pass in a full URL with host and port because that could lead to XSS attacks. So I introduced authdestdn which just contained the DN of the entry to edit. However, in doing that, I broke new entry creation, because that needs to know what type of entry to create - it cannot guess from the DN or existing entry. Since authdesturl already has that info, I just make sure I strip off everything before the '?' so as to avoid those types of problems. I also changed the URL by default to not have the http:, host, port, etc. - just the name of the command followed by the arguments. Platforms tested: RHEL5 Flag Day: no Doc impact: no Index: doauth.c =================================================================== RCS file: /cvs/dirsec/dsgw/doauth.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- doauth.c 6 Mar 2008 22:00:09 -0000 1.5 +++ doauth.c 12 Jun 2008 14:01:33 -0000 1.6 @@ -197,10 +197,22 @@ "<!-- Hide from non-JavaScript browsers\n" ); if ( authdesturl != NULL && strlen( authdesturl ) > 0 ) { - char *authdestdn = dsgw_get_cgi_var( "authdestdn", DSGW_CGIVAR_OPTIONAL ); - dsgw_emitf( "var authdesturl='%s?context=%s&dn=%s';\n", - dsgw_getvp( DSGW_CGINUM_EDIT ), context, - authdestdn ? authdestdn : "" ); + /* strip off everything before the ? in authdesturl */ + char *theargs = strchr(authdesturl, '?'); + if (NULL == theargs) { + /* see if we have an authdestdn */ + char *authdestdn = dsgw_get_cgi_var( "authdestdn", DSGW_CGIVAR_OPTIONAL ); + if (authdestdn) { + dsgw_emitf( "var authdesturl='%s?context=%s&dn=%s';\n", + DSGW_CGINAME_EDIT, context, authdestdn ); + } else { + dsgw_emitf( "var authdesturl=null;\n" ); /* bogus url */ + } + } else { + theargs++; /* skip the '?' character */ + dsgw_emitf( "var authdesturl='%s?%s';\n", + DSGW_CGINAME_EDIT, theargs ); + } } else { dsgw_emitf( "var authdesturl=null;\n" ); } Index: newentry.c =================================================================== RCS file: /cvs/dirsec/dsgw/newentry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- newentry.c 20 Mar 2008 02:18:39 -0000 1.5 +++ newentry.c 12 Jun 2008 14:01:33 -0000 1.6 @@ -271,7 +271,7 @@ free(dn); newurl = PR_smprintf(DSGW_URLPREFIX_CGI_HTTP "%s?tmplname=%s&context=%s&ADD=1&dn=%s", - dsgw_getvp( DSGW_CGINUM_EDIT ), entryType, context, edn); + DSGW_CGINAME_EDIT, entryType, context, edn); free(edn); return newurl; @@ -329,7 +329,7 @@ static void post_request() { - char* newurl = compute_newurl(); + char *newurl = compute_newurl(); if (client_is_authenticated()) { /* Direct the client to GET newurl */ dsgw_emits( "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" );

1 0

[Fedora-directory-commits] dsgw/html/manual add.htm, 1.3, 1.4 attribut.htm, 1.4, 1.5 mod.htm, 1.3, 1.4 objclass.htm, 1.4, 1.5 search.htm, 1.2, 1.3
by Doctor Conrad 11 Jun '08

11 Jun '08

Author: rmeggins Update of /cvs/dirsec/dsgw/html/manual In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29819/dsgw/html/manual Modified Files: add.htm attribut.htm mod.htm objclass.htm search.htm Log Message: Resolves: bug 450898 Bug Description: Incorrect hyperlink in the dsgw help page Fix Description: Many of the links were incorrect. In addition, there were many places where the HTML entity Acirc was used - these have been removed. Platforms tested: RHEL5 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: add.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/add.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- add.htm 11 Jun 2008 22:03:52 -0000 1.3 +++ add.htm 11 Jun 2008 22:42:54 -0000 1.4 @@ -124,11 +124,11 @@ before creating entries within the subtrees: </p> -<pre>Â Â Â Â Â Â Â Â Â  o=Example.com<br>Â Â Â Â Â Â Â Â Â  ou=Marketing, o=Example.com<br>Â Â Â Â Â Â Â Â Â  ...<br>Â Â Â Â Â Â Â Â Â  <i>Marketing subtree entries</i> -Â Â Â Â Â Â Â Â Â  ... -Â Â Â Â Â Â Â Â Â  ou=Accounting, o=Example.com -Â Â Â Â Â Â Â Â Â  ... -Â Â Â Â Â Â Â Â Â  <i>Accounting subtree entries</i> +<pre>          o=Example.com<br>          ou=Marketing, o=Example.com<br>          ...<br>          <i>Marketing subtree entries</i> +          ... +          ou=Accounting, o=Example.com +          ... +          <i>Accounting subtree entries</i> </pre> <h3> <a name="DN"></a>Distinguished Name Syntax</h3> @@ -188,13 +188,13 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#sn">Last Name</a></li> </ul> <li>You can provide values for the optional fields now, or add them later. The optional fields for a person are:</li> -Â  +  <p></p> <center> <table border="2"> @@ -202,16 +202,16 @@ <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First -Name</a>Â </td> +Name</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#facsimileTelephoneNumber">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#facsimileTelephoneNumber">Fax</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">User ID</a></td> @@ -221,49 +221,49 @@ <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile -Phone</a>Â </td> +Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a></td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ou">Organizational -Unit</a>Â </td> +Unit</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room -NumberÂ </a></td> +Number </a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">Admin </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#Â </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept# </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car -License#Â </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicense">Car +License# </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -AddressÂ </a></td> +Address </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -AlsoÂ </a></td> +Also </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledUri">URLÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledUri">URL </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Password</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Password</a> </td> </tr> </tbody> </table> @@ -315,10 +315,10 @@ The required fields for an NT-person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#commonName">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#sn">Last Name</a></li> <li><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">NT @@ -334,66 +334,66 @@ <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First -Name</a>Â </td> +Name</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">FaxÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Directory -Server Password</a>Â </td> +Server Password</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile -Phone</a>Â </td> +Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational -Unit</a>Â </td> +Unit</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room -Number</a>Â </td> +Number</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">Admin </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car -License#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicense">Car +License#</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -Address</a>Â </td> +Address</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -Also</a>Â </td> +Also</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userid">User Id</a></td> @@ -501,14 +501,14 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uniqueMember">NT -Group Members</a>Â </td> +Group Members</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> @@ -564,28 +564,28 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -Also</a>Â </td> - <td>Â </td> - <td>Â </td> +Also</a> </td> + <td> </td> + <td> </td> </tr> </tbody> </table> @@ -632,7 +632,7 @@ <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a></td> @@ -695,28 +695,28 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -Also</a>Â </td> - <td>Â </td> - <td>Â </td> +Also</a> </td> + <td> </td> + <td> </td> </tr> </tbody> </table> Index: attribut.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/attribut.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- attribut.htm 11 Jun 2008 22:03:52 -0000 1.4 +++ attribut.htm 11 Jun 2008 22:42:54 -0000 1.5 @@ -62,7 +62,7 @@ For information on the object classes in the schema, see </a><a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1002619">Appendix A, "Object Classes."</a></p> -<p><a name="1020843">Â  +<p><a name="1020843">  </a><a name="Attribute Definitions"> <h2> Attribute Definitions</h2> </a> Index: mod.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/mod.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod.htm 11 Jun 2008 22:03:52 -0000 1.3 +++ mod.htm 11 Jun 2008 22:42:54 -0000 1.4 @@ -103,10 +103,10 @@ for a person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#commonName">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#sn">Last Name</a></li> </ul> <li>You can provide values for the optional fields now, or edit them @@ -119,68 +119,68 @@ <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First -Name</a>Â </td> +Name</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userid">User -IDÂ </a></td> +ID </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">PagerÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager </a></td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile -Phone</a>Â </td> +Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">TitleÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title </a></td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational -Unit</a>Â </td> +Unit</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room -NumberÂ </a></td> +Number </a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">Admin </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#Â </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept# </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car -License#Â </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicense">Car +License# </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -AddressÂ </a></td> +Address </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -AlsoÂ </a></td> +Also </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URLÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Password</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Password</a> </td> </tr> </tbody> </table> @@ -286,10 +286,10 @@ for an NT person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#commonName">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#sn">Last Name</a></li> <li><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">NT @@ -305,69 +305,69 @@ <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First -Name</a>Â </td> +Name</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">FaxÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax </a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Directory -Server Password</a>Â </td> +Server Password</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile -Phone</a>Â </td> +Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational -Unit</a>Â </td> +Unit</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room -Number</a>Â </td> +Number</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">Admin </a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car -License#</a>Â </td> +License#</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -Address</a>Â </td> +Address</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -Also</a>Â </td> +Also</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userid">User -Id</a>Â </td> +Id</a> </td> </tr> </tbody> </table> @@ -430,14 +430,14 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#member">Group -Members</a>Â </td> +Members</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> @@ -563,14 +563,14 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uniqueMember">Group -Members</a>Â </td> +Members</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> @@ -578,7 +578,7 @@ </tbody> </table> </center> -Â  <li>You can also change the value for the <a +  <li>You can also change the value for the <a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ntGroupDeleteGroup">Delete NT Group if Group Deleted</a> option.</li> <li>You can <a @@ -631,28 +631,28 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -Also</a>Â </td> - <td>Â </td> - <td>Â </td> +Also</a> </td> + <td> </td> + <td> </td> </tr> </tbody> </table> @@ -715,7 +715,7 @@ <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a></td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a></td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a></td> @@ -777,33 +777,33 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business -Category</a>Â </td> +Category</a> </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a> </td> <td><a - href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a> </td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing -Address</a>Â </td> +Address</a> </td> </tr> <tr> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See -Also</a>Â </td> - <td>Â </td> - <td>Â </td> +Also</a> </td> + <td> </td> + <td> </td> </tr> </tbody> </table> </center> -Â  <li>When you are done editing, click Save Changes.</li> +  <li>When you are done editing, click Save Changes.</li> </ol> <h2><a name="rename"></a>Renaming Entries</h2> To rename an entry, do the following: Index: objclass.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/objclass.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- objclass.htm 11 Jun 2008 22:03:52 -0000 1.4 +++ objclass.htm 11 Jun 2008 22:42:54 -0000 1.5 @@ -152,7 +152,7 @@ 2.16.840.1.113730.3.2 </a> </pre> -<a name="1005608">Â  +<a name="1005608">  </a><a name="Groups"> <h2> Groups</h2> </a> @@ -169,7 +169,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005294">groupOfUniqueNames</a>, and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1100399">NTGroup</a>. -<p><a name="1080708">Â  +<p><a name="1080708">  </a><a name="groupOfNames"> <h3> groupOfNames</h3> </a> @@ -286,7 +286,7 @@ </tbody> </table> </p> -<p><a name="1005294">Â  +<p><a name="1005294">  </a><a name="groupOfUniqueNames"> <h3> groupOfUniqueNames</h3> </a> @@ -393,7 +393,7 @@ </tbody> </table> </p> -<p><a name="1100399">Â  +<p><a name="1100399">  </a><a name="NTGroup"> <h3> NTGroup</h3> </a> @@ -499,7 +499,7 @@ </tbody> </table> </p> -<p><a name="1005780">Â  +<p><a name="1005780">  </a><a name="Replication"></a></p> <h2><a name="Replication"> Replication</a></h2> <a name="1005974"> @@ -512,7 +512,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005781">LDAPServer</a>, and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005782">LDAPReplica</a>. -<p><a name="1100614">Â  +<p><a name="1100614">  </a><a name="cirReplicaSource"></a></p> <h3><a name="cirReplicaSource"> cirReplicaSource</a></h3> <a name="1100615"> @@ -709,7 +709,7 @@ </tbody> </table> </p> -<p><a name="1105809">Â  +<p><a name="1105809">  </a><a name="glue"></a></p> <h3><a name="glue"> glue</a></h3> <a name="1105810"> @@ -719,7 +719,7 @@ Guide. Reserved. This object class is an extension to the standard LDAP schema.</a> <p><a name="1105811">OID: <code>2.16.840.1.113730.3.2.30</code></a></p> -<p><a name="1005781">Â  +<p><a name="1005781">  </a><a name="LDAPServer"></a></p> <h3><a name="LDAPServer"> LDAPServer</a></h3> <a name="1042902"> @@ -825,7 +825,7 @@ </tbody> </table> </p> -<p><a name="1005782">Â  +<p><a name="1005782">  </a><a name="LDAPReplica"></a></p> <h3><a name="LDAPReplica"> LDAPReplica</a></h3> <a name="1006031"> @@ -1049,7 +1049,7 @@ </tbody> </table> </p> -<p><a name="1005591">Â  +<p><a name="1005591">  </a><a name="Locations"></a></p> <h2><a name="Locations"> Locations</a></h2> <a name="1005809"> @@ -1060,7 +1060,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005812">country</a> and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005427">locality</a>. -<p><a name="1005812">Â  +<p><a name="1005812">  </a><a name="country"></a></p> <h3><a name="country"> country</a></h3> <a name="1005813"> @@ -1120,7 +1120,7 @@ </tbody> </table> </p> -<p><a name="1005427">Â  +<p><a name="1005427">  </a><a name="locality"></a></p> <h3><a name="locality"> locality</a></h3> <a name="1005428"> @@ -1208,7 +1208,7 @@ </tbody> </table> </p> -<p><a name="1004915">Â  +<p><a name="1004915">  </a><a name="Organizations"></a></p> <h2><a name="Organizations"> Organizations</a></h2> <a name="1004913"> @@ -1219,7 +1219,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1004980">organization</a> and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005108">organizationalUnit</a>. -<p><a name="1004980">Â  +<p><a name="1004980">  </a><a name="organization"></a></p> <h3><a name="organization"> organization</a></h3> <a name="1004981"> @@ -1435,7 +1435,7 @@ </tbody> </table> </p> -<p><a name="1005108">Â  +<p><a name="1005108">  </a><a name="organizationalUnit"></a></p> <h3><a name="organizationalUnit"> organizationalUnit</a></h3> <a name="1005109"> @@ -1687,7 +1687,7 @@ </tbody> </table> </p> -<p><a name="1004958">Â  +<p><a name="1004958">  </a><a name="People"></a></p> <h2><a name="People"> People</a></h2> <a name="1100949"> @@ -1710,7 +1710,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1089681">person</a>, and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1106267">residentialPerson</a>. -<p><a name="1089249">Â  +<p><a name="1089249">  </a><a name="inetOrgPerson"></a></p> <h3><a name="inetOrgPerson"> inetOrgPerson</a></h3> <a name="1089250"> @@ -1978,7 +1978,7 @@ </tbody> </table> </p> -<p><a name="1100980">Â  +<p><a name="1100980">  </a><a name="newPilotPerson"></a></p> <h3><a name="newPilotPerson"> newPilotPerson</a></h3> <a name="1100981"> @@ -2189,7 +2189,7 @@ </tbody> </table> </p> -<p><a name="1100862">Â  +<p><a name="1100862">  </a><a name="nsLicenseUser"></a></p> <h3><a name="nsLicenseUser"> nsLicenseUser</a></h3> <a name="1100863"> @@ -2251,7 +2251,7 @@ </tbody> </table> </p> -<p><a name="1089442">Â  +<p><a name="1089442">  </a><a name="ntUser"></a></p> <h3><a name="ntUser"> ntUser</a></h3> <a name="1089443"> @@ -2659,7 +2659,7 @@ </tbody> </table> </p> -<p><a name="1002805">Â  +<p><a name="1002805">  </a><a name="organizationalPerson"></a></p> <h3><a name="organizationalPerson"> organizationalPerson</a></h3> <a name="1002806"> @@ -2856,7 +2856,7 @@ </tbody> </table> </p> -<p><a name="1088567">Â  +<p><a name="1088567">  </a><a name="organizationalRole"> <h3> organizationalRole</h3> </a> @@ -3095,7 +3095,7 @@ </tbody> </table> </p> -<p><a name="1089681">Â  +<p><a name="1089681">  </a><a name="person"> <h3> person</h3> </a> @@ -3184,7 +3184,7 @@ </tbody> </table> </p> -<p><a name="1106267">Â  +<p><a name="1106267">  </a><a name="residentialPerson"> <h3> residentialPerson</h3> </a> @@ -3371,7 +3371,7 @@ </tbody> </table> </p> -<p><a name="1078660">Â  +<p><a name="1078660">  </a><a name="Calendar Server Extensions"></a></p> <h2><a name="Calendar Server Extensions"> Calendar Server Extensions</a></h2> <a name="1081153"> @@ -3384,7 +3384,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1084445">nsCalResource</a>, and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078672">nsCalUser</a>. -<p><a name="1078663">Â  +<p><a name="1078663">  </a><a name="netscapeCalendarServer"></a></p> <h3><a name="netscapeCalendarServer"> netscapeCalendarServer</a></h3> <a name="1078664"> @@ -3427,7 +3427,7 @@ </p> <p><a name="1097417"> </a></p> -<p><a name="1097420">Â  +<p><a name="1097420">  </a><a name="nsCalAdmin"></a></p> <h3><a name="nsCalAdmin"> nsCalAdmin</a></h3> <a name="1097421"> @@ -3714,7 +3714,7 @@ </tbody> </table> </p> -<p><a name="1084445">Â  +<p><a name="1084445">  </a><a name="nsCalResource"></a></p> <h3><a name="nsCalResource"> nsCalResource</a></h3> <a name="1084446"> @@ -4005,7 +4005,7 @@ </tbody> </table> </p> -<p><a name="1078672">Â  +<p><a name="1078672">  </a><a name="nsCalUser"></a></p> <h3><a name="nsCalUser"> nsCalUser</a></h3> <a name="1078673"> @@ -4284,7 +4284,7 @@ </tbody> </table> </p> -<p><a name="1078479">Â  +<p><a name="1078479">  </a><a name="Certificate Server Extensions"></a></p> <h2><a name="Certificate Server Extensions"> Certificate Server Extensions</a></h2> @@ -4292,7 +4292,7 @@ This section describes the </a><a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078501">netscapeCertificateServer</a> object class used by the Certificate Server. -<p><a name="1078501">Â  +<p><a name="1078501">  </a><a name="netscapeCertificateServer"></a></p> <h3><a name="netscapeCertificateServer"> netscapeCertificateServer</a></h3> <a name="1078564"> @@ -4333,7 +4333,7 @@ </tbody> </table> </p> -<p><a name="1078576">Â  +<p><a name="1078576">  </a><a name="News Server Extensions"></a></p> <h2><a name="News Server Extensions"> News Server Extensions</a></h2> <a name="1080748"> @@ -4342,7 +4342,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078579">netscapeNewsServer</a> and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078583">nginfo</a>. -<p><a name="1078579">Â  +<p><a name="1078579">  </a><a name="netscapeNewsServer"></a></p> <h3><a name="netscapeNewsServer"> netscapeNewsServer</a></h3> <a name="1108221"> @@ -4383,7 +4383,7 @@ </tbody> </table> </p> -<p><a name="1078583">Â  +<p><a name="1078583">  </a><a name="nginfo"></a></p> <h3><a name="nginfo"> nginfo</a></h3> <a name="1078584"> @@ -4513,7 +4513,7 @@ </tbody> </table> </p> -<p><a name="1078655">Â  +<p><a name="1078655">  </a><a name="Compass Server Extensions"></a></p> <h2><a name="Compass Server Extensions"> Compass Server Extensions</a></h2> <a name="1080778"> @@ -4526,7 +4526,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1080358">PIPUser</a>, and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1080065">PIPUserInfo</a>. -<p><a name="1080497">Â  +<p><a name="1080497">  </a><a name="netscapeCompassServer"></a></p> <h3><a name="netscapeCompassServer"> netscapeCompassServer</a></h3> <a name="1080498"> @@ -4567,7 +4567,7 @@ </tbody> </table> </p> -<p><a name="1079636">Â  +<p><a name="1079636">  </a><a name="personalInterestProfile"></a></p> <h3><a name="personalInterestProfile"> personalInterestProfile</a></h3> <a name="1082056"> @@ -5140,7 +5140,7 @@ </tbody> </table> </p> -<p><a name="1080358">Â  +<p><a name="1080358">  </a><a name="PIPUser"></a></p> <h3><a name="PIPUser"> PIPUser</a></h3> <a name="1082531"> @@ -5280,7 +5280,7 @@ </tbody> </table> </p> -<p><a name="1080065">Â  +<p><a name="1080065">  </a><a name="PIPUserInfo"></a></p> <h3><a name="PIPUserInfo"> PIPUserInfo</a></h3> <a name="1080066"> @@ -5376,7 +5376,7 @@ </tbody> </table> </p> -<p><a name="1097229">Â  +<p><a name="1097229">  </a><a name="Directory Server Extensions"></a></p> <h2><a name="Directory Server Extensions"> Directory Server Extensions</a></h2> <a name="1077861"> @@ -5405,7 +5405,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1097669">referral</a>, and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1097986">subschema</a>. -<p><a name="1077794">Â  +<p><a name="1077794">  </a><a name="changeLogEntry"></a></p> <h3><a name="changeLogEntry"> changeLogEntry</a></h3> <a name="1077795"> @@ -5528,7 +5528,7 @@ </tbody> </table> </p> -<p><a name="1098555">Â  +<p><a name="1098555">  </a><a name="groupOfCertificates"></a></p> <h3><a name="groupOfCertificates"> groupOfCertificates</a></h3> <a name="1098563"> @@ -5638,7 +5638,7 @@ </tbody> </table> </p> -<p><a name="1089068">Â  +<p><a name="1089068">  </a><a name="netscapeDirectoryServer"> <h3> netscapeDirectoryServer</h3> </a> @@ -5679,7 +5679,7 @@ </tbody> </table> </p> -<p><a name="1078109">Â  +<p><a name="1078109">  </a><a name="netscapeMachineData"> <h3> netscapeMachineData</h3> </a> @@ -5688,7 +5688,7 @@ filtered out during replication. This object class is an extension to the standard LDAP schema. Reserved.</a></p> <p><a name="1097237"> OID: <code>2.16.840.1.113730.3.2.32</code></a></p> -<p><a name="1097231">Â  +<p><a name="1097231">  </a><a name="netscapeServer"> <h3> netscapeServer</h3> </a> @@ -5813,7 +5813,7 @@ </tbody> </table> </p> -<p><a name="1081708">Â  +<p><a name="1081708">  </a><a name="passwordObject"> <h3> passwordObject</h3> </a> @@ -5911,7 +5911,7 @@ </tbody> </table> </p> -<p><a name="1081724">Â  +<p><a name="1081724">  </a><a name="passwordPolicy"> <h3> passwordPolicy</h3> </a> @@ -6088,7 +6088,7 @@ </tbody> </table> </p> -<p><a name="1097669">Â  +<p><a name="1097669">  </a><a name="referral"></a></p> <h3><a name="referral"> referral</a></h3> <a name="1097670"> @@ -6130,7 +6130,7 @@ </tbody> </table> </p> -<p><a name="1097986">Â  +<p><a name="1097986">  </a><a name="subschema"></a></p> <h3><a name="subschema"> subschema</a></h3> <a name="1097987"> @@ -6230,14 +6230,14 @@ </tbody> </table> </p> -<p><a name="1097091">Â  +<p><a name="1097091">  </a><a name="Media Server Extensions"></a></p> <h2><a name="Media Server Extensions"> Media Server Extensions</a></h2> <a name="1097095"> This section describes the </a><a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1097098">netscapeMediaServer</a> object class used by the Media Server. -<p><a name="1097098">Â  +<p><a name="1097098">  </a><a name="netscapeMediaServer"></a></p> <h3><a name="netscapeMediaServer"> netscapeMediaServer</a></h3> <a name="1097132"> @@ -6278,7 +6278,7 @@ </tbody> </table> </p> -<p><a name="1097135">Â  +<p><a name="1097135">  </a><a name="Messaging Server Extensions"></a></p> <h2><a name="Messaging Server Extensions"> Messaging Server Extensions</a></h2> <a name="1108700"> @@ -6291,7 +6291,7 @@ href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078007">mailGroup</a>,and <a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1081545">netscapeMailServer</a>. -<p><a name="1108716">Â  +<p><a name="1108716">  </a><a name="groupOfMailEnhancedUniqueNames"></a></p> <h3><a name="groupOfMailEnhancedUniqueNames"> groupOfMailEnhancedUniqueNames</a></h3> @@ -6406,7 +6406,7 @@ </tbody> </table> </p> -<p><a name="1077922">Â  +<p><a name="1077922">  </a><a name="mailRecipient"></a></p> <h3><a name="mailRecipient"> mailRecipient</a></h3> <a name="1077923"> @@ -6584,7 +6584,7 @@ </tbody> </table> </p> -<p><a name="1078007">Â  +<p><a name="1078007">  </a><a name="mailGroup"></a></p> <h3><a name="mailGroup"> mailGroup</a></h3> <a name="1078009"> @@ -6768,7 +6768,7 @@ </tbody> </table> </p> -<p><a name="1081545">Â  +<p><a name="1081545">  </a><a name="netscapeMailServer"></a></p> <h3><a name="netscapeMailServer"> netscapeMailServer</a></h3> <a name="1081546"> @@ -6809,14 +6809,14 @@ </tbody> </table> </p> -<p><a name="1086191">Â  +<p><a name="1086191">  </a><a name="Proxy Server Extensions"></a></p> <h2><a name="Proxy Server Extensions"> Proxy Server Extensions</a></h2> <a name="1086195"> This section describes the </a><a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1081588">netscapeProxyServer</a> object class used by the Proxy Server. -<p><a name="1081588">Â  +<p><a name="1081588">  </a><a name="netscapeProxyServer"></a></p> <h3><a name="netscapeProxyServer"> netscapeProxyServer</a></h3> <a name="1081589"> @@ -6857,14 +6857,14 @@ </tbody> </table> </p> -<p><a name="1081607">Â  +<p><a name="1081607">  </a><a name="Web Server Extensions"></a></p> <h2><a name="Web Server Extensions"> Web Server Extensions</a></h2> <a name="1081611"> This section describes the </a><a href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1081614">netscapeWebServer</a> object class used by Web servers. -<p><a name="1081614">Â  +<p><a name="1081614">  </a><a name="netscapeWebServer"></a></p> <h3><a name="netscapeWebServer"> netscapeWebServer</a></h3> <a name="1081615"> @@ -6905,13 +6905,13 @@ </tbody> </table> </p> -<p><a name="1108799">Â  +<p><a name="1108799">  </a><a name="Reserved Object Classes"></a></p> <h2><a name="Reserved Object Classes"> Reserved Object Classes</a></h2> <a name="1108800"> This section describes object classes that are not defined for this release or are reserved for future use by the Directory Server.</a> -<p><a name="1091117">Â  +<p><a name="1091117">  </a><a name="account"></a></p> <h3><a name="account"> account</a></h3> <a name="1091854"> @@ -7006,7 +7006,7 @@ </tbody> </table> </p> -<p><a name="1089961">Â  +<p><a name="1089961">  </a><a name="alias"></a></p> <h3><a name="alias"> alias</a></h3> <a name="1089993"> @@ -7048,7 +7048,7 @@ </tbody> </table> </p> -<p><a name="1091270">Â  +<p><a name="1091270">  </a><a name="applicationEntity"></a></p> <h3><a name="applicationEntity"> applicationEntity</a></h3> <a name="1106068"> @@ -7153,7 +7153,7 @@ </tbody> </table> </p> -<p><a name="1090381">Â  +<p><a name="1090381">  </a><a name="applicationProcess"></a></p> <h3><a name="applicationProcess"> applicationProcess</a></h3> <a name="1106091"> @@ -7231,7 +7231,7 @@ </tbody> </table> </p> -<p><a name="1091421">Â  +<p><a name="1091421">  </a><a name="cacheObject"></a></p> <h3><a name="cacheObject"> cacheObject</a></h3> <a name="1093594"> @@ -7274,7 +7274,7 @@ </tbody> </table> </p> -<p><a name="1091225">Â  +<p><a name="1091225">  </a><a name="certificationAuthority"></a></p> <h3><a name="certificationAuthority"> certificationAuthority</a></h3> <a name="1091226"> @@ -7346,7 +7346,7 @@ </tbody> </table> </p> -<p><a name="1097268">Â  +<p><a name="1097268">  </a><a name="dcObject"></a></p> <h3><a name="dcObject"> dcObject</a></h3> <a name="1097806"> @@ -7398,7 +7398,7 @@ </tbody> </table> </p> -<p><a name="1090760">Â  +<p><a name="1090760">  </a><a name="device"></a></p> <h3><a name="device"> device</a></h3> <a name="1090817"> @@ -7504,7 +7504,7 @@ </tbody> </table> </p> -<p><a name="1091390">Â  +<p><a name="1091390">  </a><a name="DNSDomain"></a></p> <h3><a name="DNSDomain"> DNSDomain</a></h3> <a name="1093025"> @@ -7544,7 +7544,7 @@ </tbody> </table> </p> -<p><a name="1091348">Â  +<p><a name="1091348">  </a><a name="document"></a></p> <h3><a name="document"> document</a></h3> <a name="1092549"> @@ -7781,7 +7781,7 @@ </tbody> </table> </p> -<p><a name="1091354">Â  +<p><a name="1091354">  </a><a name="documentSeries"></a></p> <h3><a name="documentSeries"> documentSeries</a></h3> <a name="1092560"> @@ -7876,7 +7876,7 @@ </tbody> </table> </p> -<p><a name="1091357">Â  +<p><a name="1091357">  </a><a name="domain"></a></p> <h3><a name="domain"> domain</a></h3> <a name="1097945"> @@ -8145,7 +8145,7 @@ </tbody> </table> </p> -<p><a name="1091384">Â  +<p><a name="1091384">  </a><a name="domainRelatedObject"></a></p> <h3><a name="domainRelatedObject"> domainRelatedObject</a></h3> <a name="1093633"> @@ -8187,7 +8187,7 @@ </tbody> </table> </p> -<p><a name="1097756">Â  +<p><a name="1097756">  </a><a name="dSA"></a></p> <h3><a name="dSA"> dSA</a></h3> <a name="1097757"> @@ -8227,7 +8227,7 @@ </tbody> </table> </p> -<p><a name="1091415">Â  +<p><a name="1091415">  </a><a name="friendlyCountry"></a></p> <h3><a name="friendlyCountry"> friendlyCountry</a></h3> <a name="1093062"> @@ -8268,7 +8268,7 @@ </tbody> </table> </p> -<p><a name="1091443">Â  +<p><a name="1091443">  </a><a name="labeledURIObject"></a></p> <h3><a name="labeledURIObject"> labeledURIObject</a></h3> <a name="1096833"> @@ -8311,7 +8311,7 @@ </tbody> </table> </p> -<p><a name="1091410">Â  +<p><a name="1091410">  </a><a name="pilotObject"></a></p> <h3><a name="pilotObject"> pilotObject</a></h3> <a name="1091508"> @@ -8427,7 +8427,7 @@ </tbody> </table> </p> -<p><a name="1091437">Â  +<p><a name="1091437">  </a><a name="pilotOrganization"></a></p> <h3><a name="pilotOrganization"> pilotOrganization</a></h3> <a name="1093224"> @@ -8689,7 +8689,7 @@ </tbody> </table> </p> -<p><a name="1091375">Â  +<p><a name="1091375">  </a><a name="RFC822LocalPart"> <h3> RFC822LocalPart</h3> </a> @@ -8740,7 +8740,7 @@ </tbody> </table> </p> -<p><a name="1091363">Â  +<p><a name="1091363">  </a><a name="room"> <h3> room</h3> </a> @@ -8817,7 +8817,7 @@ </tbody> </table> </p> -<p><a name="1091431">Â  +<p><a name="1091431">  </a><a name="simpleSecurityObject"> <h3> simpleSecurityObject</h3> </a> @@ -8860,7 +8860,7 @@ </tbody> </table> </p> -<p><a name="1089871">Â  +<p><a name="1089871">  </a><a name="strongAuthenticationUser"> <h3> strongAuthenticationUser</h3> </a> @@ -8912,7 +8912,7 @@ </tbody> </table> </p> -<p><a name="1106481">Â  +<p><a name="1106481">  </a><a name="top"></a></p> <h3><a name="top"> top</a></h3> <a name="1106482"> Index: search.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/search.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- search.htm 6 Mar 2008 22:00:38 -0000 1.2 +++ search.htm 11 Jun 2008 22:42:54 -0000 1.3 @@ -395,7 +395,7 @@ <tr> <td>People</td> <td><a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">full name</a>, - <a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">last name</a>, <a + <a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#sn">last name</a>, <a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">phone number</a>, <a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">email address</a>, <a href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">user ID</a>, or <a

1 0

[Fedora-directory-commits] dsgw/html/manual add.htm, 1.2, 1.3 attribut.htm, 1.3, 1.4 mod.htm, 1.2, 1.3 objclass.htm, 1.3, 1.4
by Doctor Conrad 11 Jun '08

11 Jun '08

Author: rmeggins Update of /cvs/dirsec/dsgw/html/manual In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28584/dsgw/html/manual Modified Files: add.htm attribut.htm mod.htm objclass.htm Log Message: Resolves: bug 450894 Bug Description: The help page for 'adding entries' does not display appropriate info for nt-person Fix Description: In fact, many of the help pages are not displayed correctly. In an earlier commit I changed the HTML comments based on HTML Tidy feedback. However, the literal string  is stripped out by lang and replaced with the correct context string. Platforms tested: RHEL5 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: add.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/add.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- add.htm 6 Mar 2008 22:00:38 -0000 1.2 +++ add.htm 11 Jun 2008 22:03:52 -0000 1.3 @@ -48,35 +48,35 @@ entries, your Directory Server administrator must have granted you the right to do so. Before you can add an entry, you must <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> to the Directory Server. <p>Using the Directory Server interface you can add: </p> <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#person">a + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#person">a person</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#NTperson">an + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#NTperson">an NT person</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#group">a + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#group">a group</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#NTgroup">an + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#NTgroup">an NT group</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#ou">an + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#ou">an organizational unit</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#dc">a + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#dc">a domain</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#o">an + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#o">an organization</a></li> </ul> Before you add an entry for the first time, read the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#guidelines">New + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#guidelines">New Entry Guidelines</a> section for important information about the directory tree structure and naming conventions. @@ -86,13 +86,13 @@ the following directory concepts: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#tree">directory + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#tree">directory tree structure</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#DN">distinguished + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#DN">distinguished name syntax</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#uniqueDN">unique + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#uniqueDN">unique distinguished names</a></li> </ul> <h3> @@ -175,7 +175,7 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>When you add a person to the directory, a form that allows you to edit that person's data is displayed. This form is @@ -185,10 +185,10 @@ The required fields for a person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#cn">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last Name</a></li> </ul> <li>You can provide values for the optional fields now, or add them @@ -201,69 +201,69 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#givenName">First + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First Name</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mail">Email + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#facsimileTelephoneNumber">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#facsimileTelephoneNumber">Fax</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#uid">User + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">User ID</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#pager">Pager</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mobile">Mobile + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#title">Title</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#ou">Organizational + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ou">Organizational Unit</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#roomNumber">Room + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room NumberÂ </a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#departmentNumber">Dept#Â </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#Â </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#carLicnese">Car + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car License#Â </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing AddressÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See AlsoÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#labeledUri">URLÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledUri">URLÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userPassword">Password</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Password</a>Â </td> </tr> </tbody> </table> @@ -279,10 +279,10 @@ the form. When you are done filling in the form, click the Save New Person button at the top of the form.</li> <li>After saving the entry, you can <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addmanager">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addmanager">add values to the Manager and Admin fields</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add a See Also value</a>.</li> </ol> <h2> @@ -305,7 +305,7 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>When you add an NT-person to the directory, a form that allows you to @@ -315,13 +315,13 @@ The required fields for an NT-person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#commonName">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#commonName">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last Name</a></li> <li><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#uid">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">NT User ID</a></li> </ul> <li>You can provide values for the optional fields now, or add them @@ -333,69 +333,69 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#givenName">First + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First Name</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mail">Email + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">FaxÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">FaxÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userPassword">Directory + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Directory Server Password</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#pager">Pager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mobile">Mobile + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#title">Title</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational Unit</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#roomNumber">Room + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room Number</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#carLicnese">Car + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car License#</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#labeledURI">URL</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userid">User + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userid">User Id</a></td> </tr> </tbody> @@ -408,10 +408,10 @@ <li>You can also change the value for the following two options:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#NTUserDelete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#NTUserDelete">Delete NT Account if Person deleted</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#NTUserCreateNewAccount">Create + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#NTUserCreateNewAccount">Create New NT Account</a></li> </ul> The default value is shown. If you do not change the value, @@ -421,10 +421,10 @@ button at the top of the form. To cancel the entry creation, close the web browser window containing the form.</li> <li>After saving the entry, you can <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addmanager">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addmanager">add values to the Manager and Admin fields</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add a "See Also" value</a>.</li> </ol> <h2> @@ -440,16 +440,16 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>When you add a group to the directory, a form that allows you to edit that group's data is displayed. This form is displayed in a new web browser window. You must supply a value for the required field <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#cn">Name</a>.</li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Name</a>.</li> <li>You can provide a value for the optional <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a> field now, or add it later.</li> <blockquote><b>Note:</b> <p>You cannot enter values into the Owner, Group Members, @@ -461,7 +461,7 @@ <br> To cancel the entry creation, close the web browser window containing the form. <li>After you have saved the entry, you can <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add values for the Owner, Group Member, and See Also fields</a>.</li> </ol> <h2> @@ -477,7 +477,7 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>When you add an NT-group to the directory, a form that allows you to edit that group's data is displayed. This form is @@ -487,9 +487,9 @@ The required fields for an NT-group are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#cn">Name</a></li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#ntGroupId">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ntGroupId">NT Group Name</a></li> </ul> <li>You can provide values for the optional fields now, or add them @@ -501,16 +501,16 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#uniqueMember">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uniqueMember">NT Group Members</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> </tr> </tbody> @@ -522,7 +522,7 @@ or See Also fields until you have saved the entry.</p> </blockquote> <li>You may also change the value for the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#NTGroupDelete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#NTGroupDelete">Delete NT Group if Group Deleted</a> option.</li> <li>When you are done filling in the form, click the Save New Group button @@ -530,7 +530,7 @@ <br> To cancel the entry creation, close the web browser window containing the form. <li>After you save the entry, you can <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add values for the NT Group Members, Owner, and See Also fields</a>.</li> </ol> @@ -547,13 +547,13 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>When you add an organizational unit to the directory, a form that allows you to edit that organization's data is displayed. This form is displayed in a new web browser window. You must supply a value for the required field, <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#ou">Unit + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ou">Unit Name</a>.</li> <li>You can provide values for the optional fields now, or add them later. @@ -564,25 +564,25 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a>Â </td> <td>Â </td> <td>Â </td> @@ -608,10 +608,10 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>You must supply a value for the required field, <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#dc">dc</a>.</li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#dc">dc</a>.</li> <li>You can provide values for the optional fields now, or add them later. The optional fields for a domain are:</li> @@ -621,25 +621,25 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#localityName">Location</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> <td> </td> <td> </td> @@ -665,7 +665,7 @@ entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>Adding an organization is supported only when you initially populate @@ -684,7 +684,7 @@ <pre>o=Example.com</pre> As a result, the Directory Server rejects the operation. <li>You must supply a value for the required field, <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#organizationName">Organization + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationName">Organization Name</a>.</li> <li>You can provide values for the optional fields now, or add them later. @@ -695,25 +695,25 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a>Â </td> <td>Â </td> <td>Â </td> View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 attribut.htm Index: attribut.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/attribut.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- attribut.htm 6 Mar 2008 22:00:38 -0000 1.3 +++ attribut.htm 11 Jun 2008 22:03:52 -0000 1.4 @@ -60,7 +60,7 @@ used for, refer to the <i>Directory Server Deployment Guide</i>.</a></p> <p><a name="1078428"> For information on the object classes in the schema, see </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1002619">Appendix + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1002619">Appendix A, "Object Classes."</a></p> <p><a name="1020843">Â  </a><a name="Attribute Definitions"> @@ -69,7 +69,7 @@ <a name="1004519">The following define the attributes used to describe an entry in the directory tree. To determine which attributes are required and allowed for each object class, see </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1002619">Appendix + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1002619">Appendix A, "Object Classes."</a></p> <p><a name="1004699"> Each attribute has a corresponding syntax definition that describes the @@ -128,7 +128,7 @@ <p><a name="1201645">Provides an abstract of a document entry.</a></p> <p><a name="1272899"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1104078"> </a><a name="accountUnlockTime"><b>accountUnlockTime</b> </a></p> @@ -143,9 +143,9 @@ <a name="1259967"> OID: <code>2.16.840.1.113730.3.1.95</code></a> <p><a name="1104080">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1251525">operational</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1251525">operational</a></p> <p><a name="1171292"> </a><a name="aci"><b>aci</b> </a></p> @@ -159,7 +159,7 @@ <a name="1258362"> OID: <code>2.16.840.1.113730.3.1.55</code></a> <p><a name="1171296">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">bin</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">bin</a></p> <p><a name="1171297"> This attribute is an extension to the standard LDAP schema.</a></p> @@ -169,7 +169,7 @@ <p><a name="1032957"> Provides a URL to information about the person responsible for administering the server. This attribute is an extension used by the </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#">netscapeServer</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#">netscapeServer</a> object class. Normally this attribute and this attribute value is written to the directory when a server is initially installed. For example:</p> @@ -181,7 +181,7 @@ <a name="1259219"> OID: <code>2.16.840.1.113730.3.1.74</code></a> <p><a name="1098446">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1098448"> </a><a name="adminUrl"><b>adminUrl</b> </a></p> @@ -189,7 +189,7 @@ Provides the URL to the administration server through which you can manage the server. This attribute is an extension used by the </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#">netscapeServer</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#">netscapeServer</a> object class. Normally this attribute and this attribute value is written to the directory when a server is initially installed. For example:</p> @@ -201,7 +201,7 @@ <a name="1259252"> OID: <code>2.16.840.1.113730.3.1.75</code></a> <p><a name="1033052">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004701">ces</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004701">ces</a></p> <p><a name="1201653"> </a><a name="aliasedObjectName"><b>aliasedObjectName</b> </a></p> @@ -217,7 +217,7 @@ <a name="1266950"> OID: <code>2.5.4.1</code></a> <p><a name="1206911">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1100403">dn</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1100403">dn</a></p> <p><a name="1243116"> </a><a name="altServer"><b>altServer</b> </a></p> @@ -227,7 +227,7 @@ OID: <code>1.3.6.1.4.1.1466.101.120.6</code></a></p> <p><a name="1243120"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004701">ces</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004701">ces</a></p> <p><a name="1201668"> </a><a name="associatedDomain"><b>associatedDomain</b> </a></p> @@ -245,7 +245,7 @@ <a name="1260172"> OID: <code>0.9.2342.19200300.100.1.37</code></a> <p><a name="1201672">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1201675"> </a><a name="associatedName"><b>associatedName</b> </a></p> @@ -260,7 +260,7 @@ <a name="1266572"> OID: <code>0.9.2342.19200300.100.1.38</code></a> <p><a name="1201679">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1100403">dn</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1100403">dn</a></p> <p><a name="1290840"> </a><a name="attributeTypes"><b>attributeTypes</b> </a></p> @@ -271,9 +271,9 @@ OID: <code>2.5.21.5</code></a></p> <p><a name="1242648"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1251525">operational</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1251525">operational</a></p> <p><a name="1201684"> </a><a name="audio"><b>audio</b> </a></p> @@ -288,7 +288,7 @@ <a name="1266120"> OID: <code>0.9.2342.19200300.100.1.55</code></a> <p><a name="1201686"></a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">Syntax: + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">Syntax: </a>bin</p> <p><a name="1201689"> </a><a name="authorCn"><b>authorCn</b> @@ -302,7 +302,7 @@ </pre> <a name="1272919"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a> <p><a name="1201696"></a><a name="authorSn"><b>authorSn</b> </a></p> <p><a name="1201697"> @@ -314,7 +314,7 @@ </pre> <a name="1201700"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a> <p><a name="1207170"></a><a name="authorityRevocationList"><b>authorityRevocationList</b> </a></p> <p><a name="1207172"> @@ -322,7 +322,7 @@ Not recommended; use authorityRevocationList;binary instead.</a></p> <p><a name="1207174"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">Syntax: + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">Syntax: </a>bin</p> <p><a name="1207178"> </a><a name="authorityRevocationList;binary"><b>authorityRevocationList;binary</b> @@ -338,7 +338,7 @@ <a name="1277412"> OID: <code>2.5.4.38</code></a> <p><a name="1207182"></a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">Syntax: + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">Syntax: </a>bin</p> <p><a name="1201711"> </a><a name="buildingName"><b>buildingName</b> @@ -353,7 +353,7 @@ <a name="1266616"> OID: <code>0.9.2342.19200300.100.1.48</code></a> <p><a name="1201715">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1171367"> </a><a name="businessCategory"><b>businessCategory</b> </a></p> @@ -371,7 +371,7 @@ <a name="1267233"> OID: <code>2.5.4.15</code></a> <p><a name="1208474">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> [...3080 lines suppressed...] </a><a name="supportedExtension"><b>supportedExtension</b> </a></p> @@ -5622,7 +5622,7 @@ OID: <code>1.3.6.1.4.1.1466.101.120.7</code></a></p> <p><a name="1243167"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1243238"> </a><a name="supportedLDAPVersion"><b>supportedLDAPVersion</b> </a></p> @@ -5632,7 +5632,7 @@ OID: <code>1.3.6.1.4.1.1466.101.120.15</code></a></p> <p><a name="1243243"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1243260">int</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1243260">int</a></p> <p><a name="1243217"> </a><a name="supportedSASLMechanisms"><b>supportedSASLMechanisms</b> </a></p> @@ -5642,7 +5642,7 @@ OID: <code>1.3.6.1.4.1.1466.101.120.14</code></a></p> <p><a name="1243222"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1094954"> </a><a name="targetDn"><b>targetDn</b> </a></p> @@ -5659,7 +5659,7 @@ <a name="1257807"> OID: <code>2.16.840.1.113730.3.1.6</code></a> <p><a name="1094942">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1100403">dn</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1100403">dn</a></p> <p><a name="1230129"> </a><a name="telephoneNumber"><b>telephoneNumber</b> </a></p> @@ -5673,7 +5673,7 @@ <a name="1267615"> OID: <code>2.5.4.20</code></a> <p><a name="1230133">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004703">tel</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004703">tel</a></p> <p><a name="1205004"> </a><a name="teletexTerminalIdentifier"><b>teletexTerminalIdentifier</b> </a></p> @@ -5692,7 +5692,7 @@ <p><a name="1267635">OID: <code>2.5.4.22</code></a></p> <p><a name="1205117"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1205120"> </a><a name="telexNumber"><b>telexNumber</b> </a></p> @@ -5712,7 +5712,7 @@ <p><a name="1267618">OID: <code>2.5.4.21</code></a></p> <p><a name="1202779"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1202782"> </a><a name="textEncodedORAddress"><b>textEncodedORAddress</b> </a></p> @@ -5727,7 +5727,7 @@ <a name="1266245"> OID: <code>0.9.2342.19200300.100.1.2</code></a> <p><a name="1266267">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1266248"> </a><a name="title"><b>title</b> </a></p> @@ -5741,7 +5741,7 @@ <a name="1267172"> OID: <code>2.5.4.12</code></a> <p><a name="1230156">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1202798"> </a><a name="ttl"><b>ttl</b> </a></p> @@ -5767,7 +5767,7 @@ <p><a name="1278376">OID: <code>1.3.6.1.4.1.250.1.60</code></a></p> <p><a name="1219607"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1296804"> </a><a name="uid"><b>uid</b> </a></p> @@ -5790,7 +5790,7 @@ <p><a name="1296810">OID: <code>0.9.2342.19200300.100.1.1</code></a></p> <p><a name="1296812"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1202809"> </a><a name="uniqueIdentifier"><b>uniqueIdentifier</b> </a></p> @@ -5807,7 +5807,7 @@ <a name="1266101"> OID: <code>0.9.2342.19200300.100.1.44</code></a> <p><a name="1202812">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1172624"> </a><a name="uniqueMember"><b>uniqueMember</b> </a></p> @@ -5819,7 +5819,7 @@ OID: <code>2.5.4.50</code></a></p> <p><a name="1172627"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1100403">dn</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1100403">dn</a></p> <p><a name="1202817"> </a><a name="updatedByDocument"><b>updatedByDocument</b> </a></p> @@ -5828,7 +5828,7 @@ version of the document entry.</a></p> <p><a name="1202821"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1100403">dn</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1100403">dn</a></p> <p><a name="1202824"> </a><a name="updatesDocument"><b>updatesDocument</b> </a></p> @@ -5837,7 +5837,7 @@ is an updated version. </a></p> <p><a name="1202825"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1100403">dn</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1100403">dn</a></p> <p><a name="1208938"> </a><a name="userCertificate"><b>userCertificate</b> </a></p> @@ -5846,7 +5846,7 @@ recommended; use userCertificate;binary instead.</a></p> <p><a name="1278422"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">bin</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">bin</a></p> <p><a name="1278425"> </a><a name="userCertificate;binary"><b>userCertificate;binary</b> </a></p> @@ -5860,7 +5860,7 @@ <a name="1286463"> OID: <code>2.5.4.36</code></a> <p><a name="1278404">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">bin</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">bin</a></p> <p><a name="1202840"> </a><a name="userClass"><b>userClass</b> </a></p> @@ -5877,7 +5877,7 @@ <a name="1264494"> OID: <code>0.9.2342.19200300.100.1.8</code></a> <p><a name="1202844">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004702">cis</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004702">cis</a></p> <p><a name="1196547"> </a><a name="userPassword"><b>userPassword</b> </a></p> @@ -5899,7 +5899,7 @@ <a name="1268004"> OID: <code>2.5.4.35</code></a> <p><a name="1196553">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">bin</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">bin</a></p> <p><a name="1103595"> </a><a name="userSMIMECertificate;binary"><b>userSMIMECertificate;binary</b> </a></p> @@ -5913,7 +5913,7 @@ <a name="1258002"> OID: <code>2.16.840.1.113730.3.1.40</code></a> <p><a name="1235505">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">bin</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">bin</a></p> <p><a name="1281763"> </a><a name="x121Address"><b>x121Address</b> </a></p> @@ -5923,7 +5923,7 @@ OID: <code>2.5.4.24</code></a></p> <p><a name="1292793"> Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004701">ces</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004701">ces</a></p> <p><a name="1292796"> </a><a name="x500UniqueIdentifier"><b>x500UniqueIdentifier</b> </a></p> @@ -5937,7 +5937,7 @@ <a name="1268137"> OID: <code>2.5.4.45</code></a> <p><a name="1235529">Syntax: </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1004700">bin</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1004700">bin</a></p> <p><a name="1296833"> </a></p> <p></p> Index: mod.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/mod.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod.htm 6 Mar 2008 22:00:38 -0000 1.2 +++ mod.htm 11 Jun 2008 22:03:52 -0000 1.3 @@ -45,12 +45,12 @@ You can modify existing entries in the directory using the Directory Server interface. Modify an entry by <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm">searching + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm">searching for the entry</a>, <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">viewing + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">viewing it</a>, and then clicking the edit button. <p>If you have not <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticated</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticated</a> before you attempt to edit an entry, or if your authentication has expired, the @@ -60,21 +60,21 @@ </p> <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#people">people</a></li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#people">people</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#ntpeople">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#ntpeople">NT people</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#groups">groups</a></li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#groups">groups</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#NTgroups">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#NTgroups">NT groups</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#o">organizations</a></li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#o">organizations</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#dc">domains</a></li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#dc">domains</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#ou">organizational + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#ou">organizational units</a></li> </ul> <h2> @@ -82,20 +82,20 @@ To edit a person's entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit Person button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the person's entry, type the value you desire for each field. You must supply values for the required fields. The required @@ -103,10 +103,10 @@ for a person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#commonName">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#commonName">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last Name</a></li> </ul> <li>You can provide values for the optional fields now, or edit them @@ -118,80 +118,80 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#givenName">First + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First Name</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mail">Email + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userid">User + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userid">User IDÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#pager">PagerÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">PagerÂ </a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mobile">Mobile + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#title">TitleÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">TitleÂ </a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational Unit</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#roomNumber">Room + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room NumberÂ </a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#departmentNumber">Dept#Â </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#Â </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#carLicnese">Car + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car License#Â </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing AddressÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See AlsoÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#labeledURI">URLÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URLÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userPassword">Password</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Password</a>Â </td> </tr> </tbody> </table> </center> <p> </p> <li>You may <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addmanager">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addmanager">add values to the Manager and Admin fields</a> by clicking the corresponding Edit button.</li> <li>You may <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add values to the See Also field</a> by clicking the corresponding Edit button.</li> <li>When you are done editing the fields, click Save Changes.</li> @@ -199,13 +199,13 @@ From this window you can also: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#rename">Rename + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#rename">Rename an entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#delete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#delete">Delete an entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#changepw">Change + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#changepw">Change a password</a></li> </ul> <h3><a name="addmanager"></a>Adding Values to the Manager and Admin @@ -245,7 +245,7 @@ residing in your directory.</li> <li>Any <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#filter">LDAP + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#filter">LDAP search filter</a>. Any string that contains an equal sign (=) is considered to be a search filter.</li> </ul> @@ -265,20 +265,20 @@ To edit an NT person's entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit NT Person button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the person's entry, type in the new value for each field. You must supply values for the required fields. The required @@ -286,13 +286,13 @@ for an NT person are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#commonName">Full + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#commonName">Full Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#surname">Last + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#surname">Last Name</a></li> <li><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#uid">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uid">NT User ID</a></li> </ul> <li>You can provide values for the optional fields now, or add them @@ -304,69 +304,69 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#givenName">First + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#givenName">First Name</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">PhoneÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mail">Email + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mail">Email Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">FaxÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">FaxÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userPassword">Directory + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userPassword">Directory Server Password</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#pager">Pager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#pager">Pager</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#mobile">Mobile + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#mobile">Mobile Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#title">Title</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#title">Title</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Organizational Unit</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#manager">Manager</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#roomNumber">Room + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#roomNumber">Room Number</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#secretary">AdminÂ </a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#departmentNumber">Dept#</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#employeeNumber">Emp#</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#carLicnese">Car + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#carLicnese">Car License#</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#labeledURI">URL</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#labeledURI">URL</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#userid">User + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#userid">User Id</a>Â </td> </tr> </tbody> @@ -374,14 +374,14 @@ </center> <p> </p> <li>You can also change the value for the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#ntUserDeleteAccount">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ntUserDeleteAccount">Delete NT Account if Person deleted</a> option.</li> <li>To <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addmanager">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addmanager">add values to the Manager and Admin fields</a>, click the corresponding Edit button.</li> <li>To <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add values to the See Also field</a>, click the corresponding Edit button.</li> <li>When you are done editing the fields, click Save Changes.</li> @@ -389,37 +389,37 @@ From this window you can also: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#rename">Rename + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#rename">Rename the entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#delete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#delete">Delete an entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#changepw">Change + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#changepw">Change the password</a></li> </ul> <h2><a name="groups"></a>Editing Groups</h2> To edit a group entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit Group button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the group's entry, type the new value for each field. You must supply values for the required field, <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#name">Name</a>. + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#name">Name</a>. </li> <li>You can provide values for the optional fields now, or edit them later. @@ -430,16 +430,16 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#member">Group + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#member">Group Members</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> </tr> </tbody> @@ -447,7 +447,7 @@ </center> <p> </p> <li>To <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add values to the See Also, Owners, and Group Members fields</a> click the corresponding Edit button.</li> <li>When you are done editing the fields, click Save Changes.</li> @@ -455,10 +455,10 @@ From this window you can also: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#rename">Rename + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#rename">Rename the entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#delete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#delete">Delete an entry</a></li> </ul> <h3><a name="addowner"></a>Adding Values to the Owner, See Also, and @@ -508,7 +508,7 @@ residing in your directory.</li> <li>Any <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#filter">LDAP + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#filter">LDAP search filter</a>. Any string that contains an equal sign (=) is considered to be a search filter.</li> </ul> @@ -528,20 +528,20 @@ To edit an NT group entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit NT Group button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the group's entry, type in the value for each field. You must supply values for the required fields. The required @@ -549,9 +549,9 @@ for an NT group are:</li> <ul type="disc"> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#cn">Name</a></li> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#cn">Name</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#ntGroupId">NT + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ntGroupId">NT Group Name</a></li> </ul> <li>You can provide values for the optional fields now, or add them @@ -563,26 +563,26 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#owner">Owner</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#uniqueMember">Group + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#uniqueMember">Group Members</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> </tr> </tbody> </table> </center> Â  <li>You can also change the value for the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#ntGroupDeleteGroup">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#ntGroupDeleteGroup">Delete NT Group if Group Deleted</a> option.</li> <li>You can <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#addowner">add + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#addowner">add values to the See Also, Owners, and Group Members fields</a> by clicking the corresponding "Edit" button.</li> <li>When you are done editing, click Save Changes.</li> @@ -590,10 +590,10 @@ From this window you can also: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#rename">Rename + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#rename">Rename an entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#delete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#delete">Delete an entry</a></li> </ul> <h2> @@ -601,26 +601,26 @@ To edit an organizational unit, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit Organizational Unit button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the organizational unit's entry, type in the value for each field. You must supply values for the required fields.</li> <li>The required field for an organizational unit is <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#organizationalUnitName">Unit + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationalUnitName">Unit Name</a>.</li> <li>You can provide values for the optional fields now, or add them later. @@ -631,25 +631,25 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a>Â </td> <td>Â </td> <td>Â </td> @@ -663,10 +663,10 @@ From this window you can also: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#rename">Rename + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#rename">Rename an entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#delete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#delete">Delete an entry</a></li> </ul> <h2> @@ -674,26 +674,26 @@ To edit a domain, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit Domaincomponent button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the domain's entry, type in the value for each field. You must supply values for the required fields.</li> <li>The required field for a domain is <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#name">Domaincomponent + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#name">Domaincomponent Name</a>.</li> <li>You can provide values for the optional fields now, or add them later. @@ -704,25 +704,25 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#localityName">Location</a></td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#localityName">Location</a></td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a></td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a></td> <td> </td> <td> </td> @@ -736,10 +736,10 @@ From this window you can also: <ul> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#rename">Rename + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#rename">Rename an entry</a></li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/mod.htm#delete">Delete + href="/clients/dsgw/bin/lang?&file=.MANUAL/mod.htm#delete">Delete an entry</a></li> </ul> <h2> @@ -747,26 +747,26 @@ To edit an organization entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit Organization button.</li> <li>If you have not authenticated before you attempt to edit an entry, or if your authentication has expired, the Directory Server prompts you to <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/auth.htm#userauth">authenticate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/auth.htm#userauth">authenticate</a> before continuing.</li> <li>To edit the organizational unit's entry, type in the value for each field. You must supply values for the required fields.</li> <li>The required fields for an organization is <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#organizationName">Organization + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#organizationName">Organization Name</a>.</li> <li>You may provide values for the optional fields now, or edit them later. @@ -777,25 +777,25 @@ <tbody> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#description">Description</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#description">Description</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#telephoneNumber">Phone</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#businessCategory">Business + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#businessCategory">Business Category</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#fax">Fax</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#l">Location</a>Â </td> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#l">Location</a>Â </td> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#postalAddress">Mailing + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#postalAddress">Mailing Address</a>Â </td> </tr> <tr> <td><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#seeAlso">See + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#seeAlso">See Also</a>Â </td> <td>Â </td> <td>Â </td> @@ -809,13 +809,13 @@ To rename an entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit button.</li> <li>Enter the new common name for the entry.</li> @@ -824,7 +824,7 @@ Note the following rules about renaming an entry: <ul> <li>You can change only the left-most value in an entry's <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/add.htm#DN">distinguished + href="/clients/dsgw/bin/lang?&file=.MANUAL/add.htm#DN">distinguished name</a>. This effectively means you can only change the entry's name; you cannot move the entry to another branch in the directory through this @@ -848,13 +848,13 @@ To delete an entry, do the following: <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit button.</li> <li>Click the Delete button.</li> @@ -877,13 +877,13 @@ </p> <ol> <li>Search for the entry using the <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#standard">Standard + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#standard">Standard Search</a> or <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#advanced">Advanced + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#advanced">Advanced Search</a> mechanism.</li> <li> <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/search.htm#results">View + href="/clients/dsgw/bin/lang?&file=.MANUAL/search.htm#results">View the entry</a>.</li> <li>Click the Edit button.</li> <li>Click the Change Password button.</li> View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 objclass.htm Index: objclass.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/objclass.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- objclass.htm 6 Mar 2008 22:00:38 -0000 1.3 +++ objclass.htm 11 Jun 2008 22:03:52 -0000 1.4 @@ -60,7 +60,7 @@ used for, refer to the <i>Directory Server Deployment Guide</i>.</a></p> <p><a name="1080543"> For information on the attributes in the schema, see </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1002619">Appendix + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1002619">Appendix B, "Attributes."</a></p> <p><a name="1080587"> The following types of object classes are described here:</a></p> @@ -69,72 +69,72 @@ <a name="1080589"><li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1005608">Groups</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005608">Groups</a> <p><a name="1080591"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1005780">Replication</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005780">Replication</a></p> <p><a name="1011931"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1005591">Locations</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005591">Locations</a></p> <p><a name="1002658"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1004915">Organizations</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1004915">Organizations</a></p> <p><a name="1002659"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1004958">People</a></p> + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1004958">People</a></p> <p><a name="1021627"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1078660">Calendar + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078660">Calendar Server Extensions</a></p> <p><a name="1085862"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1078479">Certificate + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078479">Certificate Server Extensions</a></p> <p><a name="1085922"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1078576">Collabra + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078576">Collabra Server Extensions</a></p> <p><a name="1085927"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1078655">Compass + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1078655">Compass Server Extensions</a></p> <p><a name="1085932"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1097229">Directory + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1097229">Directory Server Extensions</a></p> <p><a name="1085945"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1097091">Media + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1097091">Media Server Extensions</a></p> <p><a name="1100342"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1097135">Messaging + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1097135">Messaging Server Extensions</a></p> <p><a name="1085950"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1086191">Proxy + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1086191">Proxy Server Extensions</a></p> <p><a name="1085955"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1081607">Web + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1081607">Web Server Extensions</a></p> <p><a name="1089730"> <li><br> </li> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1108799">Reserved + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1108799">Reserved Object Classes</a></p> <p></p> </ul> @@ -164,11 +164,11 @@ reference is made to the group. Each object class contains attributes that describe the group and its members. The object classes described here are </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1080708">groupOfNames</a>, + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1080708">groupOfNames</a>, <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1005294">groupOfUniqueNames</a>, + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1005294">groupOfUniqueNames</a>, and <a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/objclass.htm#1100399">NTGroup</a>. + href="/clients/dsgw/bin/lang?&file=.MANUAL/objclass.htm#1100399">NTGroup</a>. <p><a name="1080708">Â  </a><a name="groupOfNames"> <h3> groupOfNames</h3> @@ -192,7 +192,7 @@ </tr> <tr> <td><a name="1069038"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171494">cn</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171494">cn</a> <p></p> </td> <td><a name="1069041">(Required) The group's common name.</a> @@ -201,7 +201,7 @@ </tr> <tr> <td><a name="1069044"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171811">member</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171811">member</a> <p></p> </td> <td><a name="1069047">(Required) A group member in distinguished @@ -211,7 +211,7 @@ </tr> <tr> <td><a name="1069050"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171367">businessCategory</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171367">businessCategory</a> <p></p> </td> <td><a name="1069052">Type of business in which the group is @@ -221,7 +221,7 @@ </tr> <tr> <td><a name="1069055"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171528">description</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171528">description</a> <p></p> </td> <td><a name="1069057">Text description of the group's purpose.</a> @@ -230,7 +230,7 @@ </tr> <tr> <td><a name="1104361"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1246271">memberURL</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1246271">memberURL</a> <p></p> </td> <td><a name="1104363">URL to information relevant to a group @@ -240,7 +240,7 @@ </tr> <tr> <td><a name="1069060"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1281611">o</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1281611">o</a> <p></p> </td> <td><a name="1069062">Organization to which the group belongs.</a> @@ -249,7 +249,7 @@ </tr> <tr> <td><a name="1104337"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1241174">ou</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1241174">ou</a> <p></p> </td> <td><a name="1069067">Organizational unit to which the group @@ -259,7 +259,7 @@ </tr> <tr> <td><a name="1104340"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1005719">owner</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1005719">owner</a> <p></p> </td> <td><a name="1069072">The group's owner.</a> @@ -268,7 +268,7 @@ </tr> <tr> <td><a name="1069075"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1172500">seeAlso</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1172500">seeAlso</a> <p></p> </td> [...5906 lines suppressed...] </td> <td><a name="1093498">Preferred method of contact or delivery of @@ -8583,7 +8583,7 @@ </tr> <tr> <td><a name="1104185"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1202644">registeredAddress</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1202644">registeredAddress</a> <p></p> </td> <td><a name="1106134">Postal address suitable for reception of @@ -8594,7 +8594,7 @@ </tr> <tr> <td><a name="1104190"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1202682">searchGuide</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1202682">searchGuide</a> <p></p> </td> <td><a name="1093532">Specifies information for suggested search @@ -8605,7 +8605,7 @@ </tr> <tr> <td><a name="1104195"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1172500">seeAlso</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1172500">seeAlso</a> <p></p> </td> <td><a name="1093544">URL to information relevant to the entry.</a> @@ -8614,7 +8614,7 @@ </tr> <tr> <td><a name="1104200"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1203417">st</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1203417">st</a> <p></p> </td> <td><a name="1093488">State or province in which the entry @@ -8624,7 +8624,7 @@ </tr> <tr> <td><a name="1104205"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1202721">street</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1202721">street</a> <p></p> </td> <td><a name="1093483">Street address at which the entry is @@ -8634,7 +8634,7 @@ </tr> <tr> <td><a name="1104210"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1230129">telephoneNumber</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1230129">telephoneNumber</a> <p></p> </td> <td><a name="1093557">Telephone number associated with the entry.</a> @@ -8643,7 +8643,7 @@ </tr> <tr> <td><a name="1104215"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1205004">teletexTerminalIdentifier</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1205004">teletexTerminalIdentifier</a> <p></p> </td> <td><a name="1093478">Identifier for the teletex terminal of the @@ -8653,7 +8653,7 @@ </tr> <tr> <td><a name="1104220"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1205120">telexNumber</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1205120">telexNumber</a> <p></p> </td> <td><a name="1093473">Telex number of the entry.</a> @@ -8662,7 +8662,7 @@ </tr> <tr> <td><a name="1104225"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1196547">userPassword</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1196547">userPassword</a> <p></p> </td> <td><a name="1093572">The entry's password and encryption method.</a> @@ -8671,7 +8671,7 @@ </tr> <tr> <td><a name="1104230"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1281763">x121Address</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1281763">x121Address</a> <p></p> </td> <td><a name="1093468">X.121 address of the entry.</a> @@ -8713,7 +8713,7 @@ </tr> <tr> <td><a name="1092931"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171494">cn</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171494">cn</a> <p></p> </td> <td><a name="1092934">Common, or given name of the entry.</a> @@ -8722,7 +8722,7 @@ </tr> <tr> <td><a name="1092963"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1290325">sn</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1290325">sn</a> <p></p> </td> <td><a name="1092965">Surname of the entry.</a> @@ -8763,7 +8763,7 @@ </tr> <tr> <td><a name="1092443"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171494">cn</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171494">cn</a> <p></p> </td> <td><a name="1092446">(Required) Common name of the room.</a> @@ -8772,7 +8772,7 @@ </tr> <tr> <td><a name="1092449"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171528">description</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171528">description</a> <p></p> </td> <td><a name="1092451">Text description of the room.</a> @@ -8781,7 +8781,7 @@ </tr> <tr> <td><a name="1092468"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1204477">roomNumber</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1204477">roomNumber</a> <p></p> </td> <td><a name="1092470">The room's number.</a> @@ -8790,7 +8790,7 @@ </tr> <tr> <td><a name="1092477"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1172500">seeAlso</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1172500">seeAlso</a> <p></p> </td> <td><a name="1092479">URL to information relevant to the room.</a> @@ -8799,7 +8799,7 @@ </tr> <tr> <td><a name="1092491"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1230129">telephoneNumber</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1230129">telephoneNumber</a> <p></p> </td> <td><a name="1092493">The room's telephone number.</a> @@ -8841,7 +8841,7 @@ </tr> <tr> <td><a name="1093113"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1196547">userPassword</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1196547">userPassword</a> <p></p> </td> <td><a name="1093116">(Required) The entry's password and @@ -8884,7 +8884,7 @@ </tr> <tr> <td><a name="1106468"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1208938">userCertificate</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1208938">userCertificate</a> <p></p> </td> <td><a name="1106470">Not used.</a> @@ -8893,7 +8893,7 @@ </tr> <tr> <td><a name="1106475"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1278425">userCertificate;binary</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1278425">userCertificate;binary</a> <p></p> </td> <td><a name="1106477">(Required) User's certificate in binary @@ -8935,7 +8935,7 @@ </tr> <tr> <td><a name="1106493"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1229677">objectClass</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1229677">objectClass</a> <p></p> </td> <td><a name="1106495">(Required) Mandatory attribute for all @@ -8945,7 +8945,7 @@ </tr> <tr> <td><a name="1106500"> </a><a - href="/clients/dsgw/bin/lang?%3C%21--%20GCONTEXT%20--%3E&file=.MANUAL/attribut.htm#1171292">aci</a> + href="/clients/dsgw/bin/lang?&file=.MANUAL/attribut.htm#1171292">aci</a> <p></p> </td> <td><a name="1106502">Stores the Directory Server access control

1 0

[Fedora-directory-commits] dsgw/html/manual auth.htm,1.2,1.3
by Doctor Conrad 11 Jun '08

11 Jun '08

Author: rmeggins Update of /cvs/dirsec/dsgw/html/manual In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20906 Modified Files: auth.htm Log Message: Resolves: bug 450588 Description: DSGW Help Page Needs To Reflect the Default Access Permission Fix Description: Improved the wording to make it more clear. Index: auth.htm =================================================================== RCS file: /cvs/dirsec/dsgw/html/manual/auth.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- auth.htm 6 Mar 2008 22:00:38 -0000 1.2 +++ auth.htm 11 Jun 2008 21:19:47 -0000 1.3 @@ -56,7 +56,8 @@ so that permission is not required for some procedures.</p> <p>By default, access to the directory is denied to all users -with the exception of the directory administrator. The +with the exception of the directory administrator. However, most sites +allow anonymous search access and self update access. The directory administrator defines the permissions that grant or remove access to the directory. Because permissions are determined on a site by site basis, you need to check with your

1 0

[Fedora-directory-commits] dsgw htmlout.c,1.6,1.7
by Doctor Conrad 11 Jun '08

11 Jun '08

Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681/dsgw Modified Files: htmlout.c Log Message: Resolves: bug 450134 Bug Description: No text in advance search box does not produce error messages Reviewed by: nhosoi (Thanks!) Fix Description: The old DSGW used to support GET and POST at the same time. This does not work anymore since moving to use adminutil. The solution is to use POST style form arguments with post actions - so lang?file=alert.html becomes <input name=file value=alert.html> inside of a FORM POST. Platforms tested: RHEL5 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: htmlout.c =================================================================== RCS file: /cvs/dirsec/dsgw/htmlout.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htmlout.c 20 Mar 2008 02:18:39 -0000 1.6 +++ htmlout.c 11 Jun 2008 21:12:31 -0000 1.7 @@ -419,7 +419,8 @@ dsgw_emit_alertForm () { dsgw_form_begin ("alertForm", "action=\"%s\" target=alertWindow", - DSGW_URLPREFIX_MAIN_HTTP "alert.html"); + DSGW_CGINAME_LANG); + dsgw_emits ("<INPUT TYPE=hidden NAME=file VALUE=\"alert.html\">"); dsgw_emitf ("<INPUT TYPE=hidden NAME=TITLE VALUE=\"%s\">", XP_GetClientStr(DBT_alertTitle_)); dsgw_emits ("<INPUT TYPE=hidden NAME=MSG VALUE=\"\">" "</FORM>\n"); @@ -429,7 +430,8 @@ dsgw_emit_confirmForm () { dsgw_form_begin ("confirmForm", "action=\"%s\" target=confirmWindow", - DSGW_URLPREFIX_MAIN_HTTP "confirm.html"); + DSGW_CGINAME_LANG); + dsgw_emits ("<INPUT TYPE=hidden NAME=file VALUE=\"confirm.html\">"); dsgw_emitf ("<INPUT TYPE=hidden NAME=TITLE VALUE=\"%s\">", XP_GetClientStr(DBT_confirmTitle_)); dsgw_emits ("<INPUT TYPE=hidden NAME=MSG VALUE=\"\">" "<INPUT TYPE=hidden NAME=YES VALUE=\"\">"

1 0

[Fedora-directory-commits] dsmlgw/scripts dsml2ldif.in, 1.2, 1.3 dsmlgw-search.in, 1.3, 1.4 ldif2dsml.in, 1.2, 1.3
by Doctor Conrad 11 Jun '08

11 Jun '08

Author: rmeggins Update of /cvs/dirsec/dsmlgw/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20508/dsmlgw/scripts Modified Files: dsml2ldif.in dsmlgw-search.in ldif2dsml.in Log Message: Resolves: bug 449178 Bug Description: Hard-coded java path limitting the installation flexibility Reviewed by: nhosoi (Thanks!) Fix Description: Allow the user to specify JAVA_HOME to override the default javahome location. Platforms tested: RHEL5 Flag Day: no Doc impact: no Index: dsml2ldif.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsml2ldif.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsml2ldif.in 30 Apr 2008 20:49:22 -0000 1.2 +++ dsml2ldif.in 11 Jun 2008 21:06:58 -0000 1.3 @@ -25,7 +25,7 @@ # END COPYRIGHT BLOCK # -CP=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar +CP="@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar" # it seems that most java 1.5 and later JREs already have a built-in sax implementation # if you need to specify another one, just specify the SAXJARS env var # SAXJARS=/path/to/xml-parser.jar dsml2ldif file.dsml @@ -33,4 +33,8 @@ CP=${CP}:$SAXJARS fi -@runtime_javahome@/bin/java -cp "$CP" com.netscape.xmltools.DSML2LDIF "$@" +DEFAULT_JAVAHOME="@runtime_javahome@" + +JAVA_HOME="${JAVA_HOME:-$DEFAULT_JAVAHOME}" + +"$JAVA_HOME/bin/java" -cp "$CP" com.netscape.xmltools.DSML2LDIF "$@" Index: dsmlgw-search.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/dsmlgw-search.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dsmlgw-search.in 30 Apr 2008 20:49:22 -0000 1.3 +++ dsmlgw-search.in 11 Jun 2008 21:06:58 -0000 1.4 @@ -99,6 +99,10 @@ fi done -@runtime_javahome@/bin/java -cp "$AXISCP" com.netscape.dsml.test.dsmlSearch http://$hostname:$port/axis/services/dsmlgw $tmpdsml +DEFAULT_JAVAHOME="@runtime_javahome@" + +JAVA_HOME="${JAVA_HOME:-$DEFAULT_JAVAHOME}" + +"$JAVA_HOME/bin/java" -cp "$AXISCP" com.netscape.dsml.test.dsmlSearch http://$hostname:$port/axis/services/dsmlgw $tmpdsml rm -f $tmpdsml Index: ldif2dsml.in =================================================================== RCS file: /cvs/dirsec/dsmlgw/scripts/ldif2dsml.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ldif2dsml.in 30 Apr 2008 20:49:22 -0000 1.2 +++ ldif2dsml.in 11 Jun 2008 21:06:58 -0000 1.3 @@ -25,7 +25,7 @@ # END COPYRIGHT BLOCK # -CP=@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar +CP="@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/dsmlgw.jar:@dsmlgwdatadir@/webapps/axis/WEB-INF/lib/ldapjdk.jar" # it seems that most java 1.5 and later JREs already have a built-in sax implementation # if you need to specify another one, just specify the SAXJARS env var # SAXJARS=/path/to/xml-parser.jar dsml2ldif file.dsml @@ -33,4 +33,8 @@ CP=${CP}:$SAXJARS fi -@runtime_javahome@/bin/java -cp "$CP" com.netscape.xmltools.LDIF2DSML "$@" +DEFAULT_JAVAHOME="@runtime_javahome@" + +JAVA_HOME="${JAVA_HOME:-$DEFAULT_JAVAHOME}" + +"$JAVA_HOME/bin/java" -cp "$CP" com.netscape.xmltools.LDIF2DSML "$@"

1 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.68, 1.69 Makefile.in, 1.88, 1.89 aclocal.m4, 1.67, 1.68 config.guess, 1.49, 1.50 config.h.in, 1.16, 1.17 config.sub, 1.49, 1.50 configure, 1.84, 1.85 depcomp, 1.50, 1.51 install-sh, 1.50, 1.51 ltmain.sh, 1.25, 1.26 missing, 1.50, 1.51
by Doctor Conrad 10 Jun '08

10 Jun '08

Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7596 Modified Files: Makefile.am Makefile.in aclocal.m4 config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing Log Message: Resolves: 450746 Summary: Added CLI for creating memberOf fix-up task entry. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- Makefile.am 4 Jun 2008 22:22:57 -0000 1.68 +++ Makefile.am 10 Jun 2008 20:24:01 -0000 1.69 @@ -236,6 +236,7 @@ ldap/admin/src/scripts/template-db2bak.pl \ ldap/admin/src/scripts/template-db2index.pl \ ldap/admin/src/scripts/template-db2ldif.pl \ + ldap/admin/src/scripts/template-fixup-memberof.pl \ ldap/admin/src/scripts/template-ldif2db.pl \ ldap/admin/src/scripts/template-ns-accountstatus.pl \ ldap/admin/src/scripts/template-ns-activate.pl \ View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.88 -r 1.89 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- Makefile.in 4 Jun 2008 22:22:57 -0000 1.88 +++ Makefile.in 10 Jun 2008 20:24:01 -0000 1.89 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,15 +18,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,11 +43,11 @@ pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT) noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c +subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure compile config.guess config.sub \ depcomp install-sh ltmain.sh missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ $(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/mozldap.m4 \ @@ -61,7 +57,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -126,6 +122,9 @@ ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo libattr_unique_plugin_la_OBJECTS = \ $(am_libattr_unique_plugin_la_OBJECTS) +libattr_unique_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libattr_unique_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libback_ldbm_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) am_libback_ldbm_la_OBJECTS = \ ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo \ @@ -188,10 +187,16 @@ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_key.lo \ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_srch.lo libback_ldbm_la_OBJECTS = $(am_libback_ldbm_la_OBJECTS) +libback_ldbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libback_ldbm_la_LDFLAGS) $(LDFLAGS) -o $@ libbitwise_plugin_la_LIBADD = am_libbitwise_plugin_la_OBJECTS = \ ldap/servers/plugins/bitwise/libbitwise_plugin_la-bitwise.lo libbitwise_plugin_la_OBJECTS = $(am_libbitwise_plugin_la_OBJECTS) +libbitwise_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libbitwise_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @enable_bitwise_TRUE@am_libbitwise_plugin_la_rpath = -rpath \ @enable_bitwise_TRUE@ $(serverplugindir) libchainingdb_plugin_la_LIBADD = @@ -222,6 +227,9 @@ ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_utils.lo libchainingdb_plugin_la_OBJECTS = \ $(am_libchainingdb_plugin_la_OBJECTS) +libchainingdb_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libchainingdb_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libcollation_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libcollation_plugin_la_OBJECTS = ldap/servers/plugins/collation/libcollation_plugin_la-collate.lo \ @@ -233,28 +241,46 @@ ldap/servers/plugins/cos/libcos_plugin_la-cos.lo \ ldap/servers/plugins/cos/libcos_plugin_la-cos_cache.lo libcos_plugin_la_OBJECTS = $(am_libcos_plugin_la_OBJECTS) +libcos_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libcos_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdes_plugin_la_LIBADD = am_libdes_plugin_la_OBJECTS = \ ldap/servers/plugins/rever/libdes_plugin_la-des.lo \ ldap/servers/plugins/rever/libdes_plugin_la-rever.lo libdes_plugin_la_OBJECTS = $(am_libdes_plugin_la_OBJECTS) +libdes_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libdes_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdistrib_plugin_la_LIBADD = am_libdistrib_plugin_la_OBJECTS = \ ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo libdistrib_plugin_la_OBJECTS = $(am_libdistrib_plugin_la_OBJECTS) +libdistrib_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libdistrib_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdna_plugin_la_LIBADD = am_libdna_plugin_la_OBJECTS = \ ldap/servers/plugins/dna/libdna_plugin_la-dna.lo libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS) +libdna_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libdna_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @enable_dna_TRUE@am_libdna_plugin_la_rpath = -rpath $(serverplugindir) libhttp_client_plugin_la_LIBADD = am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \ ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo libhttp_client_plugin_la_OBJECTS = \ $(am_libhttp_client_plugin_la_OBJECTS) +libhttp_client_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libhttp_client_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libmemberof_plugin_la_LIBADD = am_libmemberof_plugin_la_OBJECTS = ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo libmemberof_plugin_la_OBJECTS = $(am_libmemberof_plugin_la_OBJECTS) +libmemberof_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libmemberof_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libns_dshttpd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -326,6 +352,10 @@ ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptpreop.lo libpam_passthru_plugin_la_OBJECTS = \ $(am_libpam_passthru_plugin_la_OBJECTS) +libpam_passthru_plugin_la_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libpam_passthru_plugin_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @enable_pam_passthru_TRUE@am_libpam_passthru_plugin_la_rpath = -rpath \ @enable_pam_passthru_TRUE@ $(serverplugindir) libpassthru_plugin_la_LIBADD = @@ -337,9 +367,15 @@ ldap/servers/plugins/passthru/libpassthru_plugin_la-ptpreop.lo \ ldap/servers/plugins/passthru/libpassthru_plugin_la-ptutil.lo libpassthru_plugin_la_OBJECTS = $(am_libpassthru_plugin_la_OBJECTS) +libpassthru_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpassthru_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libpresence_plugin_la_LIBADD = am_libpresence_plugin_la_OBJECTS = ldap/servers/plugins/presence/libpresence_plugin_la-presence.lo libpresence_plugin_la_OBJECTS = $(am_libpresence_plugin_la_OBJECTS) +libpresence_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpresence_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libpwdstorage_plugin_la_LIBADD = am_libpwdstorage_plugin_la_OBJECTS = ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-clear_pwd.lo \ ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-crypt_pwd.lo \ @@ -351,9 +387,15 @@ ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-ssha_pwd.lo libpwdstorage_plugin_la_OBJECTS = \ $(am_libpwdstorage_plugin_la_OBJECTS) +libpwdstorage_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpwdstorage_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libreferint_plugin_la_LIBADD = am_libreferint_plugin_la_OBJECTS = ldap/servers/plugins/referint/libreferint_plugin_la-referint.lo libreferint_plugin_la_OBJECTS = $(am_libreferint_plugin_la_OBJECTS) +libreferint_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libreferint_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplication_plugin_la-cl5_api.lo \ @@ -412,6 +454,9 @@ ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo libreplication_plugin_la_OBJECTS = \ $(am_libreplication_plugin_la_OBJECTS) +libreplication_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libreplication_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libretrocl_plugin_la_LIBADD = am_libretrocl_plugin_la_OBJECTS = \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo \ @@ -421,15 +466,25 @@ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_rootdse.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo libretrocl_plugin_la_OBJECTS = $(am_libretrocl_plugin_la_OBJECTS) +libretrocl_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ [...6010 lines suppressed...] + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -8836,13 +8892,12 @@ CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -8857,24 +8912,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/m4 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -8888,7 +8941,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -8898,6 +8951,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -8924,6 +8981,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -8963,7 +9022,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -8989,7 +9048,7 @@ $(DATA) config.h installdirs: for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -9123,13 +9182,21 @@ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-taskSCRIPTS +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-sbinPROGRAMS install-sbinSCRIPTS +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -9153,46 +9220,47 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \ - uninstall-mibDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA \ - uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-sbinSCRIPTS uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS + uninstall-configDATA uninstall-infDATA uninstall-initSCRIPTS \ + uninstall-initconfigSCRIPTS uninstall-mibDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA uninstall-sampledataDATA \ + uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ clean-noinstLIBRARIES clean-noinstPROGRAMS clean-sbinPROGRAMS \ clean-serverLTLIBRARIES clean-serverpluginLTLIBRARIES ctags \ - dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-compile \ + dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-binSCRIPTS install-configDATA \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-infDATA install-info install-info-am \ install-initSCRIPTS install-initconfigSCRIPTS install-man \ - install-mibDATA install-nodist_propertyDATA \ - install-perlSCRIPTS install-propertyDATA \ - install-sampledataDATA install-sbinPROGRAMS \ - install-sbinSCRIPTS install-schemaDATA \ + install-mibDATA install-nodist_propertyDATA install-pdf \ + install-pdf-am install-perlSCRIPTS install-propertyDATA \ + install-ps install-ps-am install-sampledataDATA \ + install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-strip install-taskSCRIPTS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \ - uninstall-mibDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA \ - uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-sbinSCRIPTS uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS + uninstall-configDATA uninstall-infDATA uninstall-initSCRIPTS \ + uninstall-initconfigSCRIPTS uninstall-mibDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA uninstall-sampledataDATA \ + uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS dirver.h: Makefile Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- aclocal.m4 4 Jun 2008 22:22:57 -0000 1.67 +++ aclocal.m4 10 Jun 2008 20:24:01 -0000 1.68 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 51 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -176,7 +184,7 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -263,8 +271,9 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* @@ -276,8 +285,9 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -293,12 +303,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *$.*$$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -529,13 +547,17 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -551,7 +573,11 @@ esac ;; *64-bit*) + libsuff=64 case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -623,7 +649,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -664,11 +690,12 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -782,24 +809,27 @@ fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -1026,7 +1056,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -1034,7 +1065,7 @@ mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1174,6 +1205,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1191,7 +1223,8 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1205,20 +1238,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1375,12 +1446,8 @@ shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1397,18 +1464,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1446,7 +1501,7 @@ shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -1509,7 +1564,7 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[[3-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1564,7 +1619,7 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1577,11 +1632,13 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1593,18 +1650,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -1686,6 +1731,10 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1791,7 +1840,8 @@ # _LT_AC_TAGCONFIG # ---------------- AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_ARG_WITH([tags], [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], [include additional configurations @<:@automatic@:>@])], [tagnames="$withval"]) @@ -2052,7 +2102,7 @@ # AC_PATH_TOOL_PREFIX # ------------------- -# find a file program which can recognise shared library +# find a file program which can recognize shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_MSG_CHECKING([for $1]) @@ -2115,7 +2165,7 @@ # AC_PATH_MAGIC # ------------- -# find a file program which can recognise a shared library +# find a file program which can recognize a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -2262,7 +2312,7 @@ # how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependent libraries], +[AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -2301,16 +2351,22 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -2348,7 +2404,7 @@ esac ;; -interix3*) +interix[[3-9]]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ;; @@ -2364,7 +2420,7 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -2398,6 +2454,10 @@ lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -2450,7 +2510,7 @@ lt_cv_path_NM="$NM" else lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do @@ -2666,10 +2726,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' _LT_AC_SYS_COMPILER @@ -2771,10 +2831,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2920,7 +2980,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -3079,10 +3139,10 @@ case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -3116,7 +3176,7 @@ freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3165,9 +3225,7 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; @@ -3235,7 +3293,7 @@ ;; esac ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -3275,7 +3333,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -3355,6 +3413,29 @@ # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -3393,16 +3474,20 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -3564,15 +3649,10 @@ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -3619,6 +3699,12 @@ fi _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -3862,7 +3948,7 @@ # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in -interix3*) +interix[[3-9]]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. _LT_AC_TAGVAR(predep_objects,$1)= @@ -3870,13 +3956,46 @@ _LT_AC_TAGVAR(postdeps,$1)= ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -3925,10 +4044,17 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4007,10 +4133,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4063,7 +4189,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -4152,6 +4278,7 @@ _LT_AC_TAGVAR(module_cmds, $1) \ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ _LT_AC_TAGVAR(exclude_expsyms, $1) \ _LT_AC_TAGVAR(include_expsyms, $1); do @@ -4198,7 +4325,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4523,7 +4650,7 @@ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) @@ -4606,6 +4733,7 @@ # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([LT_AC_PROG_SED]) AC_REQUIRE([AC_PROG_NM]) AC_REQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -4642,7 +4770,7 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[[ABCDGIRSTW]]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'" @@ -4832,12 +4960,14 @@ # like `-m68040'. _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -4849,7 +4979,7 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -4915,7 +5045,7 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4958,7 +5088,7 @@ ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4985,6 +5115,14 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac ;; esac ;; @@ -5105,13 +5243,15 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; @@ -5121,7 +5261,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -5179,7 +5319,7 @@ esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' @@ -5212,7 +5352,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -5231,6 +5371,22 @@ # All Alpha code is PIC. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; esac ;; @@ -5240,6 +5396,10 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + rdos*) + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + solaris*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5334,7 +5494,8 @@ # ------------------------------------ # See if the linker supports building shared libraries. AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -5351,7 +5512,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[[^ ]]*$ [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -5490,7 +5651,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -5508,7 +5669,7 @@ fi ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -5523,7 +5684,7 @@ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -5541,13 +5702,22 @@ ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi else _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5587,7 +5757,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -5706,7 +5876,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5799,7 +5969,7 @@ # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; @@ -5841,10 +6011,10 @@ case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -5884,7 +6054,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -6006,24 +6176,28 @@ ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -6082,17 +6256,16 @@ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6149,7 +6322,7 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6224,7 +6397,7 @@ # to ld, don't add -lc before -lgcc. AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest @@ -6327,6 +6500,30 @@ [AC_CHECK_TOOL(RC, windres, no) ]) + +# Cheap backport of AS_EXECUTABLE_P and required macros +# from Autoconf 2.59; we should not use $as_executable_p directly. + +# _AS_TEST_PREPARE +# ---------------- +m4_ifndef([_AS_TEST_PREPARE], +[m4_defun([_AS_TEST_PREPARE], +[if test -x / >/dev/null 2>&1; then + as_executable_p='test -x' +else + as_executable_p='test -f' +fi +])])# _AS_TEST_PREPARE + +# AS_EXECUTABLE_P +# --------------- +# Check whether a file is executable. +m4_ifndef([AS_EXECUTABLE_P], +[m4_defun([AS_EXECUTABLE_P], +[AS_REQUIRE([_AS_TEST_PREPARE])dnl +$as_executable_p $1[]dnl +])])# AS_EXECUTABLE_P + # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # # a released version of Autoconf we should remove this # @@ -6347,12 +6544,13 @@ test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6385,10 +6583,11 @@ done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6398,14 +6597,31 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6462,14 +6678,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -6478,8 +6694,10 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -6493,15 +6711,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -6529,6 +6746,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -6594,6 +6812,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -6646,7 +6865,8 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -6671,8 +6891,9 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6719,14 +6940,14 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -6743,16 +6964,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -6772,6 +6997,9 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -6807,6 +7035,10 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -6820,16 +7052,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -6842,7 +7075,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -6947,13 +7180,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 5 # AM_PROG_CC_C_O # -------------- @@ -6961,6 +7195,7 @@ AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC @@ -6973,18 +7208,22 @@ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" CC="$am_aux_dir/compile $CC" fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7000,6 +7239,7 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -7010,7 +7250,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7018,60 +7258,23 @@ # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -7183,9 +7386,21 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- config.guess 30 May 2008 15:38:59 -0000 1.49 +++ config.guess 10 Jun 2008 20:24:01 -0000 1.50 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2008-01-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -55,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -160,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,8 +208,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -325,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -527,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -764,12 +769,19 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -779,9 +791,18 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -794,7 +815,7 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -815,6 +836,16 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) @@ -851,7 +882,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,9 +905,16 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -916,9 +958,15 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -961,7 +1009,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -971,7 +1019,11 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1173,6 +1225,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1182,7 +1243,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1261,6 +1321,9 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 Index: config.h.in =================================================================== RCS file: /cvs/dirsec/ldapserver/config.h.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- config.h.in 30 May 2008 15:38:59 -0000 1.16 +++ config.h.in 10 Jun 2008 20:24:02 -0000 1.17 @@ -374,7 +374,7 @@ /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* SunOS5 */ Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- config.sub 30 May 2008 15:38:59 -0000 1.49 +++ config.sub 10 Jun 2008 20:24:02 -0000 1.50 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -71,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -119,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` ;; @@ -171,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,15 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,28 +268,27 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -286,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -305,18 +318,18 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,30 +349,33 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; - m32c-*) + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -431,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -463,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -656,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -671,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -696,6 +732,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -794,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -803,6 +850,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +912,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -885,6 +942,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -896,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -985,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1101,7 +1169,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1242,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1340,6 +1410,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1349,9 +1425,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1377,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.84 -r 1.85 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- configure 4 Jun 2008 22:22:57 -0000 1.84 +++ configure 10 Jun 2008 20:24:02 -0000 1.85 @@ -1,27 +1,56 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dirsrv 1.1.1. +# Generated by GNU Autoconf 2.61 for dirsrv 1.1.1. # # Report bugs to <http://bugzilla.redhat.com/>. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -31,8 +60,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -46,18 +110,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '$a$' >/dev/null 2>&1; then +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -65,157 +130,388 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$$' \| \ - . : '$.$' 2>/dev/null || + X"$0" : 'X$/$' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; } - /^X\/$\/\/$$/{ s//\1/; q; } - /^X\/$\/$.*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/$[^/][^/]*$\/*$/{ + s//\1/ + q + } + /^X\/$\/\/$$/{ + s//\1/ + q + } + /^X\/$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { [...19288 lines suppressed...] - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -26700,20 +27470,32 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ X"$mf" : 'X$//$[^/]' \| \ X"$mf" : 'X$//$$' \| \ - X"$mf" : 'X$/$' \| \ - . : '$.$' 2>/dev/null || + X"$mf" : 'X$/$' \| . 2>/dev/null || echo X"$mf" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X$\/\/$[^/].*/{ s//\1/; q; } - /^X$\/\/$$/{ s//\1/; q; } - /^X$\/$.*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -26735,53 +27517,79 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ X"$file" : 'X$//$[^/]' \| \ X"$file" : 'X$//$$' \| \ - X"$file" : 'X$/$' \| \ - . : '$.$' 2>/dev/null || + X"$file" : 'X$/$' \| . 2>/dev/null || echo X"$file" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X$\/\/$[^/].*/{ s//\1/; q; } - /^X$\/\/$$/{ s//\1/; q; } - /^X$\/$.*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X$//$[^/]' \| \ X"$as_dir" : 'X$//$$' \| \ - X"$as_dir" : 'X$/$' \| \ - . : '$.$' 2>/dev/null || + X"$as_dir" : 'X$/$' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X$\/\/$[^/].*/{ s//\1/; q; } - /^X$\/\/$$/{ s//\1/; q; } - /^X$\/$.*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- depcomp 30 May 2008 15:38:59 -0000 1.50 +++ depcomp 10 Jun 2008 20:24:02 -0000 1.51 @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,7 +92,20 @@ ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" stat=$? if test $stat -eq 0; then : else @@ -201,34 +215,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/$.*$\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: $.*$$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -276,6 +295,46 @@ rm -f "$tmpdepfile" ;; +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -288,13 +347,13 @@ if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to + # static library. This mechanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and + # compilations output dependencies in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- install-sh 30 May 2008 15:38:59 -0000 1.50 +++ install-sh 10 Jun 2008 20:24:02 -0000 1.51 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -39,38 +39,68 @@ # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. + +nl=' +' +IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi -# put in absolute paths if you don't have them in your path; or use env. vars. +# Put in absolute file names if you don't have them in your path; +# or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 -chmodcmd="$chmodprog 0755" -chowncmd= chgrpcmd= -stripcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -80,81 +110,86 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " -while test -n "$1"; do +while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; - -d) dir_arg=true - shift - continue;; + -C) copy_on_change=true;; + + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done + --) shift break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; esac + shift done -if test -z "$1"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + done +fi + +if test $# -eq 0; then if test -z "$dir_arg"; then echo "$0: no input file specified." >&2 exit 1 @@ -164,24 +199,47 @@ exit 0 fi +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + for src do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -190,71 +248,199 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$dst" : 'X$//$[^/]' \| \ + X"$dst" : 'X$//$$' \| \ + X"$dst" : 'X$/$' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. + obsolete_mkdir_used=false - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac - pathcomp= + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi - pathcomp=$pathcomp/ - done + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -262,10 +448,9 @@ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -273,47 +458,58 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } -done + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ltmain.sh 4 Jun 2008 22:22:57 -0000 1.25 +++ ltmain.sh 10 Jun 2008 20:24:02 -0000 1.26 @@ -1,8 +1,8 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,14 +43,22 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.22 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" +VERSION=1.5.24 +TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -105,12 +113,14 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -if test "${LC_ALL+set}" = set; then - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -fi -if test "${LANG+set}" = set; then - save_LANG="$LANG"; LANG=C; export LANG -fi +for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" +done # Make sure IFS has a sensible default lt_nl=' @@ -136,6 +146,8 @@ preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 ##################################### # Shell function definitions: @@ -196,7 +208,13 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + $SED -n -e '1,100{ + / I /{ + s,.*,import, + p + q + } + }'` case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -327,7 +345,17 @@ *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -454,11 +482,12 @@ ;; --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + echo "\ +$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +Copyright (C) 2007 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? ;; @@ -755,9 +784,10 @@ *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; + *.[fF][09]?) xform=[fF][09]. ;; *.for) xform=for ;; *.java) xform=java ;; + *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1138,8 +1168,9 @@ for arg do case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1147,12 +1178,20 @@ dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - else + ;; + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - fi + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1600,7 +1639,7 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -1620,10 +1659,11 @@ # -m* pass through architecture-specific compiler args for GCC # -m*, -t[45]*, -txscale* pass through architecture-specific # compiler args for GCC - # -pg pass through profiling flag for GCC + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1651,9 +1691,9 @@ -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. + # and Darwin in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -1712,7 +1752,7 @@ continue ;; - -static) + -static | -static-libtool-libs) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2094,7 +2134,7 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -2490,7 +2530,9 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3186,7 +3228,7 @@ # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows) + darwin|linux|osf|windows|none) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3197,9 +3239,10 @@ age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; esac ;; @@ -3258,7 +3301,8 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3272,8 +3316,11 @@ ;; irix | nonstopux) - major=`expr $current - $age + 1` - + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; @@ -3410,11 +3457,11 @@ fi # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done + #for path in $notinst_path; do + # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3515,13 +3562,12 @@ int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l$.*$'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" -ne "0"; then + if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3560,9 +3606,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3594,7 +3638,7 @@ droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -3880,7 +3924,10 @@ test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + case $archive_cmds in + *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; + *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; + esac else eval dep_rpath=\"$hardcode_libdir_flag_spec\" fi @@ -4239,12 +4286,14 @@ reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4692,16 +4741,16 @@ case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` fi ;; * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ;; esac ;; @@ -4716,13 +4765,13 @@ # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4809,7 +4858,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` else # fast_install is set to needless relink_command= @@ -4846,7 +4895,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` fi # Quote $echo for shipping. @@ -5253,6 +5302,20 @@ Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5395,7 +5458,7 @@ ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" + \$echo \"\$0: cannot exec \$program \$*\" exit $EXIT_FAILURE fi else @@ -5581,7 +5644,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5926,9 +5989,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6137,7 +6200,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6348,8 +6411,10 @@ if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE + if test ! -f "$dir/$dlname"; then + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit $EXIT_FAILURE + fi fi ;; @@ -6413,12 +6478,12 @@ fi # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi + for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + fi" + done # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6775,9 +6840,9 @@ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6791,9 +6856,11 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored. Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- missing 30 May 2008 15:38:59 -0000 1.50 +++ missing 10 Jun 2008 20:24:02 -0000 1.51 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-fixup-memberof.pl.in, NONE, 1.1
by Doctor Conrad 10 Jun '08

10 Jun '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7596/ldap/admin/src/scripts Added Files: template-fixup-memberof.pl.in Log Message: Resolves: 450746 Summary: Added CLI for creating memberOf fix-up task entry. --- NEW FILE template-fixup-memberof.pl.in --- #{{PERL-EXEC}} # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2008 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # sub usage { print(STDERR "Usage: $0 [-v] -D rootdn { -w password | -w - | -j filename } \n"); print(STDERR " -b baseDN [-f filter]\n"); print(STDERR " Opts: -D rootdn - Directory Manager\n"); print(STDERR " : -w password - Directory Manager's password\n"); print(STDERR " : -w - - Prompt for Directory Manager's password\n"); print(STDERR " : -j filename - Read Directory Manager's password from file\n"); print(STDERR " : -b baseDN - Base DN that contains entries to fix up.\n"); print(STDERR " : -f filter - Filter for entries to fix up\n"); print(STDERR " If omitted, all entries under the specified\n"); print(STDERR " base will have their memberOf attribute\n"); print(STDERR " regenerated.\n"); print(STDERR " : -v - verbose\n"); } $rootdn = ""; $passwd = ""; $passwdfile = ""; $basedn_arg = ""; $filter_arg = ""; $filter = ""; $verbose = 0; $prefix = "{{DS-ROOT}}"; $ENV{'PATH'} = "$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $i = 0; while ($i <= $#ARGV) { if ("$ARGV[$i]" eq "-b") { # base DN $i++; $basedn_arg = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-f") { # filter $i++; $filter_arg = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-D") { # Directory Manager $i++; $rootdn = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-w") { # Directory Manager's password $i++; $passwd = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-j") { # Read Directory Manager's password from a file $i++; $passwdfile = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-v") { # verbose $verbose = 1; } else { &usage; exit(1); } $i++; } if ($passwdfile ne ""){ # Open file and get the password unless (open (RPASS, $passwdfile)) { die "Error, cannot open password file $passwdfile\n"; } $passwd = <RPASS>; chomp($passwd); close(RPASS); } elsif ($passwd eq "-"){ # Read the password from terminal die "The '-w -' option requires an extension library (Term::ReadKey) which is not\n", "part of the standard perl distribution. If you want to use it, you must\n", "download and install the module. You can find it at\n", "http://www.perl.com/CPAN/CPAN.html\n"; # Remove the previous line and uncomment the following 6 lines once you have installed Term::ReadKey module. # use Term::ReadKey; # print "Bind Password: "; # ReadMode('noecho'); # $passwd = ReadLine(0); # chomp($passwd); # ReadMode('normal'); } if ( $rootdn eq "" || $passwd eq "" || $basedn_arg eq "" ) { &usage; exit(1); } $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } # Use a timestamp as part of the task entry name ($s, $m, $h, $dy, $mn, $yr, $wdy, $ydy, $r) = localtime(time); $mn++; $yr += 1900; $taskname = "memberOf_fixup_${yr}_${mn}_${dy}_${h}_${m}_${s}"; # Build the task entry to add $dn = "dn: cn=$taskname, cn=memberOf task, cn=tasks, cn=config\n"; $misc = "changetype: add\nobjectclass: top\nobjectclass: extensibleObject\n"; $cn = "cn: $taskname\n"; $basedn = "basedn: $basedn_arg\n"; if ( $filter_arg ne "" ) { $filter = "filter: $filter_arg\n"; } $entry = "${dn}${misc}${cn}${basedn}${filter}"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO);

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd slapi-private.h, 1.22, 1.23 proto-slap.h, 1.33, 1.34 schema.c, 1.13, 1.14
by Doctor Conrad 10 Jun '08

10 Jun '08

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23794 Modified Files: slapi-private.h proto-slap.h schema.c Log Message: Resolves: #436837 Summary: Dynamically reload schema via task interface (comment #15) Description: fixed the broken function declaration. Index: slapi-private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- slapi-private.h 4 Jun 2008 22:22:55 -0000 1.22 +++ slapi-private.h 10 Jun 2008 18:50:07 -0000 1.23 @@ -1084,7 +1084,7 @@ #define DSE_SCHEMA_NO_GLOCK 0x0010 /* don't lock global resources */ #define DSE_SCHEMA_LOCKED 0x0020 /* already locked with - * slapi_load_schemafile_lock; + * reload_schemafile_lock; * no further lock needed */ #define DSE_SCHEMA_USER_DEFINED_ONLY 0x0100 /* refresh user defined schema */ Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- proto-slap.h 4 Jun 2008 22:22:55 -0000 1.33 +++ proto-slap.h 10 Jun 2008 18:50:07 -0000 1.34 @@ -857,9 +857,6 @@ /* csn is consumed. */ void g_set_global_schema_csn(CSN *csn); void slapi_schema_expand_objectclasses( Slapi_Entry *e ); -/* lock to protect both objectclass and schema_dse */ -void slapi_load_schemafile_lock( void ); -void slapi_load_schemafile_unlock( void ); /* API to validate the schema files */ int slapi_validate_schema_files(char *schemadir); /* API to reload the schema files */ Index: schema.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schema.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- schema.c 4 Jun 2008 23:40:57 -0000 1.13 +++ schema.c 10 Jun 2008 18:50:07 -0000 1.14 @@ -2723,7 +2723,7 @@ * DSE_SCHEMA_NO_CHECK -- schema won't be checked * DSE_SCHEMA_NO_GLOCK -- don't lock global resources * DSE_SCHEMA_LOCKED -- already locked with - * slapi_load_schemafile_lock; + * reload_schemafile_lock; * no further lock needed * schema_ds4x_compat: if non-zero, act like Netscape DS 4.x * @@ -3143,8 +3143,8 @@ * DSE_SCHEMA_NO_GLOCK -- locking of global resources is turned off; * this saves time during initialization since * the server operates in single threaded mode - * at that time or in slapi_load_schemafile_lock. - * DSE_SCHEMA_LOCKED -- already locked with slapi_load_schemafile_lock; + * at that time or in reload_schemafile_lock. + * DSE_SCHEMA_LOCKED -- already locked with reload_schemafile_lock; * no further lock needed * * if is_user_defined is true, force attribute type to be user defined. @@ -4897,14 +4897,14 @@ /* lock to protect both objectclass and schema_dse */ static void -slapi_load_schemafile_lock() +reload_schemafile_lock() { oc_lock_write(); schema_dse_lock_write(); } static void -slapi_load_schemafile_unlock() +reload_schemafile_unlock() { schema_dse_unlock(); oc_unlock(); @@ -4947,7 +4947,7 @@ return LDAP_LOCAL_ERROR; } slapi_be_Wlock(be); /* be lock must be outer of schemafile lock */ - slapi_load_schemafile_lock(); + reload_schemafile_lock(); attr_syntax_delete_all(); oc_delete_all_nolock(); rc = init_schema_dse_ext(schemadir, be, &my_pschemadse, @@ -4955,11 +4955,11 @@ if (rc) { dse_destroy(pschemadse); pschemadse = my_pschemadse; - slapi_load_schemafile_unlock(); + reload_schemafile_unlock(); slapi_be_Unlock(be); return LDAP_SUCCESS; } else { - slapi_load_schemafile_unlock(); + reload_schemafile_unlock(); slapi_be_Unlock(be); slapi_log_error( SLAPI_LOG_FATAL, "schema_reload", "schema file reload failed\n" );

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.7, 1.8
by Doctor Conrad 09 Jun '08

09 Jun '08

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4675 Modified Files: memberof.c Log Message: Resolves: 443241 Summary: Fixed issues with cleanup task not adding indirect memberships. Index: memberof.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- memberof.c 21 Apr 2008 17:45:15 -0000 1.7 +++ memberof.c 9 Jun 2008 21:43:59 -0000 1.8 @@ -2188,9 +2188,9 @@ /* memberof_fix_memberof_callback() * Add initial and/or fix up broken group list in entry * - * 1. Make sure direct membership groups are in the entry - * 2. Add all groups that current group list allows through nested membership - * 3. Trim groups that have no relationship to entry + * 1. Remove all present memberOf values + * 2. Add direct group membership memberOf values + * 3. Add indirect group membership memberOf values */ int memberof_fix_memberof_callback(Slapi_Entry *e, void *callback_data) { @@ -2198,14 +2198,12 @@ char *dn = slapi_entry_get_dn(e); memberof_add_groups data = {dn, dn}; - /* step 1. and step 2. */ + /* step 1 */ + slapi_entry_attr_delete(e, MEMBEROF_ATTR); + + /* step 2 and 3 */ rc = memberof_call_foreach_dn(0, dn, MEMBEROF_GROUP_ATTR, memberof_add_groups_search_callback, &data); - if(0 == rc) - { - /* step 3. */ - rc = memberof_test_membership_callback(e, 0); - } return rc; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits June 2008