From fedora-directory-commits at redhat.com Thu Jan 3 21:35:31 2008 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Thu, 3 Jan 2008 16:35:31 -0500 Subject: [Fedora-directory-commits] mod_nss nss_engine_vars.c,1.10,1.11 Message-ID: <200801032135.m03LZVZx002915@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2854 Modified Files: nss_engine_vars.c Log Message: Resolves BZ 248722 See if the certificate has a version before trying to decode it into a CGI variable. Index: nss_engine_vars.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_vars.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nss_engine_vars.c 18 Oct 2007 18:26:21 -0000 1.10 +++ nss_engine_vars.c 3 Jan 2008 21:35:28 -0000 1.11 @@ -336,8 +336,13 @@ resdup = TRUE; if (strcEQ(var, "M_VERSION")) { - result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->version)+1); - resdup = FALSE; + if (xs->version.data != NULL) { + result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->version)+1); + resdup = FALSE; + } else { + result = apr_pstrdup(p, "UNKNOWN"); + resdup = FALSE; + } } else if (strcEQ(var, "M_SERIAL")) { result = apr_psprintf(p, "%lu", DER_GetInteger(&xs->serialNumber)); From fedora-directory-commits at redhat.com Mon Jan 7 22:32:18 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 7 Jan 2008 17:32:18 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.15, 1.1.2.16 redhat-patch.inf, 1.1.2.16, 1.1.2.17 Message-ID: <200801072232.m07MWIS4022529@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22429 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Resolves: #203670 Summary: Tracking bug for Directory Server 7.1 SP 4 Description: updating patch info file to include the following patches: 202890, 229513, 231507, 247725, 297221, 339791, Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -u -r1.1.2.15 -r1.1.2.16 --- fedora-patch.inf 8 Jun 2006 19:08:20 -0000 1.1.2.15 +++ fedora-patch.inf 7 Jan 2008 22:32:16 -0000 1.1.2.16 @@ -49,15 +49,18 @@ base: ... file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229,173687,175063: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687,175063,179135,179137: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687,175063,202890,247725,297221: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221: bin/slapd/server/libslapd.* file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create -file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901: lib/libback-ldbm.* +file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507: lib/libback-ldbm.* file: 160003: bin/slapd/admin/scripts/template-db2index.pl file: 160003: bin/slapd/admin/bin/upgradeServer file: 164836,165600: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* +file: 339791: lib/syntax-plugin.* +file: 297221: lib/acl-plugin.* +file: 297221: lib/statechange-plugin.* file: 167478,160589: setup/setup file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -r1.1.2.16 -r1.1.2.17 --- redhat-patch.inf 26 Jul 2006 06:17:59 -0000 1.1.2.16 +++ redhat-patch.inf 7 Jan 2008 22:32:16 -0000 1.1.2.17 @@ -49,15 +49,18 @@ base: /share/builds/products/server/directry/7.1 file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229,173687,175063: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687,175063,179135,179137: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687,175063,202890,247725,297221: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221: bin/slapd/server/libslapd.* file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create -file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901: lib/libback-ldbm.* +file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507: lib/libback-ldbm.* file: 160003: bin/slapd/admin/scripts/template-db2index.pl file: 160003: bin/slapd/admin/bin/upgradeServer file: 164836,165600: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* +file: 339791: lib/syntax-plugin.* +file: 297221: lib/acl-plugin.* +file: 297221: lib/statechange-plugin.* file: 167478,160589: setup/setup file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar From fedora-directory-commits at redhat.com Tue Jan 8 00:52:22 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 7 Jan 2008 19:52:22 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.9, 1.10.2.10 Message-ID: <200801080052.m080qMN0010612@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10587 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: Resolves: #203670 Summary: Tracking bug for Directory Server 7.1 SP 4 Description: - apply patches defined in DS7.1 SP4 PRD - increace the release number from 5 to 6 Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/ldapserver.spec.tmpl,v retrieving revision 1.10.2.9 retrieving revision 1.10.2.10 diff -u -r1.10.2.9 -r1.10.2.10 --- ldapserver.spec.tmpl 26 May 2006 23:43:39 -0000 1.10.2.9 +++ ldapserver.spec.tmpl 8 Jan 2008 00:52:20 -0000 1.10.2.10 @@ -45,7 +45,7 @@ Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP at -ds Version: @GEN-VERSION@ -Release: 5. at PLATFORM@ +Release: 6. at PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ @@ -135,6 +135,9 @@ fi %changelog +* Mon Jan 07 2008 Noriko Hosoi 7.1-4 +- apply patches defined in DS7.1 SP4 PRD + * Tue Sep 13 2005 Nathan Kinder 7.1-3 - use a macro for require list that is passed in via rpmbuild From fedora-directory-commits at redhat.com Wed Jan 9 18:59:57 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 9 Jan 2008 13:59:57 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_protocol_util.c, 1.8, 1.8.2.1 Message-ID: <200801091859.m09IxvGV031476@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31454 Modified Files: Tag: Directory71RtmBranch repl5_protocol_util.c Log Message: Resolves: 196523 Summary: miscellaneous memory leaks Description: applying the patch to Directory71RtmBranch Index: repl5_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_protocol_util.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- repl5_protocol_util.c 18 May 2005 03:17:33 -0000 1.8 +++ repl5_protocol_util.c 9 Jan 2008 18:59:55 -0000 1.8.2.1 @@ -112,6 +112,10 @@ int return_value; ConnResult crc; Repl_Connection *conn; + struct berval *retdata = NULL; + char *retoid = NULL; + Slapi_DN *replarea_sdn = NULL; + struct berval **ruv_bervals = NULL; PR_ASSERT(prp && prot_oid); @@ -195,9 +199,6 @@ } else { CSN *current_csn = NULL; - struct berval *retdata = NULL; - char *retoid = NULL; - Slapi_DN *replarea_sdn; /* Good to go. Start the protocol. */ @@ -238,7 +239,6 @@ * Extop was processed. Look at extop response to see if we're * permitted to go ahead. */ - struct berval **ruv_bervals = NULL; int extop_result; int extop_rc = decode_repl_ext_response(retdata, &extop_result, &ruv_bervals); @@ -392,8 +392,6 @@ prp->last_acquire_response_code = NSDS50_REPL_INTERNAL_ERROR; return_value = ACQUIRE_FATAL_ERROR; } - if (NULL != ruv_bervals) - ber_bvecfree(ruv_bervals); } else { @@ -418,15 +416,18 @@ agmt_get_long_name(prp->agmt)); return_value = ACQUIRE_FATAL_ERROR; } - slapi_sdn_free(&replarea_sdn); - if (NULL != retoid) - ldap_memfree(retoid); - if (NULL != retdata) - ber_bvfree(retdata); } } } error: + if (NULL != ruv_bervals) + ber_bvecfree(ruv_bervals); + if (NULL != replarea_sdn) + slapi_sdn_free(&replarea_sdn); + if (NULL != retoid) + ldap_memfree(retoid); + if (NULL != retdata) + ber_bvfree(retdata); if (ACQUIRE_SUCCESS != return_value) { From fedora-directory-commits at redhat.com Wed Jan 9 19:37:06 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 9 Jan 2008 14:37:06 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd sasl_io.c, 1.6, 1.6.2.1 Message-ID: <200801091937.m09Jb6vg006709@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6670 Modified Files: Tag: Directory71RtmBranch sasl_io.c Log Message: Resolves: 428159 Summary: SASL IO functions set/get: argument mismatch Fix description: When setting the IO functions in sasl_io_setup, we could just use the local memory to pass the IO functions. And we don't need to worry about releasing the memory. Instead, we need to allocate the back up of the existing IO functions (real_iofns in the code), which is set in sasl_io_setup and needs to be released after setting it back in sasl_io_cleanup. Index: sasl_io.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- sasl_io.c 19 Apr 2005 22:07:37 -0000 1.6 +++ sasl_io.c 9 Jan 2008 19:37:04 -0000 1.6.2.1 @@ -100,15 +100,16 @@ sasl_io_setup(Connection *c) { int ret = 0; - struct lber_x_ext_io_fns *func_pointers = NULL; + struct lber_x_ext_io_fns func_pointers = {0}; + struct lber_x_ext_io_fns *real_iofns = (struct lber_x_ext_io_fns *) slapi_ch_malloc(LBER_X_EXTIO_FNS_SIZE); sasl_io_private *sp = (sasl_io_private*) slapi_ch_calloc(1, sizeof(sasl_io_private)); LDAPDebug( LDAP_DEBUG_CONNS, "sasl_io_setup for connection %d\n", c->c_connid, 0, 0 ); /* Get the current functions and store them for later */ - ber_sockbuf_get_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers); - sp->real_iofns = func_pointers; - func_pointers = NULL; + real_iofns->lbextiofn_size = LBER_X_EXTIO_FNS_SIZE; + ber_sockbuf_get_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, real_iofns ); + sp->real_iofns = real_iofns; /* released in sasl_io_cleanup */ /* Set up the private structure */ sp->real_handle = (struct lextiof_socket_private*) c->c_prfd; @@ -116,13 +117,12 @@ /* Store the private structure in the connection */ c->c_sasl_io_private = sp; /* Insert the sasl i/o functions into the ber layer */ - func_pointers = (struct lber_x_ext_io_fns *) slapi_ch_malloc(LBER_X_EXTIO_FNS_SIZE); - func_pointers->lbextiofn_size = LBER_X_EXTIO_FNS_SIZE; - func_pointers->lbextiofn_read = sasl_read_function; - func_pointers->lbextiofn_write = sasl_write_function; - func_pointers->lbextiofn_writev = NULL; - func_pointers->lbextiofn_socket_arg = (struct lextiof_socket_private *) sp; - ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, func_pointers); + func_pointers.lbextiofn_size = LBER_X_EXTIO_FNS_SIZE; + func_pointers.lbextiofn_read = sasl_read_function; + func_pointers.lbextiofn_write = sasl_write_function; + func_pointers.lbextiofn_writev = NULL; + func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) sp; + ret = ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers); /* Setup the data buffers for the fast read path */ sasl_io_init_buffers(sp); /* Reset the enable flag, so we don't process it again */ @@ -144,7 +144,10 @@ slapi_ch_free((void**)&(sp->encrypted_buffer)); slapi_ch_free((void**)&(sp->decrypted_buffer)); /* Put the I/O functions back how they were */ - ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, sp->real_iofns); + if (NULL != sp->real_iofns) { + ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_EXT_IO_FNS, sp->real_iofns ); + slapi_ch_free((void**)&(sp->real_iofns)); + } slapi_ch_free((void**)&sp); c->c_sasl_io_private = NULL; c->c_enable_sasl_io = 0; From fedora-directory-commits at redhat.com Wed Jan 9 21:47:55 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 9 Jan 2008 16:47:55 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd sasl_io.c, 1.6.2.1, 1.6.2.2 Message-ID: <200801092147.m09LltdW024500@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24375 Modified Files: Tag: Directory71RtmBranch sasl_io.c Log Message: Resolves: #208058 Summary: "decoding error" when using GSSAPI and adding new entries. Description: applied the patch to Directory71RtmBranch Index: sasl_io.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- sasl_io.c 9 Jan 2008 19:37:04 -0000 1.6.2.1 +++ sasl_io.c 9 Jan 2008 21:47:53 -0000 1.6.2.2 @@ -316,7 +316,8 @@ if (bytes_to_return > count) { bytes_to_return = count; } - memcpy(buffer, sp->decrypted_buffer, bytes_to_return); + /* Copy data from the decrypted buffer starting at the offset */ + memcpy(buffer, sp->decrypted_buffer + sp->decrypted_buffer_offset, bytes_to_return); if (bytes_in_buffer == bytes_to_return) { sp->decrypted_buffer_offset = 0; sp->decrypted_buffer_count = 0; From fedora-directory-commits at redhat.com Thu Jan 10 01:12:21 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 9 Jan 2008 20:12:21 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.18.2.1, 1.18.2.2 Message-ID: <200801100112.m0A1CLhY025688@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25575/admin/src Modified Files: Tag: Directory71RtmBranch create_instance.c Log Message: Resolves: #311851 Summary: Remove hard-coded SASL mappings and replace with regex mappings Description: applied the patch to Directory71RtmBranch Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Attic/create_instance.c,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -r1.18.2.1 -r1.18.2.2 --- create_instance.c 26 Aug 2005 18:51:50 -0000 1.18.2.1 +++ create_instance.c 10 Jan 2008 01:12:19 -0000 1.18.2.2 @@ -3791,6 +3791,55 @@ fprintf(f, "cn: replication\n"); fprintf(f, "\n"); + /* bugzilla 311851: Don't allow * to be inserted into SASL mapping search*/ + fprintf(f, "dn: cn=sasl,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsContainer\n"); + fprintf(f, "cn: sasl\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=mapping,cn=sasl,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsContainer\n"); + fprintf(f, "cn: mapping\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=Kerberos uid mapping,cn=mapping,cn=sasl,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSaslMapping\n"); + fprintf(f, "cn: Kerberos uid mapping\n"); + fprintf(f, "nsSaslMapRegexString: \\(.*\\)@\\(.*\\)\\.\\(.*\\)\n"); + fprintf(f, "nsSaslMapBaseDNTemplate: dc=\\2,dc=\\3\n"); + fprintf(f, "nsSaslMapFilterTemplate: (uid=\\1)\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=rfc 2829 dn syntax,cn=mapping,cn=sasl,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSaslMapping\n"); + fprintf(f, "cn: rfc 2829 dn syntax\n"); + fprintf(f, "nsSaslMapRegexString: ^dn:\\(.*\\)\n"); + fprintf(f, "nsSaslMapBaseDNTemplate: \\1\n"); + fprintf(f, "nsSaslMapFilterTemplate: (objectclass=*)\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=rfc 2829 u syntax,cn=mapping,cn=sasl,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSaslMapping\n"); + fprintf(f, "cn: rfc 2829 u syntax\n"); + fprintf(f, "nsSaslMapRegexString: ^u:\\(.*\\)\n"); + fprintf(f, "nsSaslMapBaseDNTemplate: %s\n", cf->suffix); + fprintf(f, "nsSaslMapFilterTemplate: (uid=\\1)\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=uid mapping,cn=mapping,cn=sasl,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSaslMapping\n"); + fprintf(f, "cn: uid mapping\n"); + fprintf(f, "nsSaslMapRegexString: ^[^:@]+$\n"); + fprintf(f, "nsSaslMapBaseDNTemplate: %s\n", cf->suffix); + fprintf(f, "nsSaslMapFilterTemplate: (uid=&)\n"); + fprintf(f, "\n"); + if( cf->replicationdn && *(cf->replicationdn) ) { fprintf(f, "dn: cn=replication4,cn=replication,cn=config\n"); From fedora-directory-commits at redhat.com Thu Jan 10 01:12:21 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 9 Jan 2008 20:12:21 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.9.2.4, 1.9.2.5 Message-ID: <200801100112.m0A1CL48025682@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25575/servers/slapd Modified Files: Tag: Directory71RtmBranch saslbind.c Log Message: Resolves: #311851 Summary: Remove hard-coded SASL mappings and replace with regex mappings Description: applied the patch to Directory71RtmBranch Index: saslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -u -r1.9.2.4 -r1.9.2.5 --- saslbind.c 14 Mar 2006 19:36:23 -0000 1.9.2.4 +++ saslbind.c 10 Jan 2008 01:12:18 -0000 1.9.2.5 @@ -300,115 +300,56 @@ ) { int found = 0; - unsigned fsize = 0, ulen, rlen = 0; int attrsonly = 0, scope = LDAP_SCOPE_SUBTREE; - char filter[1024], *fptr = filter; LDAPControl **ctrls = NULL; Slapi_Entry *entry = NULL; Slapi_DN *sdn; char **attrs = NULL; - char *userattr = "uid", *realmattr = NULL, *ufilter = NULL; - void *node; int regexmatch = 0; - char *regex_ldap_search_base = NULL; - char *regex_ldap_search_filter = NULL; + char *base = NULL; + char *filter = NULL; - /* TODO: userattr & realmattr should be configurable */ - /* - * Check for dn: prefix. See RFC 2829 section 9. - */ - if (strncasecmp(user, "dn:", 3) == 0) { - sprintf(fptr, "(objectclass=*)"); - scope = LDAP_SCOPE_BASE; - ids_sasl_user_search((char*)user+3, scope, filter, + /* Check for wildcards in the authid and realm. If we encounter one, + * just fail the mapping without performing a costly internal search. */ + if (user && strchr(user, '*')) { + LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search encountered a wildcard in " + "the authid. Not attempting to map to entry. (authid=%s)\n", user, 0, 0); + return NULL; + } else if (user_realm && strchr(user_realm, '*')) { + LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search encountered a wildcard in " + "the realm. Not attempting to map to entry. (realm=%s)\n", user_realm, 0, 0); + return NULL; + } + + /* New regex-based identity mapping */ + regexmatch = sasl_map_domap((char*)user, (char*)user_realm, &base, &filter); + if (regexmatch) { + ids_sasl_user_search(base, scope, filter, ctrls, attrs, attrsonly, &entry, &found); - } else { - int offset = 0; - if (strncasecmp(user,"u:",2) == 0 ) - offset = 2; - /* TODO: quote the filter values */ - - /* New regex-based identity mapping : we call it here before the old code. - * If there's a match, we skip the old way, otherwise we plow ahead for backwards compatibility reasons - */ - regexmatch = sasl_map_domap((char*)user, (char*)user_realm, ®ex_ldap_search_base, ®ex_ldap_search_filter); - if (regexmatch) { - - ids_sasl_user_search(regex_ldap_search_base, scope, regex_ldap_search_filter, - ctrls, attrs, attrsonly, - &entry, &found); - - /* Free the filter etc */ - slapi_ch_free((void**)®ex_ldap_search_base); - slapi_ch_free((void**)®ex_ldap_search_filter); - } else { - - /* Ensure no buffer overflow. */ - /* We don't know what the upper limits on username and - * realm lengths are. There don't seem to be any defined - * in the relevant standards. We may find in the future - * that a 1K buffer is insufficient for some mechanism, - * but it seems unlikely given that the values are exposed - * to the end user. - */ - ulen = strlen(user+offset); - fsize += strlen(userattr) + ulen; - if (realmattr && user_realm) { - rlen = strlen(user_realm); - fsize += strlen(realmattr) + rlen; - } - if (ufilter) fsize += strlen(ufilter); - fsize += 100; /* includes a good safety margin */ - if (fsize > 1024) { - LDAPDebug(LDAP_DEBUG_ANY, "sasl user name and/or realm too long" - " (ulen=%u, rlen=%u)\n", ulen, rlen, 0); - return NULL; - } - - /* now we can safely write the filter */ - sprintf(fptr, "(&(%s=%s)", userattr, user+offset); - fptr += strlen(fptr); - if (realmattr && user_realm) { - sprintf(fptr, "(%s=%s)", realmattr, user_realm); - fptr += strlen(fptr); - } - if (ufilter) { - if (*ufilter == '(') { - sprintf(fptr, "%s", ufilter); - } else { - sprintf(fptr, "(%s)", ufilter); - } - fptr += strlen(fptr); - } - sprintf(fptr, ")"); - - /* iterate through the naming contexts */ - for (sdn = slapi_get_first_suffix(&node, 0); sdn != NULL; - sdn = slapi_get_next_suffix(&node, 0)) { - - ids_sasl_user_search((char*)slapi_sdn_get_dn(sdn), scope, filter, - ctrls, attrs, attrsonly, - &entry, &found); + if (found == 1) { + LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search found this entry: dn:%s, " + "matching filter=%s\n", entry->e_sdn.dn, filter, 0); + } else if (found == 0) { + LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search found no entries matching " + "filter=%s\n", filter, 0, 0); + } else { + LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search found more than one entry " + "matching filter=%s\n", filter, 0, 0); + if (entry) { + slapi_entry_free(entry); + entry = NULL; } } - } - if (found == 1) { - LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search found this entry: dn:%s, matching filter=%s\n", entry->e_sdn.dn, filter, 0); - return entry; - } - - if (found == 0) { - LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search found no entries matching filter=%s\n", filter, 0, 0); - } else { - LDAPDebug(LDAP_DEBUG_TRACE, "sasl user search found more than one entry matching filter=%s\n", filter, 0, 0); + /* Free the filter etc */ + slapi_ch_free_string(&base); + slapi_ch_free_string(&filter); } - if (entry) slapi_entry_free(entry); - return NULL; + return entry; } static char *buf2str(const char *buf, unsigned buflen) From fedora-directory-commits at redhat.com Thu Jan 10 01:19:39 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 9 Jan 2008 20:19:39 -0500 Subject: [Fedora-directory-commits] dsgw/m4 sasl.m4, NONE, 1.1 fhs.m4, NONE, 1.1 adminutil.m4, 1.1.1.1, 1.2 icu.m4, 1.1.1.1, 1.2 mozldap.m4, 1.1.1.1, 1.2 nspr.m4, 1.1.1.1, 1.2 nss.m4, 1.1.1.1, 1.2 httpd.m4, 1.2, NONE Message-ID: <200801100119.m0A1Jd22026209@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26138/dsgw/m4 Modified Files: adminutil.m4 icu.m4 mozldap.m4 nspr.m4 nss.m4 Added Files: sasl.m4 fhs.m4 Removed Files: httpd.m4 Log Message: update of autotool files based on recent ldapserver and adminserver --- NEW FILE sasl.m4 --- # BEGIN COPYRIGHT BLOCK # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # 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; either version 2 # of the License, or (at your option) any later version. # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK # -*- tab-width: 4; -*- # Configure paths for SASL dnl ======================================================== dnl = sasl is used to support various authentication mechanisms dnl = such as DIGEST-MD5 and GSSAPI. dnl ======================================================== dnl ======================================================== dnl = Use the sasl libraries on the system (assuming it exists) dnl ======================================================== AC_CHECKING(for sasl) AC_MSG_CHECKING(for --with-sasl) AC_ARG_WITH(sasl, [[ --with-sasl=PATH Use sasl from supplied path]], dnl = Look in the standard system locations [ if test "$withval" = "yes"; then AC_MSG_RESULT(yes) dnl = Check for sasl.h in the normal locations if test -f /usr/include/sasl/sasl.h; then sasl_inc="-I/usr/include/sasl" elif test -f /usr/include/sasl.h; then sasl_inc="-I/usr/include" else AC_MSG_ERROR(sasl.h not found) fi dnl = Check the user provided location elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then AC_MSG_RESULT([using $withval]) if test -f "$withval/include/sasl/sasl.h"; then sasl_inc="-I$withval/include/sasl" elif test -f "$withval/include/sasl.h"; then sasl_inc="-I$withval/include" else AC_MSG_ERROR(sasl.h not found) fi sasl_lib="-L$withval/lib" sasl_libdir="$withval/lib" else AC_MSG_RESULT(yes) AC_MSG_ERROR([sasl not found in $withval]) fi ], AC_MSG_RESULT(no)) AC_MSG_CHECKING(for --with-sasl-inc) AC_ARG_WITH(sasl-inc, [[ --with-sasl-inc=PATH SASL include file directory]], [ if test -f "$withval"/sasl.h; then AC_MSG_RESULT([using $withval]) sasl_inc="-I$withval" else echo AC_MSG_ERROR([$withval/sasl.h not found]) fi ], AC_MSG_RESULT(no)) AC_MSG_CHECKING(for --with-sasl-lib) AC_ARG_WITH(sasl-lib, [[ --with-sasl-lib=PATH SASL library directory]], [ if test -d "$withval"; then AC_MSG_RESULT([using $withval]) sasl_lib="-L$withval" sasl_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) fi ], AC_MSG_RESULT(no)) if test -z "$sasl_inc"; then AC_MSG_CHECKING(for sasl.h) dnl - Check for sasl in standard system locations if test -f /usr/include/sasl/sasl.h; then AC_MSG_RESULT([using /usr/include/sasl/sasl.h]) sasl_inc="-I/usr/include/sasl" elif test -f /usr/include/sasl.h; then AC_MSG_RESULT([using /usr/include/sasl.h]) sasl_inc="-I/usr/include" else AC_MSG_RESULT(no) AC_MSG_ERROR([sasl not found, specify with --with-sasl.]) fi fi --- NEW FILE fhs.m4 --- # BEGIN COPYRIGHT BLOCK # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # # 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; either version 2 # of the License, or (at your option) any later version. # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK AC_CHECKING(for FHS) # check for --with-fhs AC_MSG_CHECKING(for --with-fhs) AC_ARG_WITH(fhs, [ --with-fhs Use FHS layout], [ with_fhs=yes AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no)) if test "$with_fhs" = "yes"; then AC_DEFINE([IS_FHS], [1], [Use FHS layout]) fi # check for --with-fhs-opt AC_MSG_CHECKING(for --with-fhs-opt) AC_ARG_WITH(fhs-opt, [ --with-fhs-opt Use FHS optional layout], [ with_fhs_opt=yes AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no)) if test "$with_fhs_opt" = "yes"; then AC_DEFINE([IS_FHS_OPT], [1], [Use FHS optional layout]) fi if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then AC_MSG_ERROR([Can't set both --with-fhs and --with-fhs-opt. Please only use one of these options.]) fi Index: adminutil.m4 =================================================================== RCS file: /cvs/dirsec/dsgw/m4/adminutil.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- adminutil.m4 1 Jun 2006 19:43:50 -0000 1.1.1.1 +++ adminutil.m4 10 Jan 2008 01:19:36 -0000 1.2 @@ -29,15 +29,8 @@ AC_MSG_RESULT([using $withval]) ADMINUTILDIR=$withval adminutil_lib="-L$ADMINUTILDIR/lib" - # check for version - only needed for older adminutil versions - for file in $ADMINUTILDIR/lib/* ; do - echo $file | grep 'libadminutil[[0-9][0-9]]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([[0-9][0-9]]\).*/\1/'` ; break - done - # use the latest one - adminutil_incdir=`ls -1d $ADMINUTILDIR/include/adminutil-* | sort -n | tail -1` - if ! test -n "$adminutil_incdir" -a -d "$adminutil_incdir" ; then - adminutil_incdir=$ADMINUTILDIR/include - fi + adminutil_libdir="$ADMINUTILDIR/lib" + adminutil_incdir=$ADMINUTILDIR/include if ! test -e "$adminutil_incdir/libadminutil/admutil.h" ; then AC_MSG_ERROR([$withval include dir not found]) fi @@ -59,6 +52,7 @@ if $PKG_CONFIG --exists adminutil; then adminutil_inc=`$PKG_CONFIG --cflags-only-I adminutil` adminutil_lib=`$PKG_CONFIG --libs-only-L adminutil` + adminutil_libdir=`$PKG_CONFIG --libs-only-L adminutil | sed -e s/-L// | sed -e s/\ .*$//` else AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.]) fi Index: icu.m4 =================================================================== RCS file: /cvs/dirsec/dsgw/m4/icu.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- icu.m4 1 Jun 2006 19:43:50 -0000 1.1.1.1 +++ icu.m4 10 Jan 2008 01:19:36 -0000 1.2 @@ -27,14 +27,15 @@ if test -d "$withval"/lib then AC_MSG_RESULT([using $withval]) - ICUDIR=$withval + ICUDIR="$withval" icu_lib="-L$ICUDIR/lib" + icu_libdir="$ICUDIR/lib" else echo AC_MSG_ERROR([$withval not found]) fi - icu_inc=$withval/include - icu_bin=$withval/bin + icu_inc="-I$withval/include" + icu_bin="$withval/bin" ], AC_MSG_RESULT(no)) @@ -61,6 +62,7 @@ then AC_MSG_RESULT([using $withval]) icu_lib="-L$withval" + icu_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -82,7 +84,7 @@ fi ], AC_MSG_RESULT(no)) -# if not found yet, try pkg-config +# if ICU is not found yet, try pkg-config # last resort if test -z "$icu_lib"; then @@ -90,8 +92,10 @@ AC_PATH_PROG(ICU_CONFIG, icu-config) if test -n "$ICU_CONFIG"; then icu_lib=`$ICU_CONFIG --ldflags-searchpath` + icu_libdir=`$ICU_CONFIG --libdir` icu_inc=`$ICU_CONFIG --cppflags-searchpath` icu_bin=`$ICU_CONFIG --bindir` + AC_MSG_RESULT([using system ICU]) else AC_MSG_ERROR([ICU not found, specify with --with-icu.]) fi Index: mozldap.m4 =================================================================== RCS file: /cvs/dirsec/dsgw/m4/mozldap.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- mozldap.m4 1 Jun 2006 19:43:50 -0000 1.1.1.1 +++ mozldap.m4 10 Jan 2008 01:19:36 -0000 1.2 @@ -1,5 +1,5 @@ # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or @@ -30,6 +30,8 @@ LDAPSDKDIR=$withval ldapsdk_inc="-I$LDAPSDKDIR/include" ldapsdk_lib="-L$LDAPSDKDIR/lib" + ldapsdk_libdir="$LDAPSDKDIR/lib" + ldapsdk_bindir="$LDAPSDKDIR/bin" else echo AC_MSG_ERROR([$withval not found]) @@ -60,6 +62,7 @@ then AC_MSG_RESULT([using $withval]) ldapsdk_lib="-L$withval" + ldapsdk_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -70,18 +73,49 @@ # if LDAPSDK is not found yet, try pkg-config # last resort -if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then - AC_MSG_CHECKING(for mozldap with pkg-config) +if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_MSG_CHECKING(for mozldap with pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozldap; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap` - nspr_lib=`$PKG_CONFIG --libs-only-L mozldap` + if $PKG_CONFIG --exists mozldap6; then + mozldappkg=mozldap6 + elif $PKG_CONFIG --exists mozldap; then + mozldappkg=mozldap else AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg` + ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg` + ldapsdk_lib="-L$ldapsdk_libdir" + ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg` + AC_MSG_RESULT([using system $mozldappkg]) fi fi if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi +dnl default path for the ldap c sdk tools (see [210947] for more details) +if test -z "$ldapsdk_bindir" ; then + if [ -d $libdir/mozldap6 ] ; then + ldapsdk_bindir=$libdir/mozldap6 + else + ldapsdk_bindir=$libdir/mozldap + fi +fi + +dnl make sure the ldap sdk version is 6 or greater - we do not support +dnl the old 5.x or prior versions - the ldap server code expects the new +dnl ber types and other code used with version 6 +save_cppflags="$CPPFLAGS" +CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc" +AC_CHECK_HEADER([ldap.h], [isversion6=1], [isversion6=], +[#include +#if LDAP_VENDOR_VERSION < 600 +#error The LDAP C SDK version is not supported +#endif +]) +CPPFLAGS="$save_cppflags" + +if test -z "$isversion6" ; then + AC_MSG_ERROR([The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported]) +fi Index: nspr.m4 =================================================================== RCS file: /cvs/dirsec/dsgw/m4/nspr.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nspr.m4 1 Jun 2006 19:43:50 -0000 1.1.1.1 +++ nspr.m4 10 Jan 2008 01:19:36 -0000 1.2 @@ -1,5 +1,5 @@ # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or @@ -30,6 +30,7 @@ NSPRDIR=$withval nspr_inc="-I$NSPRDIR/include" nspr_lib="-L$NSPRDIR/lib" + nspr_libdir="$NSPRDIR/lib" else echo AC_MSG_ERROR([$withval not found]) @@ -60,6 +61,7 @@ then AC_MSG_RESULT([using $withval]) nspr_lib="-L$withval" + nspr_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -70,13 +72,20 @@ # if NSPR is not found yet, try pkg-config # last resort -if test -z "$nspr_inc" -o -z "$nspr_lib"; then - AC_MSG_CHECKING(for nspr with pkg-config) +if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_MSG_CHECKING(for nspr with pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists nspr; then nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` nspr_lib=`$PKG_CONFIG --libs-only-L nspr` + nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ .*$//` + AC_MSG_RESULT([using system NSPR]) + elif $PKG_CONFIG --exists dirsec-nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr` + nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ .*$//` + AC_MSG_RESULT([using system dirsec NSPR]) else AC_MSG_ERROR([NSPR not found, specify with --with-nspr.]) fi Index: nss.m4 =================================================================== RCS file: /cvs/dirsec/dsgw/m4/nss.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nss.m4 1 Jun 2006 19:43:50 -0000 1.1.1.1 +++ nss.m4 10 Jan 2008 01:19:36 -0000 1.2 @@ -1,5 +1,5 @@ # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or @@ -30,6 +30,7 @@ NSSDIR=$withval nss_inc="-I$NSSDIR/include" nss_lib="-L$NSSDIR/lib" + nss_libdir="$NSSDIR/lib" else echo AC_MSG_ERROR([$withval not found]) @@ -60,6 +61,7 @@ then AC_MSG_RESULT([using $withval]) nss_lib="-L$withval" + nss_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -70,13 +72,20 @@ # if NSS is not found yet, try pkg-config # last resort -if test -z "$nss_inc" -o -z "$nss_lib"; then - AC_MSG_CHECKING(for nss with pkg-config) +if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_MSG_CHECKING(for nss with pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists nss; then nss_inc=`$PKG_CONFIG --cflags-only-I nss` nss_lib=`$PKG_CONFIG --libs-only-L nss` + nss_libdir=`$PKG_CONFIG --variable=libdir nss` + AC_MSG_RESULT([using system NSS]) + elif $PKG_CONFIG --exists dirsec-nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss` + nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss` + nss_libdir=`$PKG_CONFIG --variable=libdir dirsec-nss` + AC_MSG_RESULT([using system dirsec NSS]) else AC_MSG_ERROR([NSS not found, specify with --with-nss.]) fi --- httpd.m4 DELETED --- From fedora-directory-commits at redhat.com Thu Jan 10 01:19:38 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 9 Jan 2008 20:19:38 -0500 Subject: [Fedora-directory-commits] dsgw autogen.sh, NONE, 1.1 compile, NONE, 1.1 config.guess, NONE, 1.1 config.sub, NONE, 1.1 ltmain.sh, NONE, 1.1 Makefile.am, 1.2, 1.3 Makefile.in, 1.2, 1.3 aclocal.m4, 1.1.1.1, 1.2 config.c, 1.1.1.1, 1.2 config.h.in, 1.1.1.1, 1.2 configure, 1.2, 1.3 configure.ac, 1.2, 1.3 dsgw.h, 1.1.1.1, 1.2 dsgwgetlang.c, 1.1.1.1, 1.2 dsgwutil.c, 1.1.1.1, 1.2 Message-ID: <200801100119.m0A1JcmX026195@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26138/dsgw Modified Files: Makefile.am Makefile.in aclocal.m4 config.c config.h.in configure configure.ac dsgw.h dsgwgetlang.c dsgwutil.c Added Files: autogen.sh compile config.guess config.sub ltmain.sh Log Message: update of autotool files based on recent ldapserver and adminserver --- NEW FILE autogen.sh --- #!/bin/sh # Check autoconf version AC_VERSION=`autoconf --version | grep '^autoconf' | sed 's/.*) *//'` case $AC_VERSION in '' | 0.* | 1.* | 2.[0-4]* | 2.[0-9] | 2.5[0-8]* ) echo "You must have autoconf version 2.59 or later installed (found version $AC_VERSION)." exit 1 ;; * ) echo "Found autoconf version $AC_VERSION" ;; esac # Check automake version AM_VERSION=`automake --version | grep '^automake' | sed 's/.*) *//'` case $AM_VERSION in 1.1*) echo "Found automake version $AM_VERSION" ;; # 1.10 or later - ok '' | 0.* | 1.[0-8]* | 1.9.[0-5]* ) echo "You must have automake version 1.9.6 or later installed (found version $AM_VERSION)." exit 1 ;; * ) echo "Found automake version $AM_VERSION" ;; esac # Check libtool version LT_VERSION=`libtool --version | grep ' libtool)' | sed 's/.*) \([0-9][0-9.]*\)[^ ]* .*/\1/'` case $LT_VERSION in '' | 0.* | 1.[0-4]* | 1.5.[0-9] | 1.5.[0-1]* | 1.5.2[0-1]* ) echo "You must have libtool version 1.5.22 or later installed (found version $LT_VERSION)." exit 1 ;; * ) echo "Found libtool version $LT_VERSION" ;; esac # Run autoreconf echo "Running autoreconf -fvi" autoreconf -fvi --- NEW FILE compile --- #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. scriptversion=2005-05-14.22 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # 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; either version 2, or (at your option) # any later version. # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # This file is maintained in Automake, please report # bugs to or send patches to # . case $1 in '') echo "$0: No command. Try \`$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] Wrapper for compilers which do not understand `-c -o'. Remove `-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the right script to run: please start by reading the file `INSTALL'. Report bugs to . EOF exit $? ;; -v | --v*) echo "compile $scriptversion" exit $? ;; esac ofile= cfile= eat= for arg do if test -n "$eat"; then eat= else case $1 in -o) # configure might choose to run compile as `compile cc -o foo foo.c'. # So we strip `-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) ofile=$2 ;; *) set x "$@" -o "$2" shift ;; esac ;; *.c) cfile=$1 set x "$@" "$1" shift ;; *) set x "$@" "$1" shift ;; esac fi shift done if test -z "$ofile" || test -z "$cfile"; then # If no `-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no # `.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi # Name of file we expect compiler to create. cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. # Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break fi sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. "$@" ret=$? if test -f "$cofile"; then mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-end: "$" # End: --- NEW FILE config.guess --- #! /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. timestamp='2005-07-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 # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # 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., 51 Franklin Street - Fifth Floor, Boston, MA # 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you # don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. Operation modes: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit Report bugs and patches to ." version="\ 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. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." # Parse command line while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) echo "$timestamp" ; exit ;; --version | -v ) echo "$version" ; exit ;; --help | --h* | -h ) echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. break ;; -* ) echo "$me: invalid option $1$help" >&2 exit 1 ;; * ) break ;; esac done if test $# != 0; then echo "$me: too many arguments$help" >&2 exit 1 fi trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. set_cc_for_build=' 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" ; } || { 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 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? os=netbsd else os=netbsdelf fi ;; *) os=netbsd ;; esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. case "${UNAME_VERSION}" in Debian*) release='-gnu' ;; *) release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE="alpha" ;; "EV4.5 (21064)") UNAME_MACHINE="alpha" ;; "LCA4 (21066/21068)") UNAME_MACHINE="alpha" ;; "EV5 (21164)") UNAME_MACHINE="alphaev5" ;; "EV5.6 (21164A)") UNAME_MACHINE="alphaev56" ;; "EV5.6 (21164PC)") UNAME_MACHINE="alphapca56" ;; "EV5.7 (21164PC)") UNAME_MACHINE="alphapca57" ;; "EV6 (21264)") UNAME_MACHINE="alphaev6" ;; "EV6.7 (21264A)") UNAME_MACHINE="alphaev67" ;; "EV6.8CB (21264C)") UNAME_MACHINE="alphaev68" ;; "EV6.8AL (21264B)") UNAME_MACHINE="alphaev68" ;; "EV6.8CX (21264D)") UNAME_MACHINE="alphaev68" ;; "EV6.9A (21264/EV69A)") UNAME_MACHINE="alphaev69" ;; "EV7 (21364)") UNAME_MACHINE="alphaev7" ;; "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition exit ;; *:z/VM:*:*) echo s390-ibm-zvmoe exit ;; *:OS400:*:*) echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm:riscos:*:*|arm:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd fi exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} ;; sun4) echo sparc-sun-sunos${UNAME_RELEASE} ;; esac exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF $CC_FOR_BUILD -o $dummy $dummy.c && dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`$dummy $dummyarg` && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ [ ${TARGET_BINARY_INTERFACE}x = x ] then echo m88k-dg-dgux${UNAME_RELEASE} else echo m88k-dg-dguxbcs${UNAME_RELEASE} fi else echo i586-dg-dgux${UNAME_RELEASE} fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include main() { if (!__power_pc()) exit(1); puts("powerpc-ibm-aix3.2.5"); exit(0); } EOF if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` then echo "$SYSTEM_NAME" else echo rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi exit ;; *:AIX:*:[45]) 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 else IBM_ARCH=powerpc fi if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include #include int main () { #if defined(_SC_KERNEL_BITS) long bits = sysconf(_SC_KERNEL_BITS); #endif long cpu = sysconf (_SC_CPU_VERSION); switch (cpu) { case CPU_PA_RISC1_0: puts ("hppa1.0"); break; case CPU_PA_RISC1_1: puts ("hppa1.1"); break; case CPU_PA_RISC2_0: #if defined(_SC_KERNEL_BITS) switch (bits) { case 64: puts ("hppa2.0w"); break; case 32: puts ("hppa2.0n"); break; default: puts ("hppa2.0"); break; } break; #else /* !defined(_SC_KERNEL_BITS) */ puts ("hppa2.0"); break; #endif default: puts ("hppa1.0"); break; } exit (0); } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac if [ ${HP_ARCH} = "hppa2.0w" ] then eval $set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler # generating 64-bit code. GNU and HP use different nomenclature: # # $ CC_FOR_BUILD=cc ./config.guess # => hppa2.0w-hp-hpux11.23 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else HP_ARCH="hppa64" fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int main () { long cpu = sysconf (_SC_CPU_VERSION); /* The order matters, because CPU_IS_HP_MC68K erroneously returns true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct results, however. */ if (CPU_IS_PA_RISC (cpu)) { switch (cpu) { case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; default: puts ("hppa-hitachi-hiuxwe2"); break; } } else if (CPU_IS_HP_MC68K (cpu)) puts ("m68k-hitachi-hiuxwe2"); else puts ("unknown-hitachi-hiuxwe2"); exit (0); } EOF $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU #undef mips #undef mipsel #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) CPU=mipsel #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) CPU=mips #else CPU= #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU #undef mips64 #undef mips64el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) CPU=mips64el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) CPU=mips64 #else CPU= #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; PCA57) UNAME_MACHINE=alphapca56 ;; EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in PA7*) echo hppa1.1-unknown-linux-gnu ;; PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; x86_64:Linux:*:*) echo x86_64-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 # problems with other programs or directories called `ld' in the path. # Set LC_ALL=C to ensure ld outputs messages in English. ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// s/ .*// p'` case "$ld_supported_targets" in elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 LIBC=gnu # else LIBC=gnulibc1 # endif # else LIBC=gnulibc1 # endif #else #ifdef __INTEL_COMPILER LIBC=gnu #else LIBC=gnuaout #endif #endif #ifdef __dietlibc__ LIBC=dietlibc #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit } test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit ;; i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; paragon:*:*:*) echo i860-intel-osf1 exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` echo ${UNAME_MACHINE}-sni-sysv4 else echo ns32k-sni-sysv fi exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 exit ;; *:*:*:FTX*) # From seanf at swdc.stratus.com. echo i860-stratus-sysv4 exit ;; i*86:VOS:*:*) # From Paul.Green at stratus.com. echo ${UNAME_MACHINE}-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green at stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit ;; *: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} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. if test "$cputype" = "386"; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 exit ;; *:ITS:*:*) echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix exit ;; i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 eval $set_cc_for_build cat >$dummy.c < # include #endif main () { #if defined (sony) #if defined (MIPSEB) /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, I don't know.... */ printf ("mips-sony-bsd\n"); exit (0); #else #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 "4" #else "" #endif ); exit (0); #endif #endif #if defined (__arm) && defined (__acorn) && defined (__unix) printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) printf ("m68k-hp-bsd\n"); exit (0); #endif #if defined (NeXT) #if !defined (__ARCHITECTURE__) #define __ARCHITECTURE__ "m68k" #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif #if defined (MULTIMAX) || defined (n16) #if defined (UMAXV) printf ("ns32k-encore-sysv\n"); exit (0); #else #if defined (CMU) printf ("ns32k-encore-mach\n"); exit (0); #else printf ("ns32k-encore-bsd\n"); exit (0); #endif #endif #endif #if defined (__386BSD__) printf ("i386-pc-bsd\n"); exit (0); #endif #if defined (sequent) #if defined (i386) printf ("i386-sequent-dynix\n"); exit (0); #endif #if defined (ns32000) printf ("ns32k-sequent-dynix\n"); exit (0); #endif #endif #if defined (_SEQUENT_) struct utsname un; uname(&un); if (strncmp(un.version, "V2", 2) == 0) { printf ("i386-sequent-ptx2\n"); exit (0); } if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ printf ("i386-sequent-ptx1\n"); exit (0); } printf ("i386-sequent-ptx\n"); exit (0); #endif #if defined (vax) # if !defined (ultrix) # include # if defined (BSD) # if BSD == 43 printf ("vax-dec-bsd4.3\n"); exit (0); # else # if BSD == 199006 printf ("vax-dec-bsd4.3reno\n"); exit (0); # else printf ("vax-dec-bsd\n"); exit (0); # endif # endif # else printf ("vax-dec-bsd\n"); exit (0); # endif # else printf ("vax-dec-ultrix\n"); exit (0); # endif #endif #if defined (alliant) && defined (i860) printf ("i860-alliant-bsd\n"); exit (0); #endif exit (1); } EOF $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) if [ -x /usr/convex/getsysinfo ] then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi exit ;; c34*) echo c34-convex-bsd exit ;; c38*) echo c38-convex-bsd exit ;; c4*) echo c4-convex-bsd exit ;; esac fi cat >&2 < in order to provide the needed information to handle your system. config.guess timestamp = $timestamp uname -m = `(uname -m) 2>/dev/null || echo unknown` uname -r = `(uname -r) 2>/dev/null || echo unknown` uname -s = `(uname -s) 2>/dev/null || echo unknown` uname -v = `(uname -v) 2>/dev/null || echo unknown` /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` /bin/uname -X = `(/bin/uname -X) 2>/dev/null` hostinfo = `(hostinfo) 2>/dev/null` /bin/universe = `(/bin/universe) 2>/dev/null` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` /bin/arch = `(/bin/arch) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` UNAME_MACHINE = ${UNAME_MACHINE} UNAME_RELEASE = ${UNAME_RELEASE} UNAME_SYSTEM = ${UNAME_SYSTEM} UNAME_VERSION = ${UNAME_VERSION} EOF exit 1 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: --- NEW FILE config.sub --- #! /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. timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. # # 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 # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # 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., 51 Franklin Street - Fifth Floor, Boston, MA # 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. # Each package is responsible for reporting which valid configurations # it does not support. The user should be able to distinguish # a failure to support a valid configuration from a meaningless # configuration. # The goal of this file is to map all the various variations of a given # machine specification into a single specification in the form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM # or in some cases, the newer four-part form: # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS $0 [OPTION] ALIAS Canonicalize a configuration name. Operation modes: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit Report bugs and patches to ." 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. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." # Parse command line while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) echo "$timestamp" ; exit ;; --version | -v ) echo "$version" ; exit ;; --help | --h* | -h ) echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. break ;; -* ) echo "$me: invalid option $1$help" exit 1 ;; *local*) # First pass through any local machine types. echo $1 exit ;; * ) break ;; esac done case $# in 0) echo "$me: missing argument$help" >&2 exit 1;; 1) ;; *) echo "$me: too many arguments$help" >&2 exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # 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*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] then os=`echo $1 | sed 's/.*-/-/'` else os=; fi ;; esac ### Let's recognize common machines as not being operating systems so ### that things like config.sub decstation-3100 work. We also ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in -sun*os*) # Prevent following clause from handling this invalid input. ;; -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 ;; -scout) ;; -wrs) os=-vxworks basic_machine=$1 ;; -chorusos*) os=-chorusos basic_machine=$1 ;; -chorusrdb) os=-chorusrdb basic_machine=$1 ;; -hiux*) os=-hiuxwe2 ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # 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/'` ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -lynx*) os=-lynxos ;; -ptx*) basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; -windowsnt*) os=`echo $os | sed -e 's/windowsnt/winnt/'` ;; -psos*) os=-psos ;; -mint | -mint[0-9]*) basic_machine=m68k-atari os=-mint ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ | 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 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | 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 \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | ms1 \ | msp430 \ | 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 \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | 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 os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | ms1-* \ | msp430-* \ | 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-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | 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-* \ | ymp-* \ | z8k-*) ;; m32c-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-unknown os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; a29khif) basic_machine=a29k-amd os=-udi ;; abacus) basic_machine=abacus-unknown ;; adobe68k) basic_machine=m68010-adobe os=-scout ;; alliant | fx80) basic_machine=fx80-alliant ;; altos | altos3068) basic_machine=m68k-altos ;; am29k) basic_machine=a29k-none os=-bsd ;; amd64) basic_machine=x86_64-pc ;; amd64-*) basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) basic_machine=m68k-unknown ;; amigaos | amigados) basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; apollo68bsd) basic_machine=m68k-apollo os=-bsd ;; aux) basic_machine=m68k-apple os=-aux ;; balance) basic_machine=ns32k-sequent os=-dynix ;; c90) basic_machine=c90-cray os=-unicos ;; convex-c1) basic_machine=c1-convex os=-bsd ;; convex-c2) basic_machine=c2-convex os=-bsd ;; convex-c32) basic_machine=c32-convex os=-bsd ;; convex-c34) basic_machine=c34-convex os=-bsd ;; convex-c38) basic_machine=c38-convex os=-bsd ;; cray | j90) basic_machine=j90-cray os=-unicos ;; craynv) basic_machine=craynv-cray os=-unicosmp ;; cr16c) basic_machine=cr16c-unknown os=-elf ;; crds | unos) basic_machine=m68k-crds ;; crisv32 | crisv32-* | etraxfs*) basic_machine=crisv32-axis ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; crx) basic_machine=crx-unknown os=-elf ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; decsystem10* | dec10*) basic_machine=pdp10-dec os=-tops10 ;; decsystem20* | dec20*) basic_machine=pdp10-dec os=-tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola ;; delta88) basic_machine=m88k-motorola os=-sysv3 ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx ;; dpx2* | dpx2*-bull) basic_machine=m68k-bull os=-sysv3 ;; ebmon29k) basic_machine=a29k-amd os=-ebmon ;; elxsi) basic_machine=elxsi-elxsi os=-bsd ;; encore | umax | mmax) basic_machine=ns32k-encore ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson os=-ose ;; fx2800) basic_machine=i860-alliant ;; genix) basic_machine=ns32k-ns ;; gmicro) basic_machine=tron-gmicro os=-sysv ;; go32) basic_machine=i386-pc os=-go32 ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; h8300hms) basic_machine=h8300-hitachi os=-hms ;; h8300xray) basic_machine=h8300-hitachi os=-xray ;; h8500hms) basic_machine=h8500-hitachi os=-hms ;; harris) basic_machine=m88k-harris os=-sysv3 ;; hp300-*) basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp os=-bsd ;; hp300hpux) basic_machine=m68k-hp os=-hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) basic_machine=hppa1.0-hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) basic_machine=hppa1.1-hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp basic_machine=hppa1.1-hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp basic_machine=hppa1.1-hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; hppa-next) os=-nextstep3 ;; hppaosf) basic_machine=hppa1.1-hp os=-osf ;; hppro) basic_machine=hppa1.1-hp os=-proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; i386-vsta | vsta) basic_machine=i386-unknown os=-vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in -irix*) ;; *) os=-irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi os=-sysv ;; m88k-omron*) basic_machine=m88k-omron ;; magnum | m3230) basic_machine=mips-mips os=-sysv ;; merlin) basic_machine=ns32k-utek os=-sysv ;; mingw32) basic_machine=i386-pc os=-mingw32 ;; miniframe) basic_machine=m68000-convergent ;; *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k os=-coff ;; morphos) basic_machine=powerpc-unknown os=-morphos ;; msdos) basic_machine=i386-pc os=-msdos ;; mvs) basic_machine=i370-ibm os=-mvs ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; netbsd386) basic_machine=i386-unknown os=-netbsd ;; netwinder) basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos ;; news1000) basic_machine=m68030-sony os=-newsos ;; news-3600 | risc-news) basic_machine=mips-sony os=-newsos ;; necv70) basic_machine=v70-nec os=-sysv ;; next | m*-next ) basic_machine=m68k-next case $os in -nextstep* ) ;; -ns2*) os=-nextstep2 ;; *) os=-nextstep3 ;; esac ;; nh3000) basic_machine=m68k-harris os=-cxux ;; nh[45]000) basic_machine=m88k-harris os=-cxux ;; nindy960) basic_machine=i960-intel os=-nindy ;; mon960) basic_machine=i960-intel os=-mon960 ;; nonstopux) basic_machine=mips-compaq os=-nonstopux ;; np1) basic_machine=np1-gould ;; nsr-tandem) basic_machine=nsr-tandem ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) basic_machine=powerpc-ibm os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose ;; os68k) basic_machine=m68k-none os=-os68k ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; paragon) basic_machine=i860-intel os=-osf ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; pentium4) basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentium4-*) basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm ;; pw32) basic_machine=i586-unknown os=-pw32 ;; rom68k) basic_machine=m68k-rom68k os=-coff ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; s390 | s390-*) basic_machine=s390-ibm ;; s390x | s390x-*) basic_machine=s390x-ibm ;; sa29200) basic_machine=a29k-amd os=-udi ;; sb1) basic_machine=mipsisa64sb1-unknown ;; sb1el) basic_machine=mipsisa64sb1el-unknown ;; sei) basic_machine=mips-sei os=-seiux ;; sequent) basic_machine=i386-sequent ;; sh) basic_machine=sh-hitachi os=-hms ;; sh64) basic_machine=sh64-unknown ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; sps7) basic_machine=m68k-bull os=-sysv2 ;; spur) basic_machine=spur-unknown ;; st2000) basic_machine=m68k-tandem ;; stratus) basic_machine=i860-stratus os=-sysv4 ;; sun2) basic_machine=m68000-sun ;; sun2os3) basic_machine=m68000-sun os=-sunos3 ;; sun2os4) basic_machine=m68000-sun os=-sunos4 ;; sun3os3) basic_machine=m68k-sun os=-sunos3 ;; sun3os4) basic_machine=m68k-sun os=-sunos4 ;; sun4os3) basic_machine=sparc-sun os=-sunos3 ;; sun4os4) basic_machine=sparc-sun os=-sunos4 ;; sun4sol2) basic_machine=sparc-sun os=-solaris2 ;; sun3 | sun3-*) basic_machine=m68k-sun ;; sun4) basic_machine=sparc-sun ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; sv1) basic_machine=sv1-cray os=-unicos ;; symmetry) basic_machine=i386-sequent os=-dynix ;; t3e) basic_machine=alphaev5-cray os=-unicos ;; t90) basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; tic55x | c55x*) basic_machine=tic55x-unknown os=-coff ;; tic6x | c6x*) basic_machine=tic6x-unknown os=-coff ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; toad1) basic_machine=pdp10-xkl os=-tops20 ;; tower | tower-32) basic_machine=m68k-ncr ;; tpf) basic_machine=s390x-ibm os=-tpf ;; udi29k) basic_machine=a29k-amd os=-udi ;; ultra3) basic_machine=a29k-nyu os=-sym1 ;; v810 | necv810) basic_machine=v810-nec os=-none ;; vaxv) basic_machine=vax-dec os=-sysv ;; vms) basic_machine=vax-dec os=-vms ;; vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) basic_machine=i960-wrs os=-vxworks ;; vxworks68) basic_machine=m68k-wrs os=-vxworks ;; vxworks29k) basic_machine=a29k-wrs os=-vxworks ;; w65*) basic_machine=w65-wdc os=-none ;; w89k-*) basic_machine=hppa1.1-winbond os=-proelf ;; xbox) basic_machine=i686-pc os=-mingw32 ;; xps | xps100) basic_machine=xps100-honeywell ;; ymp) basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim ;; none) basic_machine=none-none os=-none ;; # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. w89k) basic_machine=hppa1.1-winbond ;; op50n) basic_machine=hppa1.1-oki ;; op60c) basic_machine=hppa1.1-oki ;; romp) basic_machine=romp-ibm ;; mmix) basic_machine=mmix-knuth ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; pdp10) # there are many clones, so DEC is not a safe bet basic_machine=pdp10-unknown ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) basic_machine=cydra-cydrome ;; orion) basic_machine=orion-highlevel ;; orion105) basic_machine=clipper-highlevel ;; mac | mpw | mac-mpw) basic_machine=m68k-apple ;; pmac | pmac-mpw) basic_machine=powerpc-apple ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ;; *-commodore*) basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ;; *) ;; esac # Decode manufacturer-specific aliases for certain operating systems. if [ x"$os" != x"" ] then case $os in # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -solaris) os=-solaris2 ;; -svr4*) os=-sysv4 ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # First accept the basic system types. # The portable systems comes first. # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | -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* \ | -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*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) case $basic_machine in x86-* | i*86-*) ;; *) os=-nto$os ;; esac ;; -nto-qnx*) ;; -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition ;; -os400*) os=-os400 ;; -wince*) os=-wince ;; -osfrose*) os=-osfrose ;; -osf*) os=-osf ;; -utek*) os=-bsd ;; -dynix*) os=-bsd ;; -acis*) os=-aos ;; -atheos*) os=-atheos ;; -syllable*) os=-syllable ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -nova*) os=-rtmk-nova ;; -ns2 ) os=-nextstep2 ;; -nsk*) os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; -sinix*) os=-sysv4 ;; -tpf*) os=-tpf ;; -triton*) os=-sysv3 ;; -oss*) os=-sysv3 ;; -svr4) os=-sysv4 ;; -svr3) os=-sysv3 ;; -sysvr4) os=-sysv4 ;; # This must come after -sysvr4. -sysv*) ;; -ose*) os=-ose ;; -es1800*) os=-ose ;; -xenix) os=-xenix ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; -aros*) os=-aros ;; -kaos*) os=-kaos ;; -zvmoe) os=-zvmoe ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 exit 1 ;; esac else # Here we handle the default operating systems that come with various machines. # The value should be what the vendor currently ships out the door with their # machine or put another way, the most popular os provided with the machine. # Note that if you're going to try to match "-MANUFACTURER" here (say, # "-sun"), then you have to tell the case statement up towards the top # that MANUFACTURER isn't an operating system. Otherwise, code above # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. case $basic_machine in *-acorn) os=-riscix1.2 ;; arm*-rebel) os=-linux ;; arm*-semi) os=-aout ;; c4x-* | tic4x-*) os=-coff ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; pdp11-*) os=-none ;; *-dec | vax-*) os=-ultrix4.2 ;; m68*-apollo) os=-domain ;; i386-sun) os=-sunos4.0.2 ;; m68000-sun) os=-sunos3 # This also exists in the configure program, but was not the # default. # os=-sunos4 ;; m68*-cisco) os=-aout ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; or32-*) os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; *-be) os=-beos ;; *-haiku) os=-haiku ;; *-ibm) os=-aix ;; *-knuth) os=-mmixware ;; *-wec) os=-proelf ;; *-winbond) os=-proelf ;; *-oki) os=-proelf ;; *-hp) os=-hpux ;; *-hitachi) os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) os=-sysv ;; *-cbm) os=-amigaos ;; *-dg) os=-dgux ;; *-dolphin) os=-sysv3 ;; m68k-ccur) os=-rtu ;; m88k-omron*) os=-luna ;; *-next ) os=-nextstep ;; *-sequent) os=-ptx ;; *-crds) os=-unos ;; *-ns) os=-genix ;; i370-*) os=-mvs ;; *-next) os=-nextstep3 ;; *-gould) os=-sysv ;; *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; *-sgi) os=-irix ;; *-siemens) os=-sysv4 ;; *-masscomp) os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; *-rom68k) os=-coff ;; *-*bug) os=-coff ;; *-apple) os=-macos ;; *-atari*) os=-mint ;; *) os=-none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. vendor=unknown case $basic_machine in *-unknown) case $os in -riscix*) vendor=acorn ;; -sunos*) vendor=sun ;; -aix*) vendor=ibm ;; -beos*) vendor=be ;; -hpux*) vendor=hp ;; -mpeix*) vendor=hp ;; -hiux*) vendor=hitachi ;; -unos*) vendor=crds ;; -dgux*) vendor=dg ;; -luna*) vendor=omron ;; -genix*) vendor=ns ;; -mvs* | -opened*) vendor=ibm ;; -os400*) vendor=ibm ;; -ptx*) vendor=sequent ;; -tpf*) vendor=ibm ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) vendor=apple ;; -hms*) vendor=hitachi ;; -mpw* | -macos*) vendor=apple ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; -vos*) vendor=stratus ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: --- NEW FILE ltmain.sh --- # 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. # Originally by Gordon Matzigkeit , 1996 # # 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; either version 2 of the License, or # (at your option) any later version. # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. basename="s,^.*/,,g" # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh # is ksh but when the shell is invoked as "sh" and the current value of # the _XPG environment variable is not equal to 1 (one), the special # positional parameter $0, within a function call, is the name of the # function. progpath="$0" # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" # Global variables: EXIT_SUCCESS=0 EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool VERSION=1.5.22 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # 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 # Check that we have a working $echo. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then # Avoid inline document here, it may be left over : elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then # Yippee, $echo works! : else # Restart under the correct shell, and then maybe $echo will work. exec $SHELL "$progpath" --no-reexec ${1+"$@"} fi if test "X$1" = X--fallback-echo; then # used as fallback echo shift cat <&2 $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 exit $EXIT_FAILURE fi # Global variables. mode=$default_mode nonopt= prev= prevopt= run= show="$echo" show_help= execute_dlfiles= duplicate_deps=no preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" extracted_archives= extracted_serial=0 ##################################### # Shell function definitions: # This seems to be the best place for them # func_mktempdir [string] # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If # given, STRING is the basename for that directory. func_mktempdir () { my_template="${TMPDIR-/tmp}/${1-$progname}" if test "$run" = ":"; then # Return a directory name, but don't create it in dry-run mode my_tmpdir="${my_template}-$$" else # If mktemp works, use that first and foremost my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` if test ! -d "$my_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race my_tmpdir="${my_template}-${RANDOM-0}$$" save_mktempdir_umask=`umask` umask 0077 $mkdir "$my_tmpdir" umask $save_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure test -d "$my_tmpdir" || { $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 exit $EXIT_FAILURE } fi $echo "X$my_tmpdir" | $Xsed } # func_win32_libid arg # return the library type of file 'arg' # # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. func_win32_libid () { win32_libid_type="unknown" [...6512 lines suppressed...] compile compile a source file into a libtool object execute automatically set library path, then run a program finish complete the installation of libtool libraries install install libraries or executables link create a library or an executable uninstall remove libraries from an installed directory MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for a more detailed description of MODE. Report bugs to ." exit $EXIT_SUCCESS ;; clean) $echo \ "Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE (typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated with it are deleted. Otherwise, only FILE itself is deleted using RM." ;; compile) $echo \ "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE Compile a source file into a libtool library object. This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -prefer-pic try to building PIC objects only -prefer-non-pic try to building non-PIC objects only -static always build a \`.o' file suitable for static linking COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from SOURCEFILE, then substituting the C source code suffix \`.c' with the library object suffix, \`.lo'." ;; execute) $echo \ "Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... Automatically set library path, then run a program. This mode accepts the following additional options: -dlopen FILE add the directory containing FILE to the library path This mode sets the library path environment variable according to \`-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated into their corresponding uninstalled binary, and any of their required library directories are added to the library path. Then, COMMAND is executed, with ARGS as arguments." ;; finish) $echo \ "Usage: $modename [OPTION]... --mode=finish [LIBDIR]... Complete the installation of libtool libraries. Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use the \`--dry-run' option if you just want to see what would be executed." ;; install) $echo \ "Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be either the \`install' or \`cp' program. The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." ;; link) $echo \ "Usage: $modename [OPTION]... --mode=link LINK-COMMAND... Link object files or libraries together to form another library, or to create an executable program. LINK-COMMAND is a command using the C compiler that you would use to create a program from several object files. The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -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 -export-symbols-regex 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 -no-fast-install disable the fast-install mode -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -objectlist FILE Use a list of object files found in FILE to specify objects -precious-files-regex REGEX don't remove output files matching REGEX -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 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] All other options (arguments beginning with \`-') are ignored. Every other argument is treated as a filename. Files ending in \`.la' are treated as uninstalled libtool libraries, other files are standard or library object files. If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only library objects (\`.lo' files) may be specified, and \`-rpath' is required, except when creating a convenience library. If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created using \`ar' and \`ranlib', or on Windows using \`lib'. If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file is created, otherwise an executable program is created." ;; uninstall) $echo \ "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE (typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. Otherwise, only FILE itself is deleted using RM." ;; *) $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 exit $EXIT_FAILURE ;; esac $echo $echo "Try \`$modename --help' for more information about other modes." exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support # them. This is particularly important on AIX, because we don't # support having both static and shared libraries enabled at the same # time on that platform, so we default to a shared-only configuration. # If a disable-shared tag is given, we'll fallback to a static-only # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared disable_libs=shared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static disable_libs=static # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 2 Jun 2006 22:57:17 -0000 1.2 +++ Makefile.am 10 Jan 2008 01:19:36 -0000 1.3 @@ -21,22 +21,42 @@ # look for included m4 files in the ./m4/ directory ACLOCAL_AMFLAGS = -I m4 -cgibindir = @cgibindir@ -htmldir = @htmldir@ -pbhtmldir = @pbhtmldir@ +instconfigdir = @instconfigdir@ +cgibindir = $(libdir)@cgibindir@ +htmldir = $(datadir)@htmldir@ +pbhtmldir = $(datadir)@pbhtmldir@ # config is a bit of a misnomer - these are really configurable templates -configdir = @configdir@ -pbconfigdir = @pbconfigdir@ +configdir = $(datadir)@configdir@ +pbconfigdir = $(datadir)@pbconfigdir@ +propertydir=$(datadir)@propertydir@ # the context dir is where the application specific config files go -contextdir = @contextdir@ +contextdir = $(instconfigdir)@contextdir@ +securitydir=$(instconfigdir)@securitydir@ +# relative to $localstatedir +cookiedir=$(localstatedir)@cookiedir@ -DSGW_VER_STR := "Fedora-Directory-Gateway/1.0.2" +DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)" -DEFS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" - -INCLUDES = @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \ + -I$(srcdir)/include -I$(srcdir)/include/base +if WINNT +AM_CPPFLAGS += -DXP_WINNT +else +AM_CPPFLAGS += -DXP_UNIX +endif -LIBS = @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 +AM_CPPFLAGS +=-DPROPERTYDIR=\"$(propertydir)\" \ + -DHTMLDIR=\"$(htmldir)\" -DCOOKIEDIR=\"$(cookiedir)\" \ + -DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \ + -DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \ + -DINSTCONFIGDIR=\"$(instconfigdir)\" -DMANUALDIR=\"$(manualdir)\" + +LIBS = @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ \ + @icu_lib@ -licui18n -licuuc -licudata \ + @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \ + @sasl_lib@ -lsasl2 \ + @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \ + @nspr_lib@ -lplds4 -lplc4 -lnspr4 # these are programs which we do not want to link with nss NEED_SECGLUE = unauth search csearch newentry tutor lang @@ -56,9 +76,6 @@ COMMON_SOURCES = htmlout.c htmlparse.c error.c cgiutil.c dsgwutil.c ldaputil.c \ entrydisplay.c config.c cookie.c emitauth.c emitf.c collate.c vcard.c \ Versiongw.c utf8compare.c dsgwgetlang.c -if NEED_LDIF -COMMON_SOURCES += line64.c fileurl.c -endif unauth_SOURCES = unauth.c $(COMMON_SOURCES) secglue.c search_SOURCES = search.c $(COMMON_SOURCES) secglue.c @@ -147,7 +164,7 @@ pbconfig/dsgwfilter.conf pbconfig/pb.tmpl nodist_context_DATA = dsgw-httpd.conf -nodist_context_SCRIPTS = setup +#nodist_context_SCRIPTS = setup-dirsrv-gw # add more here for localized bundles nodist_property_DATA = dsgw_root.res @@ -158,7 +175,7 @@ if WINNT ICU_GENRB = @icu_bin@/genrb.exe else -ICU_GENRB = sh genrb_wrapper.sh @icu_bin@ @icu_lib@ +ICU_GENRB = sh $(srcdir)/genrb_wrapper.sh @icu_bin@ @icu_lib@ endif # The root resource bundle is based on English (en) locale; @@ -190,3 +207,38 @@ %_de.res : %_de.properties $(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name dsgw $+ + +# these are for the config files and scripts that we need to generate and replace +# the paths and other tokens with the real values set during configure/make +# note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this: +# ADMConfigDir = ${prefix}/etc/packagename +# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead: +# ADMConfigDir = /etc/packagename +fixupcmd = sed \ + -e 's, at bindir\@,$(bindir),g' \ + -e 's, at sbindir\@,$(sbindir),g' \ + -e 's, at localstatedir\@,$(localstatedir),g' \ + -e 's, at cgibindir\@,$(cgibindir),g' \ + -e 's, at cgiuri\@,$(cgiuri),g' \ + -e 's, at cmdbindir\@,$(cmdbindir),g' \ + -e 's, at propertydir\@,$(propertydir),g' \ + -e 's, at htmldir\@,$(htmldir),g' \ + -e 's, at pbhtmldir\@,$(pbhtmldir),g' \ + -e 's, at configdir\@,$(configdir),g' \ + -e 's, at pbconfigdir\@,$(pbconfigdir),g' \ + -e 's, at contextdir\@,$(contextdir),g' \ + -e 's, at securitydir\@,$(securitydir),g' \ + -e 's, at instconfigdir\@,$(instconfigdir),g' \ + -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \ + -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \ + -e 's, at package_name\@,$(PACKAGE_NAME),g' \ + -e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \ + -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ + -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \ + -e 's, at brand\@,$(brand),g' \ + -e 's, at capbrand\@,$(capbrand),g' \ + -e 's, at vendor\@,$(vendor),g' + +% : %.in + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(fixupcmd) $< > $@ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 2 Jun 2006 22:57:17 -0000 1.2 +++ Makefile.in 10 Jan 2008 01:19:36 -0000 1.3 @@ -35,7 +35,6 @@ # END COPYRIGHT BLOCK - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -56,21 +55,24 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ + at WINNT_TRUE@am__append_1 = -DXP_WINNT + at WINNT_FALSE@am__append_2 = -DXP_UNIX cgibin_PROGRAMS = auth$(EXEEXT) doauth$(EXEEXT) edit$(EXEEXT) \ domodify$(EXEEXT) dnedit$(EXEEXT) dosearch$(EXEEXT) \ $(am__EXEEXT_1) noinst_PROGRAMS = propmaker$(EXEEXT) - at NEED_LDIF_TRUE@am__append_1 = line64.c fileurl.c -subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \ $(dist_html_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config-h.in $(srcdir)/dsgw-httpd.conf.in \ - $(srcdir)/setup.in $(top_srcdir)/configure AUTHORS ChangeLog \ - NEWS depcomp install-sh missing + $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \ + ChangeLog NEWS 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/httpd.m4 \ - $(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ + $(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/sasl.m4 \ $(top_srcdir)/m4/mozldap.m4 $(top_srcdir)/m4/icu.m4 \ $(top_srcdir)/m4/adminutil.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -79,134 +81,85 @@ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = setup dsgw-httpd.conf +CONFIG_CLEAN_FILES = am__EXEEXT_1 = unauth$(EXEEXT) search$(EXEEXT) csearch$(EXEEXT) \ newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT) -am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(contextdir)" \ - "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" \ - "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" \ - "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)" +am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" \ + "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" \ + "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" \ + "$(DESTDIR)$(propertydir)" cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(cgibin_PROGRAMS) $(noinst_PROGRAMS) -am__auth_SOURCES_DIST = auth.c htmlout.c htmlparse.c error.c cgiutil.c \ - dsgwutil.c ldaputil.c entrydisplay.c config.c cookie.c \ - emitauth.c emitf.c collate.c vcard.c Versiongw.c utf8compare.c \ - dsgwgetlang.c line64.c fileurl.c - at NEED_LDIF_TRUE@am__objects_1 = line64.$(OBJEXT) fileurl.$(OBJEXT) -am__objects_2 = htmlout.$(OBJEXT) htmlparse.$(OBJEXT) error.$(OBJEXT) \ +am__objects_1 = htmlout.$(OBJEXT) htmlparse.$(OBJEXT) error.$(OBJEXT) \ cgiutil.$(OBJEXT) dsgwutil.$(OBJEXT) ldaputil.$(OBJEXT) \ entrydisplay.$(OBJEXT) config.$(OBJEXT) cookie.$(OBJEXT) \ emitauth.$(OBJEXT) emitf.$(OBJEXT) collate.$(OBJEXT) \ vcard.$(OBJEXT) Versiongw.$(OBJEXT) utf8compare.$(OBJEXT) \ - dsgwgetlang.$(OBJEXT) $(am__objects_1) -am_auth_OBJECTS = auth.$(OBJEXT) $(am__objects_2) + dsgwgetlang.$(OBJEXT) +am_auth_OBJECTS = auth.$(OBJEXT) $(am__objects_1) auth_OBJECTS = $(am_auth_OBJECTS) auth_LDADD = $(LDADD) -am__csearch_SOURCES_DIST = csearch.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c secglue.c -am_csearch_OBJECTS = csearch.$(OBJEXT) $(am__objects_2) \ +am_csearch_OBJECTS = csearch.$(OBJEXT) $(am__objects_1) \ secglue.$(OBJEXT) csearch_OBJECTS = $(am_csearch_OBJECTS) csearch_LDADD = $(LDADD) -am__dnedit_SOURCES_DIST = dnedit.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c -am_dnedit_OBJECTS = dnedit.$(OBJEXT) $(am__objects_2) +am_dnedit_OBJECTS = dnedit.$(OBJEXT) $(am__objects_1) dnedit_OBJECTS = $(am_dnedit_OBJECTS) dnedit_LDADD = $(LDADD) -am__doauth_SOURCES_DIST = doauth.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c -am_doauth_OBJECTS = doauth.$(OBJEXT) $(am__objects_2) +am_doauth_OBJECTS = doauth.$(OBJEXT) $(am__objects_1) doauth_OBJECTS = $(am_doauth_OBJECTS) doauth_LDADD = $(LDADD) -am__domodify_SOURCES_DIST = domodify.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c -am_domodify_OBJECTS = domodify.$(OBJEXT) $(am__objects_2) +am_domodify_OBJECTS = domodify.$(OBJEXT) $(am__objects_1) domodify_OBJECTS = $(am_domodify_OBJECTS) domodify_LDADD = $(LDADD) -am__dosearch_SOURCES_DIST = dosearch.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c -am_dosearch_OBJECTS = dosearch.$(OBJEXT) $(am__objects_2) +am_dosearch_OBJECTS = dosearch.$(OBJEXT) $(am__objects_1) dosearch_OBJECTS = $(am_dosearch_OBJECTS) dosearch_LDADD = $(LDADD) -am__edit_SOURCES_DIST = edit.c htmlout.c htmlparse.c error.c cgiutil.c \ - dsgwutil.c ldaputil.c entrydisplay.c config.c cookie.c \ - emitauth.c emitf.c collate.c vcard.c Versiongw.c utf8compare.c \ - dsgwgetlang.c line64.c fileurl.c -am_edit_OBJECTS = edit.$(OBJEXT) $(am__objects_2) +am_edit_OBJECTS = edit.$(OBJEXT) $(am__objects_1) edit_OBJECTS = $(am_edit_OBJECTS) edit_LDADD = $(LDADD) -am__lang_SOURCES_DIST = lang.c htmlout.c htmlparse.c error.c cgiutil.c \ - dsgwutil.c ldaputil.c entrydisplay.c config.c cookie.c \ - emitauth.c emitf.c collate.c vcard.c Versiongw.c utf8compare.c \ - dsgwgetlang.c line64.c fileurl.c secglue.c -am_lang_OBJECTS = lang.$(OBJEXT) $(am__objects_2) secglue.$(OBJEXT) +am_lang_OBJECTS = lang.$(OBJEXT) $(am__objects_1) secglue.$(OBJEXT) lang_OBJECTS = $(am_lang_OBJECTS) lang_LDADD = $(LDADD) -am__newentry_SOURCES_DIST = newentry.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c secglue.c -am_newentry_OBJECTS = newentry.$(OBJEXT) $(am__objects_2) \ +am_newentry_OBJECTS = newentry.$(OBJEXT) $(am__objects_1) \ secglue.$(OBJEXT) newentry_OBJECTS = $(am_newentry_OBJECTS) newentry_LDADD = $(LDADD) propmaker_SOURCES = propmaker.c propmaker_OBJECTS = propmaker.$(OBJEXT) propmaker_DEPENDENCIES = ; true -am__search_SOURCES_DIST = search.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c secglue.c -am_search_OBJECTS = search.$(OBJEXT) $(am__objects_2) \ +am_search_OBJECTS = search.$(OBJEXT) $(am__objects_1) \ secglue.$(OBJEXT) search_OBJECTS = $(am_search_OBJECTS) search_LDADD = $(LDADD) -am__tutor_SOURCES_DIST = tutor.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c secglue.c -am_tutor_OBJECTS = tutor.$(OBJEXT) $(am__objects_2) secglue.$(OBJEXT) +am_tutor_OBJECTS = tutor.$(OBJEXT) $(am__objects_1) secglue.$(OBJEXT) tutor_OBJECTS = $(am_tutor_OBJECTS) tutor_LDADD = $(LDADD) -am__unauth_SOURCES_DIST = unauth.c htmlout.c htmlparse.c error.c \ - cgiutil.c dsgwutil.c ldaputil.c entrydisplay.c config.c \ - cookie.c emitauth.c emitf.c collate.c vcard.c Versiongw.c \ - utf8compare.c dsgwgetlang.c line64.c fileurl.c secglue.c -am_unauth_OBJECTS = unauth.$(OBJEXT) $(am__objects_2) \ +am_unauth_OBJECTS = unauth.$(OBJEXT) $(am__objects_1) \ secglue.$(OBJEXT) unauth_OBJECTS = $(am_unauth_OBJECTS) unauth_LDADD = $(LDADD) -nodist_contextSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(nodist_context_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(auth_SOURCES) $(csearch_SOURCES) $(dnedit_SOURCES) \ $(doauth_SOURCES) $(domodify_SOURCES) $(dosearch_SOURCES) \ $(edit_SOURCES) $(lang_SOURCES) $(newentry_SOURCES) \ propmaker.c $(search_SOURCES) $(tutor_SOURCES) \ $(unauth_SOURCES) -DIST_SOURCES = $(am__auth_SOURCES_DIST) $(am__csearch_SOURCES_DIST) \ - $(am__dnedit_SOURCES_DIST) $(am__doauth_SOURCES_DIST) \ - $(am__domodify_SOURCES_DIST) $(am__dosearch_SOURCES_DIST) \ - $(am__edit_SOURCES_DIST) $(am__lang_SOURCES_DIST) \ - $(am__newentry_SOURCES_DIST) propmaker.c \ - $(am__search_SOURCES_DIST) $(am__tutor_SOURCES_DIST) \ - $(am__unauth_SOURCES_DIST) +DIST_SOURCES = $(auth_SOURCES) $(csearch_SOURCES) $(dnedit_SOURCES) \ + $(doauth_SOURCES) $(domodify_SOURCES) $(dosearch_SOURCES) \ + $(edit_SOURCES) $(lang_SOURCES) $(newentry_SOURCES) \ + propmaker.c $(search_SOURCES) $(tutor_SOURCES) \ + $(unauth_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -239,38 +192,67 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUNDLE_FALSE = @BUNDLE_FALSE@ +BUNDLE_TRUE = @BUNDLE_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CXXLINK_REQUIRED_FALSE = @CXXLINK_REQUIRED_FALSE@ +CXXLINK_REQUIRED_TRUE = @CXXLINK_REQUIRED_TRUE@ CYGPATH_W = @CYGPATH_W@ -DEFS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" +DEFS = @DEFS@ DEPDIR = @DEPDIR@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -HTTPD = @HTTPD@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +HPUX_FALSE = @HPUX_FALSE@ +HPUX_TRUE = @HPUX_TRUE@ ICU_CONFIG = @ICU_CONFIG@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LIBCRUN = @LIBCRUN@ +LIBCSTD = @LIBCSTD@ +LIBNSL = @LIBNSL@ LIBOBJS = @LIBOBJS@ -LIBS = @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 +LIBS = @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ \ + @icu_lib@ -licui18n -licuuc -licudata \ + @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \ + @sasl_lib@ -lsasl2 \ + @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \ + @nspr_lib@ -lplds4 -lplc4 -lnspr4 + +LIBSOCKET = @LIBSOCKET@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ NEED_LDIF_FALSE = @NEED_LDIF_FALSE@ NEED_LDIF_TRUE = @NEED_LDIF_TRUE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BASE_NAME = @PACKAGE_BASE_NAME@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -279,46 +261,68 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POW_LIB = @POW_LIB@ +RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SOLARIS_FALSE = @SOLARIS_FALSE@ +SOLARIS_TRUE = @SOLARIS_TRUE@ STRIP = @STRIP@ VERSION = @VERSION@ WINNT_FALSE = @WINNT_FALSE@ WINNT_TRUE = @WINNT_TRUE@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ adminutil_inc = @adminutil_inc@ adminutil_lib = @adminutil_lib@ +adminutil_libdir = @adminutil_libdir@ adminutil_ver = @adminutil_ver@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ -cgibindir = @cgibindir@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +cgibindir = $(libdir)@cgibindir@ cgiuri = @cgiuri@ # config is a bit of a misnomer - these are really configurable templates -configdir = @configdir@ +configdir = $(datadir)@configdir@ # the context dir is where the application specific config files go -contextdir = @contextdir@ -cookiedir = @cookiedir@ +contextdir = $(instconfigdir)@contextdir@ +# relative to $localstatedir +cookiedir = $(localstatedir)@cookiedir@ datadir = @datadir@ exec_prefix = @exec_prefix@ +host = @host@ host_alias = @host_alias@ -htmldir = @htmldir@ -httpdconf = @httpdconf@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = $(datadir)@htmldir@ icu_bin = @icu_bin@ icu_inc = @icu_inc@ icu_lib = @icu_lib@ +icu_libdir = @icu_libdir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +instconfigdir = @instconfigdir@ ldapsdk_inc = @ldapsdk_inc@ ldapsdk_lib = @ldapsdk_lib@ +ldapsdk_libdir = @ldapsdk_libdir@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ @@ -326,24 +330,37 @@ mkdir_p = @mkdir_p@ nspr_inc = @nspr_inc@ nspr_lib = @nspr_lib@ +nspr_libdir = @nspr_libdir@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ +nss_libdir = @nss_libdir@ oldincludedir = @oldincludedir@ -pbconfigdir = @pbconfigdir@ -pbhtmldir = @pbhtmldir@ +pbconfigdir = $(datadir)@pbconfigdir@ +pbhtmldir = $(datadir)@pbhtmldir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -propertydir = @propertydir@ +propertydir = $(datadir)@propertydir@ +sasl_inc = @sasl_inc@ +sasl_lib = @sasl_lib@ +sasl_libdir = @sasl_libdir@ sbindir = @sbindir@ -securitydir = @securitydir@ +securitydir = $(instconfigdir)@securitydir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # look for included m4 files in the ./m4/ directory ACLOCAL_AMFLAGS = -I m4 -DSGW_VER_STR := "Fedora-Directory-Gateway/1.0.2" -INCLUDES = @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)" +AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) \ + @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \ + -I$(srcdir)/include -I$(srcdir)/include/base $(am__append_1) \ + $(am__append_2) -DPROPERTYDIR=\"$(propertydir)\" \ + -DHTMLDIR=\"$(htmldir)\" -DCOOKIEDIR=\"$(cookiedir)\" \ + -DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \ + -DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \ + -DINSTCONFIGDIR=\"$(instconfigdir)\" \ + -DMANUALDIR=\"$(manualdir)\" # these are programs which we do not want to link with nss NEED_SECGLUE = unauth search csearch newentry tutor lang @@ -352,10 +369,10 @@ # last thing on the link line before LIBS, so just have it terminate the command # there and use true to make the LIBS a no-op propmaker_LDADD = ; true # hackery -COMMON_SOURCES = htmlout.c htmlparse.c error.c cgiutil.c dsgwutil.c \ - ldaputil.c entrydisplay.c config.c cookie.c emitauth.c emitf.c \ - collate.c vcard.c Versiongw.c utf8compare.c dsgwgetlang.c \ - $(am__append_1) +COMMON_SOURCES = htmlout.c htmlparse.c error.c cgiutil.c dsgwutil.c ldaputil.c \ + entrydisplay.c config.c cookie.c emitauth.c emitf.c collate.c vcard.c \ + Versiongw.c utf8compare.c dsgwgetlang.c + unauth_SOURCES = unauth.c $(COMMON_SOURCES) secglue.c search_SOURCES = search.c $(COMMON_SOURCES) secglue.c csearch_SOURCES = csearch.c $(COMMON_SOURCES) secglue.c @@ -441,12 +458,12 @@ pbconfig/dsgwfilter.conf pbconfig/pb.tmpl nodist_context_DATA = dsgw-httpd.conf -nodist_context_SCRIPTS = setup +#nodist_context_SCRIPTS = setup-dirsrv-gw # add more here for localized bundles nodist_property_DATA = dsgw_root.res MOSTLYCLEANFILES = dsgw.conf dsgw_root.res dsgw.properties setup dsgw-httpd.conf - at WINNT_FALSE@ICU_GENRB = sh genrb_wrapper.sh @icu_bin@ @icu_lib@ + at WINNT_FALSE@ICU_GENRB = sh $(srcdir)/genrb_wrapper.sh @icu_bin@ @icu_lib@ # Resource Bundle Compiler @WINNT_TRUE at ICU_GENRB = @icu_bin@/genrb.exe @@ -461,14 +478,46 @@ # German resource bundles (for the German localization in the future) RESOURCE_BUNDLES_DE = dsgw_de.res + +# these are for the config files and scripts that we need to generate and replace +# the paths and other tokens with the real values set during configure/make +# note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this: +# ADMConfigDir = ${prefix}/etc/packagename +# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead: +# ADMConfigDir = /etc/packagename +fixupcmd = sed \ + -e 's, at bindir\@,$(bindir),g' \ + -e 's, at sbindir\@,$(sbindir),g' \ + -e 's, at localstatedir\@,$(localstatedir),g' \ + -e 's, at cgibindir\@,$(cgibindir),g' \ + -e 's, at cgiuri\@,$(cgiuri),g' \ + -e 's, at cmdbindir\@,$(cmdbindir),g' \ + -e 's, at propertydir\@,$(propertydir),g' \ + -e 's, at htmldir\@,$(htmldir),g' \ + -e 's, at pbhtmldir\@,$(pbhtmldir),g' \ + -e 's, at configdir\@,$(configdir),g' \ + -e 's, at pbconfigdir\@,$(pbconfigdir),g' \ + -e 's, at contextdir\@,$(contextdir),g' \ + -e 's, at securitydir\@,$(securitydir),g' \ + -e 's, at instconfigdir\@,$(instconfigdir),g' \ + -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \ + -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \ + -e 's, at package_name\@,$(PACKAGE_NAME),g' \ + -e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \ + -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ + -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \ + -e 's, at brand\@,$(brand),g' \ + -e 's, at capbrand\@,$(capbrand),g' \ + -e 's, at vendor\@,$(vendor),g' + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .c .lo .o .obj am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -495,9 +544,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -506,30 +555,27 @@ $(MAKE) stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/config-h.in $(top_builddir)/config.status +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config-h.in: $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ distclean-hdr: -rm -f config.h stamp-h1 -setup: $(top_builddir)/config.status $(srcdir)/setup.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -dsgw-httpd.conf: $(top_builddir)/config.status $(srcdir)/dsgw-httpd.conf.in - cd $(top_builddir) && $(SHELL) ./config.status $@ install-cgibinPROGRAMS: $(cgibin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)" @list='$(cgibin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ + || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(cgibinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cgibindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(cgibinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cgibindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cgibinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cgibindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cgibinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cgibindir)/$$f" || exit 1; \ else :; fi; \ done @@ -542,10 +588,18 @@ done clean-cgibinPROGRAMS: - -test -z "$(cgibin_PROGRAMS)" || rm -f $(cgibin_PROGRAMS) + @list='$(cgibin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES) @rm -f auth$(EXEEXT) $(LINK) $(auth_LDFLAGS) $(auth_OBJECTS) $(auth_LDADD) $(LIBS) @@ -585,25 +639,6 @@ unauth$(EXEEXT): $(unauth_OBJECTS) $(unauth_DEPENDENCIES) @rm -f unauth$(EXEEXT) $(LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS) -install-nodist_contextSCRIPTS: $(nodist_context_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(contextdir)" || $(mkdir_p) "$(DESTDIR)$(contextdir)" - @list='$(nodist_context_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(nodist_contextSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(contextdir)/$$f'"; \ - $(nodist_contextSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(contextdir)/$$f"; \ - else :; fi; \ - done - -uninstall-nodist_contextSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_context_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(contextdir)/$$f'"; \ - rm -f "$(DESTDIR)$(contextdir)/$$f"; \ - done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -629,12 +664,10 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/emitf.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/entrydisplay.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/error.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fileurl.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htmlout.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htmlparse.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lang.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldaputil.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/line64.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/newentry.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/propmaker.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/search.Po at am__quote@ @@ -645,18 +678,37 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vcard.Po at am__quote@ .c.o: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c $< + at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< .c.obj: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \ + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + at am__fastdepCC_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: + at am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: install-dist_configDATA: $(dist_config_DATA) @$(NORMAL_INSTALL) @@ -771,11 +823,11 @@ mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \ + 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 | \ @@ -787,11 +839,11 @@ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \ + 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 | \ @@ -812,7 +864,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/pbconfig $(distdir)/pbhtml + $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/pbconfig $(distdir)/pbhtml @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -938,9 +990,9 @@ exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h +all-am: Makefile $(PROGRAMS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -970,15 +1022,15 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-cgibinPROGRAMS clean-generic clean-noinstPROGRAMS \ - mostlyclean-am +clean-am: clean-cgibinPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-tags + distclean-hdr distclean-libtool distclean-tags dvi: dvi-am @@ -993,7 +1045,7 @@ install-data-am: install-cgibinPROGRAMS install-dist_configDATA \ install-dist_htmlDATA install-dist_pbconfigDATA \ install-dist_pbhtmlDATA install-nodist_contextDATA \ - install-nodist_contextSCRIPTS install-nodist_propertyDATA + install-nodist_propertyDATA install-exec-am: @@ -1012,7 +1064,8 @@ mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf: pdf-am @@ -1025,29 +1078,28 @@ uninstall-am: uninstall-cgibinPROGRAMS uninstall-dist_configDATA \ uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \ uninstall-dist_pbhtmlDATA uninstall-info-am \ - uninstall-nodist_contextDATA uninstall-nodist_contextSCRIPTS \ - uninstall-nodist_propertyDATA + uninstall-nodist_contextDATA uninstall-nodist_propertyDATA .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-cgibinPROGRAMS clean-generic clean-noinstPROGRAMS ctags \ - dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-cgibinPROGRAMS install-data \ + clean-cgibinPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \ + 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-cgibinPROGRAMS install-data \ install-data-am install-dist_configDATA install-dist_htmlDATA \ install-dist_pbconfigDATA install-dist_pbhtmlDATA install-exec \ install-exec-am install-info install-info-am install-man \ - install-nodist_contextDATA install-nodist_contextSCRIPTS \ - install-nodist_propertyDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-cgibinPROGRAMS \ - uninstall-dist_configDATA uninstall-dist_htmlDATA \ - uninstall-dist_pbconfigDATA uninstall-dist_pbhtmlDATA \ - uninstall-info-am uninstall-nodist_contextDATA \ - uninstall-nodist_contextSCRIPTS uninstall-nodist_propertyDATA + install-nodist_contextDATA install-nodist_propertyDATA \ + install-strip 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-cgibinPROGRAMS uninstall-dist_configDATA \ + uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \ + uninstall-dist_pbhtmlDATA uninstall-info-am \ + uninstall-nodist_contextDATA uninstall-nodist_propertyDATA # By default create only the default root bundle (english). @@ -1068,6 +1120,10 @@ %_de.res : %_de.properties $(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name dsgw $+ + +% : %.in + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(fixupcmd) $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.1.1 -r 1.2 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/dsgw/aclocal.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- aclocal.m4 1 Jun 2006 19:43:45 -0000 1.1.1.1 +++ aclocal.m4 10 Jan 2008 01:19:36 -0000 1.2 @@ -11,6 +11,6405 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +# serial 48 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl + +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +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_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + AC_PATH_MAGIC [...6085 lines suppressed...] +# /* ltdll.c starts here */ +# #define WIN32_LEAN_AND_MEAN +# #include +# #undef WIN32_LEAN_AND_MEAN +# #include +# +# #ifndef __CYGWIN__ +# # ifdef __CYGWIN32__ +# # define __CYGWIN__ __CYGWIN32__ +# # endif +# #endif +# +# #ifdef __cplusplus +# extern "C" { +# #endif +# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +# #ifdef __cplusplus +# } +# #endif +# +# #ifdef __CYGWIN__ +# #include +# DECLARE_CYGWIN_DLL( DllMain ); +# #endif +# HINSTANCE __hDllInstance_base; +# +# BOOL APIENTRY +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +# { +# __hDllInstance_base = hInst; +# return TRUE; +# } +# /* ltdll.c ends here */ +])# _LT_AC_FILE_LTDLL_C + + +# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +# --------------------------------- +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) + + +# old names +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) + +# This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL]) + +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) + +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) +]) + +# 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 # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + 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 + 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 +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +]) + # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -489,6 +6888,35 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 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 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. @@ -541,6 +6969,34 @@ rm -f confinc confmf ]) +# Copyright (C) 1999, 2000, 2001, 2003, 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 + +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +]) + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 Index: config.c =================================================================== RCS file: /cvs/dirsec/dsgw/config.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.c 1 Jun 2006 19:43:43 -0000 1.1.1.1 +++ config.c 10 Jan 2008 01:19:36 -0000 1.2 @@ -128,48 +128,6 @@ gc->gc_DefaultLanguage = ""; gc->gc_httpversion = 0; gc->gc_orgchartsearchattr = "uid"; - /* - * Figure out whether we are running under the admin server or not. This - * also determines where our config and html files are. The hackage is: - * if we're running under the admin server: - * configdir is ../../../../admin-serv/config - * htmldir is ../html - * urlpfxmain is "" - * urlpfxcgi is "" - * dbswitchfile is NSHOME/userdb/dbswitch.conf - * - * If we're running under any other HTTP server: - * configdir is ../config - * htmldir is ../config (yes, that's right) - * urlpfxmain is "lang?context=dsgw&file=" - * gc_urlpfxcgi is "/ds" - * dbswitchfile is not used - */ - - /* Get the admin server name and chop off the version number */ - /* vs = dsgw_ch_strdup( ADMSERV_VERSION_STRING ); - if (( p = strchr( vs, '/')) != NULL ) { - *p = '\0'; - }*/ - - /*ss = getenv( "SERVER_SOFTWARE" ); - if ( ss != NULL ) { - if ( !strncasecmp( vs, ss, strlen( vs ))) { - char *server_names;*/ - /* We're running under the admin server */ - /* gc->gc_admserv = 1; - gc->gc_configdir = DSGW_CONFIGDIR_ADMSERV; - gc->gc_tmpldir = DSGW_TMPLDIR_ADMSERV; - gc->gc_urlpfxmain = DSGW_URLPREFIX_MAIN_ADMSERV; - gc->gc_urlpfxcgi = DSGW_URLPREFIX_CGI_ADMSERV;*/ - /* Check if running an end-user CGI under the admin server */ - /* if (( server_names = getenv( "SERVER_NAMES" )) != NULL && - strlen( server_names ) >= 4 && - strncmp( server_names, "user", 4 ) == 0 ) { - gc->gc_enduser = 1; - } - } - }*/ /* * Get the strlen of the http://admin/port because getvp returns Index: config.h.in =================================================================== RCS file: /cvs/dirsec/dsgw/config.h.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.h.in 1 Jun 2006 19:43:42 -0000 1.1.1.1 +++ config.h.in 10 Jan 2008 01:19:36 -0000 1.2 @@ -0,0 +1,257 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* cpu type pa-risc */ +#undef CPU_hppa + +/* cpu type ia64 */ +#undef CPU_ia64 + +/* cpu type sparc */ +#undef CPU_sparc + +/* Enable extra DSGW debugging code */ +#undef DSGW_DEBUG + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `ftruncate' function. */ +#undef HAVE_FTRUNCATE + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isascii' function. */ +#undef HAVE_ISASCII + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the `select' function. */ +#undef HAVE_SELECT + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +#undef HAVE_STAT_EMPTY_STRING_BUG + +/* Define to 1 if stdbool.h conforms to C99. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strpbrk' function. */ +#undef HAVE_STRPBRK + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL + +/* HP-UX */ +#undef HPUX + +/* HP-UX 11 */ +#undef HPUX11 + +/* HP-UX 11.11 */ +#undef HPUX11_11 + +/* HP-UX 11.23 */ +#undef HPUX11_23 + +/* Use FHS layout */ +#undef IS_FHS + +/* Use FHS optional layout */ +#undef IS_FHS_OPT + +/* Linux */ +#undef LINUX + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#undef LSTAT_FOLLOWS_SLASHED_SYMLINK + +/* Linux */ +#undef Linux + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* OS version */ +#undef OSVERSION + +/* OS HP-UX */ +#undef OS_hpux + +/* OS SOLARIS */ +#undef OS_solaris + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to the type of arg 1 for `select'. */ +#undef SELECT_TYPE_ARG1 + +/* Define to the type of args 2, 3 and 4 for `select'. */ +#undef SELECT_TYPE_ARG234 + +/* Define to the type of arg 5 for `select'. */ +#undef SELECT_TYPE_ARG5 + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* SVR4 */ +#undef SVR4 + +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* Version number of package */ +#undef VERSION + +/* UNIX */ +#undef XP_UNIX + +/* Source namespace */ +#undef _HPUX_SOURCE + +/* POSIX revision */ +#undef _POSIX_C_SOURCE + +/* _REENTRANT */ +#undef _REENTRANT + +/* SVID_GETTOD */ +#undef _SVID_GETTOD + +/* SVR4 */ +#undef __svr4 + +/* SVR4 */ +#undef __svr4__ + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* HP-UX */ +#undef hpux + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + +/* Define to `unsigned' if does not define. */ +#undef size_t + +/* SunOS5 */ +#undef sunos5 View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 configure Index: configure =================================================================== RCS file: /cvs/dirsec/dsgw/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure 2 Jun 2006 22:57:17 -0000 1.2 +++ configure 10 Jan 2008 01:19:36 -0000 1.3 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dsgw 1.1. +# Generated by GNU Autoconf 2.59 for dirsrv-gw 1.1.0. # # Report bugs to . # @@ -243,6 +243,160 @@ $as_unset CDPATH + +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +echo=${ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + + +tagnames=${tagnames+${tagnames},}CXX + +tagnames=${tagnames+${tagnames},}F77 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. @@ -267,10 +421,10 @@ : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME='dsgw' -PACKAGE_TARNAME='dsgw' -PACKAGE_VERSION='1.1' -PACKAGE_STRING='dsgw 1.1' +PACKAGE_NAME='dirsrv-gw' +PACKAGE_TARNAME='dirsrv-gw' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='dirsrv-gw 1.1.0' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' ac_unique_file="dsgwutil.c" @@ -311,7 +465,8 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS POW_LIB HTTPD PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nss_inc nss_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver icu_lib icu_inc icu_bin cgibindir cgiuri propertydir htmldir pbhtmldir configdir pbconfigdir con! textdir securitydir cookiedir httpdconf NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_default_prefix=/opt/dirsrv +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri propertydir htmldir pbhtmldir configdir pbconfigdir contextdir securitydir cookiedir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' [...18983 lines suppressed...] + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7043,6 +22752,13 @@ LTLIBOBJS=$ac_ltlibobjs +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -7050,6 +22766,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -7057,6 +22780,34 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BUNDLE_TRUE}" && test -z "${BUNDLE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUNDLE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUNDLE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CXXLINK_REQUIRED_TRUE}" && test -z "${CXXLINK_REQUIRED_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CXXLINK_REQUIRED\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CXXLINK_REQUIRED\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HPUX_TRUE}" && test -z "${HPUX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HPUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HPUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${SOLARIS_TRUE}" && test -z "${SOLARIS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"SOLARIS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"SOLARIS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${NEED_LDIF_TRUE}" && test -z "${NEED_LDIF_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"NEED_LDIF\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -7342,7 +23093,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by dsgw $as_me 1.1, which was +This file was extended by dirsrv-gw $as_me 1.1.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7405,7 +23156,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dsgw config.status 1.1 +dirsrv-gw config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -7516,10 +23267,8 @@ case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "setup" ) CONFIG_FILES="$CONFIG_FILES setup" ;; - "dsgw-httpd.conf" ) CONFIG_FILES="$CONFIG_FILES dsgw-httpd.conf" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config-h.in" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -7627,11 +23376,22 @@ s, at AMTAR@,$AMTAR,;t t s, at am__tar@,$am__tar,;t t s, at am__untar@,$am__untar,;t t -s, at CC@,$CC,;t t -s, at CFLAGS@,$CFLAGS,;t t +s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t +s, at MAINT@,$MAINT,;t t +s, at build@,$build,;t t +s, at build_cpu@,$build_cpu,;t t +s, at build_vendor@,$build_vendor,;t t +s, at build_os@,$build_os,;t t +s, at host@,$host,;t t +s, at host_cpu@,$host_cpu,;t t +s, at host_vendor@,$host_vendor,;t t +s, at host_os@,$host_os,;t t +s, at CXX@,$CXX,;t t +s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t s, at CPPFLAGS@,$CPPFLAGS,;t t -s, at ac_ct_CC@,$ac_ct_CC,;t t +s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at EXEEXT@,$EXEEXT,;t t s, at OBJEXT@,$OBJEXT,;t t s, at DEPDIR@,$DEPDIR,;t t @@ -7640,26 +23400,65 @@ s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +s, at CXXDEPMODE@,$CXXDEPMODE,;t t +s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t +s, at CC@,$CC,;t t +s, at CFLAGS@,$CFLAGS,;t t +s, at ac_ct_CC@,$ac_ct_CC,;t t s, at CCDEPMODE@,$CCDEPMODE,;t t s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s, at CPP@,$CPP,;t t +s, at SED@,$SED,;t t s, at EGREP@,$EGREP,;t t +s, at LN_S@,$LN_S,;t t +s, at ECHO@,$ECHO,;t t +s, at AR@,$AR,;t t +s, at ac_ct_AR@,$ac_ct_AR,;t t +s, at RANLIB@,$RANLIB,;t t +s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s, at CPP@,$CPP,;t t +s, at CXXCPP@,$CXXCPP,;t t +s, at F77@,$F77,;t t +s, at FFLAGS@,$FFLAGS,;t t +s, at ac_ct_F77@,$ac_ct_F77,;t t +s, at LIBTOOL@,$LIBTOOL,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at POW_LIB@,$POW_LIB,;t t -s, at HTTPD@,$HTTPD,;t t +s, at PACKAGE_BASE_NAME@,$PACKAGE_BASE_NAME,;t t +s, at instconfigdir@,$instconfigdir,;t t +s, at BUNDLE_TRUE@,$BUNDLE_TRUE,;t t +s, at BUNDLE_FALSE@,$BUNDLE_FALSE,;t t +s, at LIBSOCKET@,$LIBSOCKET,;t t +s, at LIBNSL@,$LIBNSL,;t t +s, at LIBCSTD@,$LIBCSTD,;t t +s, at LIBCRUN@,$LIBCRUN,;t t +s, at CXXLINK_REQUIRED_TRUE@,$CXXLINK_REQUIRED_TRUE,;t t +s, at CXXLINK_REQUIRED_FALSE@,$CXXLINK_REQUIRED_FALSE,;t t +s, at HPUX_TRUE@,$HPUX_TRUE,;t t +s, at HPUX_FALSE@,$HPUX_FALSE,;t t +s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t +s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t s, at PKG_CONFIG@,$PKG_CONFIG,;t t s, at ICU_CONFIG@,$ICU_CONFIG,;t t s, at nspr_inc@,$nspr_inc,;t t s, at nspr_lib@,$nspr_lib,;t t +s, at nspr_libdir@,$nspr_libdir,;t t s, at nss_inc@,$nss_inc,;t t s, at nss_lib@,$nss_lib,;t t +s, at nss_libdir@,$nss_libdir,;t t +s, at sasl_inc@,$sasl_inc,;t t +s, at sasl_lib@,$sasl_lib,;t t +s, at sasl_libdir@,$sasl_libdir,;t t s, at ldapsdk_inc@,$ldapsdk_inc,;t t s, at ldapsdk_lib@,$ldapsdk_lib,;t t +s, at ldapsdk_libdir@,$ldapsdk_libdir,;t t s, at adminutil_inc@,$adminutil_inc,;t t s, at adminutil_lib@,$adminutil_lib,;t t +s, at adminutil_libdir@,$adminutil_libdir,;t t s, at adminutil_ver@,$adminutil_ver,;t t s, at icu_lib@,$icu_lib,;t t +s, at icu_libdir@,$icu_libdir,;t t s, at icu_inc@,$icu_inc,;t t s, at icu_bin@,$icu_bin,;t t s, at cgibindir@,$cgibindir,;t t @@ -7672,7 +23471,6 @@ s, at contextdir@,$contextdir,;t t s, at securitydir@,$securitydir,;t t s, at cookiedir@,$cookiedir,;t t -s, at httpdconf@,$httpdconf,;t t s, at NEED_LDIF_TRUE@,$NEED_LDIF_TRUE,;t t s, at NEED_LDIF_FALSE@,$NEED_LDIF_FALSE,;t t s, at WINNT_TRUE@,$WINNT_TRUE,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/dsgw/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.ac 2 Jun 2006 22:57:17 -0000 1.2 +++ configure.ac 10 Jan 2008 01:19:36 -0000 1.3 @@ -21,33 +21,22 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) - -AC_INIT([dsgw], [1.1], [http://bugzilla.redhat.com/]) - -AC_CONFIG_HEADERS([config.h:config-h.in]) - -# this is a file that must be in the source dir +AC_INIT([dirsrv-gw], [1.1.0], [http://bugzilla.redhat.com/]) AC_CONFIG_SRCDIR([dsgwutil.c]) +AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) +AM_MAINTAINER_MODE +AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([1.9 foreign]) +AC_CONFIG_HEADER([config.h]) # Checks for programs. +AC_PROG_CXX AC_PROG_CC -AC_PROG_INSTALL +AM_PROG_CC_C_O -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lc': -AC_CHECK_LIB([c], [main]) -# FIXME: Replace `main' with a function in `-lcrypt': -AC_CHECK_LIB([crypt], [main]) -# FIXME: Replace `main' with a function in `-lcxx': -AC_CHECK_LIB([cxx], [main]) -# FIXME: Replace `main' with a function in `-lm': -AC_CHECK_LIB([m], [main]) -# FIXME: Replace `main' with a function in `-lpthread': -AC_CHECK_LIB([pthread], [main]) -# FIXME: Replace `main' with a function in `-lw': -AC_CHECK_LIB([w], [main]) +# disable static libs by default - we only use a couple +AC_DISABLE_STATIC +AC_PROG_LIBTOOL # Checks for header files. AC_HEADER_STDC @@ -70,27 +59,232 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS([ftruncate getcwd isascii localtime_r memmove memset select strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtoul]) -# Check for web server -m4_include(m4/httpd.m4) +PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-gw//` +AC_SUBST(PACKAGE_BASE_NAME) + +# the default prefix - override with --prefix or --with-fhs or --with-fhs-opt +# unfortunately, this must be a literal - it should be $PACKAGE_BASE_NAME +AC_PREFIX_DEFAULT([/opt/dirsrv]) + +brand=fedora +capbrand=Fedora +vendor="Fedora Project" + +# check for --with-instconfigdir +AC_MSG_CHECKING(for --with-instconfigdir) +AC_ARG_WITH(instconfigdir, + AS_HELP_STRING([--with-instconfigdir=/path], + [Base directory for configuration directories (default $sysconfdir/$PACKAGE_BASE_NAME)]), +[ + if test $withval = yes ; then + AC_ERROR([Please specify a full path with --with-instconfigdir]) + fi + instconfigdir="$withval" + AC_MSG_RESULT(yes) +], +[ + dnl this value is expanded out in Makefile.am + instconfigdir='$(sysconfdir)/$(PACKAGE_BASE_NAME)' + AC_MSG_RESULT(no) +]) +AC_SUBST(instconfigdir) + +AC_MSG_CHECKING(for --enable-debug) +AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug features (default: no)]), +[ + AC_MSG_RESULT(yes) + AC_DEFINE([DSGW_DEBUG], [1], [Enable extra DSGW debugging code]) +], +[ + AC_MSG_RESULT(no) +]) + +# Used for legacy style packaging where we bundle all of the dependencies. +AC_MSG_CHECKING(for --enable-bundle) +AC_ARG_ENABLE(bundle, AS_HELP_STRING([--enable-bundle], [Enable bundled dependencies (default: no)]), +[ + AC_MSG_RESULT(yes) + bundle="1"; +], +[ + AC_MSG_RESULT(no) + bundle=""; +]) +AM_CONDITIONAL(BUNDLE,test "$bundle" = "1") + +# libtool automatically adds --rpath $libdir to each executable, and +# there is apparently no standard way to disable this. Also, you cannot +# override rpath with LD_LIBRARY_PATH, so this causes problems if you have +# and old version of nss/nspr installed in the system $libdir, but you +# want to use a different one. So we're disabling this rpath thing by +# default and adding a --enable-rpath flag if you really, really want +# to do this. +AC_MSG_CHECKING(for --enable-rpath) +AC_ARG_ENABLE(rpath, AS_HELP_STRING([--enable-rpath], [Allow libtool to add an rpath to $libdir (default: no)])) + +m4_include(m4/fhs.m4) + +CXXLINK_REQUIRED=0 +case $host in + *-*-linux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([Linux], [1], [Linux]) + AC_DEFINE([LINUX], [1], [Linux]) + platform="linux" + ;; + ia64-hp-hpux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([hpux], [1], [HP-UX]) + AC_DEFINE([HPUX], [1], [HP-UX]) + AC_DEFINE([HPUX11], [1], [HP-UX 11]) + AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23]) + AC_DEFINE([CPU_ia64], [], [cpu type ia64]) + AC_DEFINE([OS_hpux], [1], [OS HP-UX]) + AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) + AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) + CXXLINK_REQUIRED=1 + platform="hpux" + ;; + hppa*-hp-hpux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([hpux], [1], [HP-UX]) + AC_DEFINE([HPUX], [1], [HP-UX]) + AC_DEFINE([HPUX11], [1], [HP-UX 11]) + AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11]) + AC_DEFINE([CPU_hppa], [], [cpu type pa-risc]) + AC_DEFINE([OS_hpux], [1], [OS HP-UX]) + AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) + AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) + CXXLINK_REQUIRED=1 + platform="hpux" + ;; + sparc-sun-solaris*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([SVR4], [1], [SVR4]) + AC_DEFINE([__svr4], [1], [SVR4]) + AC_DEFINE([__svr4__], [1], [SVR4]) + AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD]) + AC_DEFINE([CPU_sparc], [], [cpu type sparc]) + AC_DEFINE([OS_solaris], [1], [OS SOLARIS]) + AC_DEFINE([sunos5], [1], [SunOS5]) + AC_DEFINE([OSVERSION], [509], [OS version]) + AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) +dnl socket nsl and dl are required to link several programs + LIBSOCKET=-lsocket + AC_SUBST([LIBSOCKET], [$LIBSOCKET]) + LIBNSL=-lnsl + AC_SUBST([LIBNSL], [$LIBNSL]) +dnl Cstd and Crun are required to link any C++ related code (ICU) + LIBCSTD=-lCstd + AC_SUBST([LIBCSTD], [$LIBCSTD]) + LIBCRUN=-lCrun + AC_SUBST([LIBCRUN], [$LIBCRUN]) + CXXLINK_REQUIRED=1 + platform="solaris" + ;; + *) +esac +AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1) +AM_CONDITIONAL([HPUX],test "$platform" = "hpux") +AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris") + +# installation paths - by default, configure will just +# use /usr as the prefix for everything, which means +# /usr/etc and /usr/var. FHS sez to use /etc and /var. +# The with-fhs-opt option will use the +# prefix, but it's sysconfdir and localstatedir will be +# /etc/opt, and /var/opt. +if test "$with_fhs_opt" = "yes"; then + # Override sysconfdir and localstatedir if FHS optional + # package was requested. + sysconfdir='/etc/opt' + localstatedir='/var/opt' +elif test "$with_fhs" = "yes"; then + ac_default_prefix=/usr + prefix=$ac_default_prefix + exec_prefix=$prefix + dnl as opposed to the default /usr/etc + sysconfdir='/etc' + dnl as opposed to the default /usr/var + localstatedir='/var' +fi + +# default is to install with admin server +with_adminserver=yes +AC_ARG_WITH(adminserver, AS_HELP_STRING([--with-adminserver], [Install DSGW with Admin Server - default is yes])) + +if test "$with_adminserver" != yes ; then + # relative to datadir + htmldir=/$PACKAGE_NAME/html + pbhtmldir=/$PACKAGE_NAME/pbhtml + configdir=/$PACKAGE_NAME/config + pbconfigdir=/$PACKAGE_NAME/pbconfig + manualuri=/$PACKAGE_NAME/manual + propertydir=/$PACKAGE_NAME/properties + # relative to libdir + cgibindir=/$PACKAGE_NAME/cgi-bin + # location of property/resource files, relative to datadir + cgiuri=/cgi-bin +elif test "$with_fhs_opt" = "yes"; then + # relative to datadir + htmldir=/dsgw/html + pbhtmldir=/dsgw/pbhtml + configdir=/dsgw/config + pbconfigdir=/dsgw/pbconfig + manualuri=/dsgw/manual + propertydir=/properties/dsgw + # same as server's cgibindir + cgibindir=/cgi-bin + cgiuri=/cgi-bin +else + # relative to datadir + htmldir=/$PACKAGE_BASE_NAME/dsgw/html + pbhtmldir=/$PACKAGE_BASE_NAME/dsgw/pbhtml + configdir=/$PACKAGE_BASE_NAME/dsgw/config + pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig + manualuri=/$PACKAGE_BASE_NAME/dsgw/manual + propertydir=/$PACKAGE_BASE_NAME/properties/dsgw + # relative to libdir + # CGI program directory + cgibindir=/$PACKAGE_BASE_NAME/cgi-bin + # location of property/resource files, relative to datadir + cgiuri=/cgi-bin +fi + +# relative to instconfigdir +contextdir=/dsgw +securitydir=/dsgw +# relative to $localstatedir +cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies # Check for library dependencies m4_include(m4/nspr.m4) m4_include(m4/nss.m4) +m4_include(m4/sasl.m4) m4_include(m4/mozldap.m4) m4_include(m4/icu.m4) m4_include(m4/adminutil.m4) # write out paths for binary components +AC_SUBST(PACKAGE_NAME) AC_SUBST(nspr_inc) AC_SUBST(nspr_lib) +AC_SUBST(nspr_libdir) AC_SUBST(nss_inc) AC_SUBST(nss_lib) +AC_SUBST(nss_libdir) +AC_SUBST(sasl_inc) +AC_SUBST(sasl_lib) +AC_SUBST(sasl_libdir) AC_SUBST(ldapsdk_inc) AC_SUBST(ldapsdk_lib) +AC_SUBST(ldapsdk_libdir) AC_SUBST(adminutil_inc) AC_SUBST(adminutil_lib) +AC_SUBST(adminutil_libdir) AC_SUBST(adminutil_ver) AC_SUBST(icu_lib) +AC_SUBST(icu_libdir) AC_SUBST(icu_inc) AC_SUBST(icu_bin) @@ -105,7 +299,6 @@ AC_SUBST(contextdir) AC_SUBST(securitydir) AC_SUBST(cookiedir) -AC_SUBST(httpdconf) # need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not @@ -114,5 +307,37 @@ # cygnus, mingw, or the like and using cmd.exe as the shell AM_CONDITIONAL([WINNT], false) -AC_CONFIG_FILES([Makefile setup dsgw-httpd.conf]) +# libtool on fedora/rhel contains some gcc-isms which cause problems +# if not using gcc (e.g. Forte on Solaris, aCC on HP-UX) +# we remove them here +if test "$GCC" != yes ; then + AC_MSG_NOTICE([Not using gcc - fixing libtool to remove gcc-isms . . .]) + cp -p libtool libtool.orig + cp -p libtool libtool.tmp + # dnl note the special chars @<:@ and @:>@ - since m4 treats [ and ] specially, + # we have to use the quadrigraph @<:@ for [ and @:>@ for ] - and you thought + # perl produced write-only code . . . + sed -e '/^gcc_dir/ d' \ + -e '/^gcc_ver/ d' \ + -e 's/^predep_objects=.*echo \("@<:@^"@:>@*"\).*$/predep_objects=\1/' \ + -e 's/^postdep_objects=.*echo \("@<:@^"@:>@*"\).*$/postdep_objects=\1/' \ + -e 's/^compiler_lib_search_path=.*echo \("@<:@^"@:>@*"\).*$/compiler_lib_search_path=\1/' \ + -e 's/^sys_lib_search_path_spec=.*echo \("@<:@^"@:>@*"\).*$/sys_lib_search_path_spec=\1/' \ + libtool > libtool.tmp + cp -p libtool.tmp libtool + rm -f libtool.tmp +fi + +if test "$enable_rpath" != "yes" ; then + AC_MSG_NOTICE([Fixing libtool to remove automatic rpath to $libdir . . .]) + cp -p libtool libtool.orig + cp -p libtool libtool.tmp + sed -e '/^runpath_var/ d' \ + -e '/^hardcode_libdir_flag_spec/ d' \ + libtool > libtool.tmp + cp -p libtool.tmp libtool + rm -f libtool.tmp +fi + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT Index: dsgw.h =================================================================== RCS file: /cvs/dirsec/dsgw/dsgw.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dsgw.h 1 Jun 2006 19:43:38 -0000 1.1.1.1 +++ dsgw.h 10 Jan 2008 01:19:36 -0000 1.2 @@ -104,27 +104,15 @@ * XXX the next group of #defines assume that HTTP server has cd'd to * our CGI dir. */ -#define SERVER_ROOT_PATH "../../.." -#define DSGW_CONFIGDIR_HTTP "../config/" -#define DSGW_CONFIGDIR_ADMSERV "../config/" -/*#define DSGW_CONFIGDIR_ADMSERV SERVER_ROOT_PATH "/admin-serv/config/"*/ -#define DSGW_DBSWITCH_FILE "dbswitch.conf" -#define DSGW_DBSWITCH_TMPFILE "dbswitch.tmp" -#define DSGW_TMPLDIR_HTTP "../config/" -#define DSGW_TMPLDIR_ADMSERV "../html/" -#define DSGW_DOCDIR_HTTP "../html" -#define DSGW_CONTEXTDIR_HTTP "../context/" -#define DSGW_HTMLDIR "../html" -#define DSGW_MANROOT SERVER_ROOT_PATH "/manual/" +#define DSGW_CONFIGDIR_HTTP CONFIGDIR +#define DSGW_TMPLDIR_HTTP CONFIGDIR +#define DSGW_TMPLDIR_ADMSERV HTMLDIR +#define DSGW_DOCDIR_HTTP HTMLDIR +#define DSGW_CONTEXTDIR_HTTP CONTEXTDIR +#define DSGW_HTMLDIR HTMLDIR +#define DSGW_MANROOT MANUALDIR #define DSGW_MANUALSHORTCUT ".MANUAL" #define DSGW_MANUALSHORTCUT_LEN 7 -#define DSGW_ADMSERV_BINDIR "/admin-serv/bin/" -#define DSGW_USER_ADM_BINDIR "/user-environment/bin/" -#define DSGW_LCACHECONF_PPATH "ldap/config/" /* partial path from /userdb */ -#define DSGW_LCACHECONF_FILE "lcache.conf" -#define DSGW_TOOLSDIR "/ldap/tools" -#define DSGW_LDAPSEARCH "ldapsearch" -#define DSGW_LDAPMODIFY "ldapmodify" #define DSGW_SEARCHPREFSFILE "dsgwsearchprefs.conf" #define DSGW_FILTERFILE "dsgwfilter.conf" @@ -277,10 +265,7 @@ /* URL prefixes specific to our gateway */ #define DSGW_URLPREFIX_MAIN_HTTP "lang?file=" -#define DSGW_URLPREFIX_MAIN_ADMSERV "" -/*#define DSGW_URLPREFIX_CGI_HTTP "../bin/"*/ #define DSGW_URLPREFIX_CGI_HTTP "" -#define DSGW_URLPREFIX_CGI_ADMSERV "" #define DSGW_URLPREFIX_BIN "/clients/dsgw/bin/" #define DSGW_URLPREFIX_MAIN DSGW_URLPREFIX_MAIN_HTTP @@ -402,7 +387,7 @@ #define DSGW_UNAUTHSTR "[unauthenticated]" /* Name of cookie database - context will be appended to "cookies" for multiple GW's*/ -#define DSGW_COOKIEDB_FNAME SERVER_ROOT_PATH "/bin/slapd/authck/cookies" +#define DSGW_COOKIEDB_FNAME COOKIEDIR "/cookies" /* Default lifetime of authentication cookies (in seconds) */ #define DSGW_DEF_AUTH_LIFETIME ( 60 * 60 ) /* one hour */ Index: dsgwgetlang.c =================================================================== RCS file: /cvs/dirsec/dsgw/dsgwgetlang.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dsgwgetlang.c 1 Jun 2006 19:43:40 -0000 1.1.1.1 +++ dsgwgetlang.c 10 Jan 2008 01:19:36 -0000 1.2 @@ -318,12 +318,33 @@ return -1; } +/* + Note: This reuses a single static buffer to avoid memory leakage. + If the caller needs an actual unique copy, then we have two options + 1) revert the code to just leak the string - probably ok as this is + CGI code not long running server code + 2) have the caller free the pointer after use +*/ PR_IMPLEMENT( char * ) XP_GetClientStr(int key) { + static char staticbuf[256]; + static char *resstring = staticbuf; + static size_t bufsize = sizeof(staticbuf); + int rc = 0; char keybuf[256]; + PR_snprintf(keybuf, sizeof(keybuf), "%s%d", database_name, key); - return (char *)res_getstring(i18nResource, keybuf, GetClientLanguage()); + + resstring = res_getstring(i18nResource, keybuf, GetClientLanguage(), + resstring, bufsize, &rc); + if (rc == 1) { /* need more room */ + /* NULL means res_getstring will calculate and return needed memory */ + resstring = res_getstring(i18nResource, keybuf, GetClientLanguage(), + NULL, bufsize, &rc); + bufsize = strlen(resstring); + } + return resstring; } PR_IMPLEMENT( void ) Index: dsgwutil.c =================================================================== RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dsgwutil.c 1 Jun 2006 19:43:44 -0000 1.1.1.1 +++ dsgwutil.c 10 Jan 2008 01:19:36 -0000 1.2 @@ -853,19 +853,6 @@ surl = ""; } - /*if ( gc->gc_admserv ) { - * - * include "/admin-serv/" or "/user-environment/" if appropriate - * - * if ( gc->gc_enduser ) { - * extpath = DSGW_USER_ADM_BINDIR; - * } else { - * extpath = DSGW_ADMSERV_BINDIR; - * } - * } else { - * extpath = ""; - * } - */ vpmap[ cginum ] = dsgw_ch_malloc( strlen( gc->gc_urlpfxcgi ) + strlen( surl ) /*+ strlen( extpath ) */ + strlen( cginame ) + 2 ); From fedora-directory-commits at redhat.com Thu Jan 10 16:48:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 11:48:40 -0500 Subject: [Fedora-directory-commits] adminserver/pkg fedora-ds-admin.spec, 1.2, 1.3 Message-ID: <200801101648.m0AGmfe6020562@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/pkg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20492/adminserver/pkg Modified Files: fedora-ds-admin.spec Log Message: Resolves: bug 249548 Description: Review Request: fedora-ds-admin - Administration server used by Fedora Directory Server Fix Description: packaging, spec, and initscript fixes for package review Index: fedora-ds-admin.spec =================================================================== RCS file: /cvs/dirsec/adminserver/pkg/fedora-ds-admin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-ds-admin.spec 12 Dec 2007 01:26:27 -0000 1.2 +++ fedora-ds-admin.spec 10 Jan 2008 16:48:38 -0000 1.3 @@ -3,7 +3,7 @@ Summary: Fedora Administration Server (admin) Name: fedora-ds-admin -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} License: GPLv2 URL: http://directory.fedoraproject.org/ @@ -96,12 +96,15 @@ %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf %{_datadir}/%{pkgname} %{_initrddir}/%{pkgname}-admin -%{_sysconfdir}/sysconfig/%{pkgname}-admin +%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin %{_sbindir}/* %{_libdir}/*.so.* %{_libdir}/%{pkgname} %changelog +* Wed Jan 9 2008 Rich Megginson - 1.1.2-1 +- Fix issues associated with Fedora pkg review bug 249548 + * Tue Dec 11 2007 Rich Megginson - 1.1.1-1 - this is the final GA candidate From fedora-directory-commits at redhat.com Thu Jan 10 16:48:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 11:48:40 -0500 Subject: [Fedora-directory-commits] adminserver Makefile.am, 1.38, 1.39 configure.ac, 1.24, 1.25 aclocal.m4, 1.38, 1.39 configure, 1.42, 1.43 missing, 1.28, 1.29 install-sh, 1.28, 1.29 Makefile.in, 1.45, 1.46 depcomp, 1.28, 1.29 config.sub, 1.28, 1.29 config.guess, 1.28, 1.29 compile, 1.27, 1.28 Message-ID: <200801101648.m0AGmeYr020551@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20492/adminserver Modified Files: Makefile.am configure.ac aclocal.m4 configure missing install-sh Makefile.in depcomp config.sub config.guess compile Log Message: Resolves: bug 249548 Description: Review Request: fedora-ds-admin - Administration server used by Fedora Directory Server Fix Description: packaging, spec, and initscript fixes for package review Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Makefile.am 17 Dec 2007 20:10:04 -0000 1.38 +++ Makefile.am 10 Jan 2008 16:48:38 -0000 1.39 @@ -147,7 +147,7 @@ init_SCRIPTS = wrappers/$(PACKAGE_NAME) -initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME) +initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME) ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \ admserv/schema/ldif/01nsroot.ldif.tmpl \ @@ -198,7 +198,7 @@ admserv/newinst/src/migrate-ds-admin.pl \ admserv/newinst/src/register-ds-admin.pl -perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ +perl_DATA = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminserver/configure.ac,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- configure.ac 18 Dec 2007 19:55:22 -0000 1.24 +++ configure.ac 10 Jan 2008 16:48:38 -0000 1.25 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dirsrv-admin], [1.1.1], [http://bugzilla.redhat.com/]) +AC_INIT([dirsrv-admin], [1.1.2], [http://bugzilla.redhat.com/]) AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- configure 18 Dec 2007 19:55:22 -0000 1.42 +++ configure 10 Jan 2008 16:48:38 -0000 1.43 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.1. +# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.2. # # Report bugs to . # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='dirsrv-admin' PACKAGE_TARNAME='dirsrv-admin' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='dirsrv-admin 1.1.1' +PACKAGE_VERSION='1.1.2' +PACKAGE_STRING='dirsrv-admin 1.1.2' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' ac_unique_file="admserv/cgi-src40/viewlog.c" @@ -957,7 +957,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dirsrv-admin 1.1.1 to adapt to many kinds of systems. +\`configure' configures dirsrv-admin 1.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1023,7 +1023,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dirsrv-admin 1.1.1:";; + short | recursive ) echo "Configuration of dirsrv-admin 1.1.2:";; esac cat <<\_ACEOF @@ -1202,7 +1202,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dirsrv-admin configure 1.1.1 +dirsrv-admin configure 1.1.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1216,7 +1216,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dirsrv-admin $as_me 1.1.1, which was +It was created by dirsrv-admin $as_me 1.1.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1860,7 +1860,7 @@ # Define the identity of the package. PACKAGE='dirsrv-admin' - VERSION='1.1.1' + VERSION='1.1.2' cat >>confdefs.h <<_ACEOF @@ -25613,7 +25613,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by dirsrv-admin $as_me 1.1.1, which was +This file was extended by dirsrv-admin $as_me 1.1.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25676,7 +25676,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dirsrv-admin config.status 1.1.1 +dirsrv-admin config.status 1.1.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Makefile.in 18 Dec 2007 19:55:23 -0000 1.45 +++ Makefile.in 10 Jan 2008 16:48:38 -0000 1.46 @@ -93,12 +93,12 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \ "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \ - "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \ - "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \ + "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \ "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \ "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \ - "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" + "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libds_admin_serv_la_LIBADD = @@ -202,11 +202,9 @@ cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT) cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) initSCRIPT_INSTALL = $(INSTALL_SCRIPT) -initconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT) nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -perlSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \ - $(initconfig_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS) + $(nodist_cmdbin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -258,13 +256,16 @@ dist_htmlDATA_INSTALL = $(INSTALL_DATA) dist_iconDATA_INSTALL = $(INSTALL_DATA) infDATA_INSTALL = $(INSTALL_DATA) +initconfigDATA_INSTALL = $(INSTALL_DATA) ldifDATA_INSTALL = $(INSTALL_DATA) nodist_configDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) +perlDATA_INSTALL = $(INSTALL_DATA) propertyDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_help_DATA) $(dist_html_DATA) $(dist_icon_DATA) \ - $(inf_DATA) $(ldif_DATA) $(nodist_config_DATA) \ - $(nodist_property_DATA) $(property_DATA) + $(inf_DATA) $(initconfig_DATA) $(ldif_DATA) \ + $(nodist_config_DATA) $(nodist_property_DATA) $(perl_DATA) \ + $(property_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = mod_admserv mod_restartd @@ -542,7 +543,7 @@ @CXXLINK_REQUIRED_FALSE at MYLINK = $(LINK) @CXXLINK_REQUIRED_TRUE at MYLINK = $(CXXLINK) init_SCRIPTS = wrappers/$(PACKAGE_NAME) -initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME) +initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME) ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \ admserv/schema/ldif/01nsroot.ldif.tmpl \ admserv/schema/ldif/02globalpreferences.ldif.tmpl \ @@ -587,7 +588,7 @@ admserv/newinst/src/migrate-ds-admin.pl \ admserv/newinst/src/register-ds-admin.pl -perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ +perl_DATA = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ @@ -1290,25 +1291,6 @@ echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \ rm -f "$(DESTDIR)$(initdir)/$$f"; \ done -install-initconfigSCRIPTS: $(initconfig_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)" - @list='$(initconfig_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(initconfigSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \ - $(initconfigSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \ - else :; fi; \ - done - -uninstall-initconfigSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(initconfig_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \ - done install-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)" @@ -1328,25 +1310,6 @@ echo " rm -f '$(DESTDIR)$(cmdbindir)/$$f'"; \ rm -f "$(DESTDIR)$(cmdbindir)/$$f"; \ done -install-perlSCRIPTS: $(perl_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)" - @list='$(perl_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(perlSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \ - $(perlSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \ - else :; fi; \ - done - -uninstall-perlSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(perl_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \ - rm -f "$(DESTDIR)$(perldir)/$$f"; \ - done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1864,6 +1827,23 @@ echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \ rm -f "$(DESTDIR)$(infdir)/$$f"; \ done +install-initconfigDATA: $(initconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)" + @list='$(initconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(initconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \ + $(initconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \ + done + +uninstall-initconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(initconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \ + done install-ldifDATA: $(ldif_DATA) @$(NORMAL_INSTALL) test -z "$(ldifdir)" || $(mkdir_p) "$(DESTDIR)$(ldifdir)" @@ -1915,6 +1895,23 @@ echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \ rm -f "$(DESTDIR)$(propertydir)/$$f"; \ done +install-perlDATA: $(perl_DATA) + @$(NORMAL_INSTALL) + test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)" + @list='$(perl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(perlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \ + $(perlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \ + done + +uninstall-perlDATA: + @$(NORMAL_UNINSTALL) + @list='$(perl_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \ + rm -f "$(DESTDIR)$(perldir)/$$f"; \ + done install-propertyDATA: $(property_DATA) @$(NORMAL_INSTALL) test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)" @@ -2213,7 +2210,7 @@ $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -2278,9 +2275,9 @@ install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \ install-cmdbinSCRIPTS install-dist_helpDATA \ install-dist_htmlDATA install-dist_iconDATA install-infDATA \ - install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \ + install-initSCRIPTS install-initconfigDATA install-ldifDATA \ install-nodist_cmdbinSCRIPTS install-nodist_configDATA \ - install-nodist_propertyDATA install-perlSCRIPTS \ + install-nodist_propertyDATA install-perlDATA \ install-propertyDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -2317,10 +2314,10 @@ uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ uninstall-dist_htmlDATA uninstall-dist_iconDATA \ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ - uninstall-initconfigSCRIPTS uninstall-ldifDATA \ + uninstall-initconfigDATA uninstall-ldifDATA \ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA + uninstall-perlDATA uninstall-propertyDATA uninstall-info: uninstall-info-recursive @@ -2337,10 +2334,10 @@ install-data-am install-data-hook install-dist_helpDATA \ install-dist_htmlDATA install-dist_iconDATA install-exec \ install-exec-am install-infDATA install-info install-info-am \ - install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \ + install-initSCRIPTS install-initconfigDATA install-ldifDATA \ install-libLTLIBRARIES install-man \ install-nodist_cmdbinSCRIPTS install-nodist_configDATA \ - install-nodist_propertyDATA install-perlSCRIPTS \ + install-nodist_propertyDATA install-perlDATA \ install-propertyDATA install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ @@ -2351,10 +2348,10 @@ uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ uninstall-dist_htmlDATA uninstall-dist_iconDATA \ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ - uninstall-initconfigSCRIPTS uninstall-ldifDATA \ + uninstall-initconfigDATA uninstall-ldifDATA \ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA + uninstall-perlDATA uninstall-propertyDATA define NL \\n From fedora-directory-commits at redhat.com Thu Jan 10 16:48:41 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 11:48:41 -0500 Subject: [Fedora-directory-commits] adminserver/wrappers initscript.in, 1.4, 1.5 Message-ID: <200801101648.m0AGmfoG020568@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20492/adminserver/wrappers Modified Files: initscript.in Log Message: Resolves: bug 249548 Description: Review Request: fedora-ds-admin - Administration server used by Fedora Directory Server Fix Description: packaging, spec, and initscript fixes for package review Index: initscript.in =================================================================== RCS file: /cvs/dirsec/adminserver/wrappers/initscript.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- initscript.in 8 Dec 2007 17:42:49 -0000 1.4 +++ initscript.in 10 Jan 2008 16:48:38 -0000 1.5 @@ -94,11 +94,14 @@ piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@" # PID file pidfile=$piddir/admin-serv.pid +lockfile=/var/lock/subsys/@package_name@ [ -f $exec ] || exit 0 umask 077 +RETVAL=0 + # since we use the start script to start admin, we source the # init config file there, not here # if we ever get rid of the start script, we'll have to uncomment @@ -136,6 +139,7 @@ server_started=1 # well, perhaps not running, but started ok else failure; echo + RETVAL=1 fi fi if [ $server_started -eq 1 ] ; then @@ -156,8 +160,10 @@ else echo_n "*** Error: $prog failed to start" failure; echo + RETVAL=1 fi fi + [ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile } stop() { @@ -176,6 +182,7 @@ server_stopped=1 else failure; echo + RETVAL=1 fi fi if [ $server_stopped -eq 1 ] ; then @@ -196,12 +203,14 @@ if test -f $pidfile ; then echo_n "*** Error: $prog failed to stop" failure; echo + RETVAL=1 else success; echo rm -f $pidfile fi fi fi + [ $RETVAL -eq 0 ] && rm -f $lockfile } restart() { From fedora-directory-commits at redhat.com Thu Jan 10 18:35:38 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 13:35:38 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/preferences FilePreferenceManager.java, 1.2, 1.3 Message-ID: <200801101835.m0AIZcKu005701@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/preferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/console/src/com/netscape/management/client/preferences Modified Files: FilePreferenceManager.java Log Message: Resolves: bug 428226 Description: Review Request: idm-console-framework: Core console package used by Fedora Directory Server and other IDM projects Fix Description: bump version to 1.1.1 Added LICENSE to %doc in spec file Fix some minor problems to allow compilation with the IcedTea Java Index: FilePreferenceManager.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/preferences/FilePreferenceManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FilePreferenceManager.java 29 Nov 2005 18:37:01 -0000 1.2 +++ FilePreferenceManager.java 10 Jan 2008 18:35:36 -0000 1.3 @@ -20,8 +20,8 @@ package com.netscape.management.client.preferences; import java.util.*; -import java.io.*; -import netscape.ldap.*; +import java.io.File; +import java.io.FilenameFilter; import com.netscape.management.client.console.*; import com.netscape.management.client.util.*; @@ -43,9 +43,6 @@ } public static String getHomePath() { - String homePath = null; - Properties p = System.getProperties(); - File f = new File(Console.PREFERENCE_DIR); if (!f.exists()) f.mkdir(); From fedora-directory-commits at redhat.com Thu Jan 10 18:35:38 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 13:35:38 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/security CertRequestWizard.java, 1.3, 1.4 Message-ID: <200801101835.m0AIZcn9005708@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/security In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/console/src/com/netscape/management/client/security Modified Files: CertRequestWizard.java Log Message: Resolves: bug 428226 Description: Review Request: idm-console-framework: Core console package used by Fedora Directory Server and other IDM projects Fix Description: bump version to 1.1.1 Added LICENSE to %doc in spec file Fix some minor problems to allow compilation with the IcedTea Java Index: CertRequestWizard.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CertRequestWizard.java 8 Feb 2006 22:13:18 -0000 1.3 +++ CertRequestWizard.java 10 Jan 2008 18:35:36 -0000 1.4 @@ -25,7 +25,9 @@ import java.util.zip.*; import java.util.jar.*; import java.net.*; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; +import java.io.InputStream; import javax.swing.*; import javax.swing.event.*; import com.netscape.management.client.console.*; From fedora-directory-commits at redhat.com Thu Jan 10 18:35:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 13:35:40 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/topology DomainNode.java, 1.1.1.1, 1.2 TopTopologyNode.java, 1.1.1.1, 1.2 Message-ID: <200801101835.m0AIZeJx005717@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/topology In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/console/src/com/netscape/management/client/topology Modified Files: DomainNode.java TopTopologyNode.java Log Message: Resolves: bug 428226 Description: Review Request: idm-console-framework: Core console package used by Fedora Directory Server and other IDM projects Fix Description: bump version to 1.1.1 Added LICENSE to %doc in spec file Fix some minor problems to allow compilation with the IcedTea Java Index: DomainNode.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/DomainNode.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DomainNode.java 18 Jul 2005 00:34:18 -0000 1.1.1.1 +++ DomainNode.java 10 Jan 2008 18:35:36 -0000 1.2 @@ -20,13 +20,10 @@ package com.netscape.management.client.topology; import java.util.*; -import java.net.*; -import java.io.*; -import java.awt.*; -import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; import javax.swing.tree.*; +import java.awt.Component; import java.text.MessageFormat; import com.netscape.management.client.*; import com.netscape.management.client.util.*; Index: TopTopologyNode.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/TopTopologyNode.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- TopTopologyNode.java 18 Jul 2005 00:34:19 -0000 1.1.1.1 +++ TopTopologyNode.java 10 Jan 2008 18:35:36 -0000 1.2 @@ -20,7 +20,6 @@ package com.netscape.management.client.topology; import java.util.*; -import java.awt.*; import java.awt.event.*; import javax.swing.*; import javax.swing.tree.*; @@ -42,7 +41,7 @@ } /** - * initialize the top toplogy node + * initialize the top topology node */ public void reload() { super.reload(); From fedora-directory-commits at redhat.com Thu Jan 10 18:35:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 13:35:40 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/util IndexDialog.java, 1.1.1.1, 1.2 Message-ID: <200801101835.m0AIZeY1005723@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/console/src/com/netscape/management/client/util Modified Files: IndexDialog.java Log Message: Resolves: bug 428226 Description: Review Request: idm-console-framework: Core console package used by Fedora Directory Server and other IDM projects Fix Description: bump version to 1.1.1 Added LICENSE to %doc in spec file Fix some minor problems to allow compilation with the IcedTea Java Index: IndexDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/IndexDialog.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- IndexDialog.java 18 Jul 2005 00:34:26 -0000 1.1.1.1 +++ IndexDialog.java 10 Jan 2008 18:35:38 -0000 1.2 @@ -21,20 +21,19 @@ package com.netscape.management.client.util; import java.awt.*; -import java.awt.event.*; -import java.io.*; import java.util.*; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.io.StringReader; import java.net.*; import java.text.*; import java.beans.*; import javax.swing.*; import javax.swing.event.*; -import javax.swing.border.*; -import javax.swing.text.*; import javax.swing.text.html.*; import com.netscape.management.client.console.*; import com.netscape.management.client.components.*; -import com.netscape.management.client.comm.*; /** * Dialog to select a topic to display, from a list of URLS organized From fedora-directory-commits at redhat.com Thu Jan 10 18:35:38 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 10 Jan 2008 13:35:38 -0500 Subject: [Fedora-directory-commits] console build.properties, 1.14, 1.15 idm-console-framework.spec, 1.3, 1.4 Message-ID: <200801101836.m0AIa8iI005739@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/console Modified Files: build.properties idm-console-framework.spec Log Message: Resolves: bug 428226 Description: Review Request: idm-console-framework: Core console package used by Fedora Directory Server and other IDM projects Fix Description: bump version to 1.1.1 Added LICENSE to %doc in spec file Fix some minor problems to allow compilation with the IcedTea Java Index: build.properties =================================================================== RCS file: /cvs/dirsec/console/build.properties,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- build.properties 1 Aug 2007 21:29:55 -0000 1.14 +++ build.properties 10 Jan 2008 18:35:35 -0000 1.15 @@ -23,7 +23,7 @@ console.root=. console.version=11 -console.dotversion=1.1.0 +console.dotversion=1.1.1 console.dotgenversion=1.1 mcc.core=idm-console-mcc Index: idm-console-framework.spec =================================================================== RCS file: /cvs/dirsec/console/idm-console-framework.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- idm-console-framework.spec 19 Dec 2007 20:10:27 -0000 1.3 +++ idm-console-framework.spec 10 Jan 2008 18:35:35 -0000 1.4 @@ -1,13 +1,13 @@ %define major_version 1.1 -%define minor_version 0 +%define minor_version 1 Name: idm-console-framework Version: %{major_version}.%{minor_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Identity Management Console Framework Group: System Environment/Libraries -License: LGPL +License: LGPLv2 URL: http://directory.fedoraproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -15,9 +15,11 @@ Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 Requires: ldapjdk Requires: jss +BuildRequires: java-1.7.0-icedtea BuildRequires: ant >= 1.6.2 BuildRequires: ldapjdk BuildRequires: jss +BuildRequires: java-1.7.0-icedtea-devel %description A Java Management Console framework used for remote server management. @@ -55,6 +57,7 @@ %files %defattr(-,root,root,-) +%doc LICENSE %{_javadir}/idm-console-base-%{version}.jar %{_javadir}/idm-console-base-%{major_version}.jar %{_javadir}/idm-console-base.jar @@ -72,6 +75,12 @@ %{_javadir}/idm-console-nmclf_en.jar %changelog +* Wed Jan 9 2008 Rich Megginson 1.1.1-1 +- fix rpmlint issues +- changed license from LGPL to LGPLv2 +- added explicit requires for java-1.7.0-icedtea +- added LICENSE for doc + * Wed Dec 19 2007 Rich Megginson 1.1.0-2 - for the fedora ds 1.1 release From fedora-directory-commits at redhat.com Thu Jan 10 19:44:23 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 10 Jan 2008 14:44:23 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm proto-back-ldbm.h, 1.5, 1.5.2.1 idl.c, 1.4, 1.4.2.1 sort.c, 1.5.2.1, 1.5.2.2 vlv.c, 1.6.2.1, 1.6.2.2 Message-ID: <200801101944.m0AJiNvp014367@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14329/servers/slapd/back-ldbm Modified Files: Tag: Directory71RtmBranch proto-back-ldbm.h idl.c sort.c vlv.c Log Message: Resolves: #183222 Summary: Directory Server hangs when running VLV search and update operations Description: applied the patch to Directory71RtmBranch Index: proto-back-ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- proto-back-ldbm.h 19 Apr 2005 22:07:38 -0000 1.5 +++ proto-back-ldbm.h 10 Jan 2008 19:44:21 -0000 1.5.2.1 @@ -213,6 +213,15 @@ int idl_is_allids(IDList *idl); int idl_append( IDList *idl, ID id); void idl_insert(IDList **idl, ID id); +/* + * idl_delete - delete an id from an id list. + * returns 0 id deleted + * 1 id deleted, first id in block has changed + * 2 id deleted, block is empty + * 3 id not there + * 4 cannot delete from allids block + */ +int idl_delete( IDList **idl, ID id ); IDList * idl_allids( backend *be ); IDList * idl_fetch( backend *be, DB* db, DBT *key, DB_TXN *txn, struct attrinfo *a, int *err ); int idl_insert_key( backend *be, DB* db, DBT *key, ID id, DB_TXN *txn, struct attrinfo *a,int *disposition ); Index: idl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/idl.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- idl.c 19 Apr 2005 22:07:38 -0000 1.4 +++ idl.c 10 Jan 2008 19:44:21 -0000 1.4.2.1 @@ -44,7 +44,6 @@ */ #undef IDL_LOCKING_ENABLE -static int idl_delete( IDList **idl, ID id ) ; static void make_cont_key( DBT *contkey, DBT *key, ID id ); static int idl_insert_maxids( IDList **idl, ID id, int maxids ); @@ -1591,7 +1590,7 @@ * 4 cannot delete from allids block */ -static int +int idl_delete( IDList **idl, ID id ) { ID i, delpos; Index: sort.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/sort.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- sort.c 2 Mar 2006 01:12:31 -0000 1.5.2.1 +++ sort.c 10 Jan 2008 19:44:21 -0000 1.5.2.2 @@ -677,7 +677,7 @@ a = id2entry(be,*id_a,NULL,&err); if (NULL == a) { if (0 != err ) { - LDAPDebug(LDAP_DEBUG_ANY,"compare_entries db err %d\n",err,0,0); + LDAPDebug(LDAP_DEBUG_TRACE,"compare_entries db err %d\n",err,0,0); } /* Were up a creek without paddle here */ /* Best to log error and set some flag */ @@ -686,7 +686,7 @@ b = id2entry(be,*id_b,NULL,&err); if (NULL == b) { if (0 != err ) { - LDAPDebug(LDAP_DEBUG_ANY,"compare_entries db err %d\n",err,0,0); + LDAPDebug(LDAP_DEBUG_TRACE,"compare_entries db err %d\n",err,0,0); } return 0; } Index: vlv.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- vlv.c 14 Mar 2007 16:25:34 -0000 1.6.2.1 +++ vlv.c 10 Jan 2008 19:44:21 -0000 1.6.2.2 @@ -54,7 +54,7 @@ static PRUint32 vlv_trim_candidates_byindex(PRUint32 length, const struct vlv_request *vlv_request_control); static PRUint32 vlv_trim_candidates_byvalue(backend *be, const IDList *candidates, const sort_spec* sort_control, const struct vlv_request *vlv_request_control); -static int vlv_build_candidate_list( backend *be, struct vlvIndex* p, const struct vlv_request *vlv_request_control, IDList** candidates, struct vlv_response *vlv_response_control); +static int vlv_build_candidate_list( backend *be, struct vlvIndex* p, const struct vlv_request *vlv_request_control, IDList** candidates, struct vlv_response *vlv_response_control, int is_srchlist_locked); /* New mutex for vlv locking PRRWLock * vlvSearchList_lock=NULL; @@ -72,6 +72,7 @@ backend *be = inst->inst_be; vlvSearch_init(newVlvSearch, pb, entryBefore, inst); + /* vlvSearchList is modified; need Wlock */ PR_RWLock_Wlock(be->vlvSearchList_lock); vlvSearch_addtolist(newVlvSearch, (struct vlvSearch **)&be->vlvSearchList); PR_RWLock_Unlock(be->vlvSearchList_lock); @@ -81,24 +82,25 @@ /* Callback to add a new VLV Index specification. Added write lock.*/ int vlv_AddIndexEntry(Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg) -{ - struct vlvSearch *parent; - backend *be= ((ldbm_instance*)arg)->inst_be; - Slapi_DN parentdn; - - slapi_sdn_init(&parentdn); - slapi_sdn_get_parent(slapi_entry_get_sdn(entryBefore),&parentdn); +{ + struct vlvSearch *parent; + backend *be= ((ldbm_instance*)arg)->inst_be; + Slapi_DN parentdn; + + slapi_sdn_init(&parentdn); + slapi_sdn_get_parent(slapi_entry_get_sdn(entryBefore),&parentdn); { - PR_RWLock_Wlock(be->vlvSearchList_lock); + /* vlvSearchList is modified; need Wlock */ + PR_RWLock_Wlock(be->vlvSearchList_lock); parent= vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, &parentdn); if(parent!=NULL) { struct vlvIndex* newVlvIndex= vlvIndex_new(); - newVlvIndex->vlv_be=be; + newVlvIndex->vlv_be=be; vlvIndex_init(newVlvIndex, be, parent, entryBefore); - vlvSearch_addIndex(parent, newVlvIndex); + vlvSearch_addIndex(parent, newVlvIndex); } - PR_RWLock_Unlock(be->vlvSearchList_lock); + PR_RWLock_Unlock(be->vlvSearchList_lock); } slapi_sdn_done(&parentdn); return SLAPI_DSE_CALLBACK_OK; @@ -111,6 +113,7 @@ struct vlvSearch* p=NULL; backend *be= ((ldbm_instance*)arg)->inst_be; + /* vlvSearchList is modified; need Wlock */ PR_RWLock_Wlock(be->vlvSearchList_lock); p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, slapi_entry_get_sdn(entryBefore)); if(p!=NULL) @@ -320,6 +323,7 @@ { struct vlvSearch *t = NULL; struct vlvSearch *nt = NULL; + /* vlvSearchList is modified; need Wlock */ PR_RWLock_Wlock(be->vlvSearchList_lock); for (t = (struct vlvSearch *)be->vlvSearchList; NULL != t; ) { @@ -762,7 +766,7 @@ * * JCM: If only non-sorted attributes are changed, then the indexes don't need updating. * JCM: Detecting this fact, given multi-valued atribibutes, might be tricky... - * Added write lock + * Read lock (traverse vlvSearchList; no change on vlvSearchList/vlvIndex lists) */ int @@ -772,7 +776,7 @@ struct vlvSearch* ps=NULL; struct ldbminfo *li = ((ldbm_instance *)be->be_instance_info)->inst_li; - PR_RWLock_Wlock(be->vlvSearchList_lock); + PR_RWLock_Rlock(be->vlvSearchList_lock); ps = (struct vlvSearch *)be->vlvSearchList; for(;ps!=NULL;ps= ps->vlv_next) { @@ -1059,15 +1063,16 @@ PR_RWLock_Rlock(be->vlvSearchList_lock); if((pi=vlv_find_search(be, base, scope, fstr, sort_control)) == NULL) { unsigned int opnote = SLAPI_OP_NOTE_UNINDEXED; + PR_RWLock_Unlock(be->vlvSearchList_lock); slapi_pblock_set( pb, SLAPI_OPERATION_NOTES, &opnote ); rc = VLV_FIND_SEARCH_FAILED; } else if((*vlv_rc=vlvIndex_accessallowed(pi, pb)) != LDAP_SUCCESS) { + PR_RWLock_Unlock(be->vlvSearchList_lock); rc = VLV_ACCESS_DENIED; - } else if ((*vlv_rc=vlv_build_candidate_list(be,pi,vlv_request_control,candidates,vlv_response_control)) != LDAP_SUCCESS) { + } else if ((*vlv_rc=vlv_build_candidate_list(be,pi,vlv_request_control,candidates,vlv_response_control, 1)) != LDAP_SUCCESS) { rc = VLV_BLD_LIST_FAILED; vlv_response_control->result=*vlv_rc; } - PR_RWLock_Unlock(be->vlvSearchList_lock); return rc; } @@ -1087,7 +1092,7 @@ static int -vlv_build_candidate_list( backend *be, struct vlvIndex* p, const struct vlv_request *vlv_request_control, IDList** candidates, struct vlv_response *vlv_response_control) +vlv_build_candidate_list( backend *be, struct vlvIndex* p, const struct vlv_request *vlv_request_control, IDList** candidates, struct vlv_response *vlv_response_control, int is_srchlist_locked) { int return_value = LDAP_SUCCESS; DB *db = NULL; @@ -1102,6 +1107,9 @@ slapi_sdn_get_dn(vlvIndex_getBase(p)), p->vlv_search->vlv_filter, vlvIndex_getName(p)); if (!vlvIndex_online(p)) { + if (is_srchlist_locked) { + PR_RWLock_Unlock(be->vlvSearchList_lock); + } return -1; } rc = dblayer_get_index_file(be, p->vlv_attrinfo, &db, 0); @@ -1109,9 +1117,20 @@ /* shouldn't happen */ LDAPDebug(LDAP_DEBUG_ANY, "VLV: can't get index file '%s' (err %d)\n", p->vlv_attrinfo->ai_type, rc, 0); + if (is_srchlist_locked) { + PR_RWLock_Unlock(be->vlvSearchList_lock); + } return -1; } + length = vlvIndex_get_indexlength(p, db, 0 /* txn */); + + /* Increment the usage counter */ + vlvIndex_incrementUsage(p); + + if (is_srchlist_locked) { + PR_RWLock_Unlock(be->vlvSearchList_lock); + } err = db->cursor(db, 0 /* txn */, &dbc, 0); if (err != 0) { /* shouldn't happen */ @@ -1120,11 +1139,6 @@ return -1; } - length = vlvIndex_get_indexlength(p, db, 0 /* txn */); - - /* Increment the usage counter */ - vlvIndex_incrementUsage(p); - if (vlv_request_control) { switch(vlv_request_control->tag) { @@ -1454,9 +1468,17 @@ typedown_value= vlv_create_matching_rule_value(sort_control->mr_pb,(struct berval *)&vlv_request_control->value); compare_fn= slapi_berval_cmp; } +retry: /* * Perform a binary search over the candidate list */ + if (0 == candidates->b_nids) { /* idlist is empty */ + LDAPDebug( LDAP_DEBUG_ANY, "vlv_trim_candidates_byvalue: Candidate ID List is empty.\n", 0, 0, 0 ); + ber_bvecfree((struct berval**)typedown_value); + return candidates->b_nids; /* not found */ + } + low= 0; + high= candidates->b_nids-1; do { int err= 0; struct backentry *e= NULL; @@ -1472,7 +1494,15 @@ e = id2entry( be, id, NULL, &err ); if ( e == NULL ) { + int rval; LDAPDebug( LDAP_DEBUG_ANY, "vlv_trim_candidates_byvalue: Candidate ID %lu not found err=%d\n", (u_long)id, err, 0 ); + rval = idl_delete(&candidates, id); + if (0 == rval || 1 == rval || 2 == rval) { + goto retry; + } else { + ber_bvecfree((struct berval**)typedown_value); + return candidates->b_nids; /* not found */ + } } else { @@ -1820,8 +1850,8 @@ IDList *idl; Slapi_Filter *vlv_f; - PR_RWLock_Rlock(be->vlvSearchList_lock); slapi_sdn_init_dn_byref(&base_sdn, base); + PR_RWLock_Rlock(be->vlvSearchList_lock); for (t = (struct vlvSearch *)be->vlvSearchList; t; t = t->vlv_next) { /* all vlv "filters" start with (|(xxx)(objectclass=referral)). * we only care about the (xxx) part. @@ -1847,9 +1877,10 @@ } if (dblayer_get_index_file(be, vi->vlv_attrinfo, &db, 0) == 0) { + length = vlvIndex_get_indexlength(vi, db, 0 /* txn */); + PR_RWLock_Unlock(be->vlvSearchList_lock); err = db->cursor(db, 0 /* txn */, &dbc, 0); if (err == 0) { - length = vlvIndex_get_indexlength(vi, db, 0 /* txn */); if (length == 0) /* 609377: index size could be 0 */ { LDAPDebug(LDAP_DEBUG_TRACE, "vlv: index %s is empty\n", @@ -1864,12 +1895,10 @@ } dblayer_release_index_file(be, vi->vlv_attrinfo, db); if (err == 0) { - PR_RWLock_Unlock(be->vlvSearchList_lock); return idl; } else { LDAPDebug(LDAP_DEBUG_ANY, "vlv find index: err %d\n", err, 0, 0); - PR_RWLock_Unlock(be->vlvSearchList_lock); return NULL; } } @@ -1927,6 +1956,7 @@ tag1=create_vlv_search_tag(dn); buf=slapi_ch_smprintf("%s%s%s%s%s","cn=MCC ",tag1,", cn=",inst->inst_name,LDBM_PLUGIN_ROOT); newdn=slapi_sdn_new_dn_byval(buf); + /* vlvSearchList is modified; need Wlock */ PR_RWLock_Wlock(be->vlvSearchList_lock); p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, newdn); if(p!=NULL) From fedora-directory-commits at redhat.com Fri Jan 11 00:44:41 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 10 Jan 2008 19:44:41 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldif2ldbm.c, 1.7, 1.7.2.1 vlv_srch.c, 1.6, 1.6.2.1 Message-ID: <200801110044.m0B0ifIs024507@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24438 Modified Files: Tag: Directory71RtmBranch ldif2ldbm.c vlv_srch.c Log Message: Resolves: #243820 Summary: Online browsing indexing hangs Description: applied the patch to Directory71RtmBranch Index: ldif2ldbm.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- ldif2ldbm.c 19 Apr 2005 22:07:38 -0000 1.7 +++ ldif2ldbm.c 11 Jan 2008 00:44:38 -0000 1.7.2.1 @@ -188,7 +188,7 @@ int *status) { backend *be; - const char *pdn; + char *pdn; ID pid = 0; slapi_pblock_get(pb, SLAPI_BACKEND, &be); @@ -216,7 +216,7 @@ * suffix entry, or its erroneous. So, we signal this to the * caller via the status parameter. */ - bv.bv_val = (char *)pdn; + bv.bv_val = pdn; bv.bv_len = strlen(pdn); if ( (idl = index_read( be, "entrydn", indextype_EQUALITY, &bv, NULL, &err )) != NULL ) { @@ -225,7 +225,7 @@ } else if ( 0 != err ) { if (DB_NOTFOUND != err ) { LDAPDebug( LDAP_DEBUG_ANY, "database error %d\n", err, 0, 0 ); - slapi_ch_free( (void**)&pdn ); + slapi_ch_free_string( &pdn ); return( -1 ); } else { if (NULL != status) { @@ -233,7 +233,7 @@ } } } - slapi_ch_free( (void**)&pdn ); + slapi_ch_free_string( &pdn ); } else { if (NULL != status) { *status = IMPORT_ADD_OP_ATTRS_NO_PARENT; @@ -315,7 +315,7 @@ * let's do it so we can reuse the modify routines) */ cache_lock_entry( &inst->inst_cache, e ); modify_init(&mc,e); - sprintf(value_buffer,"%lu",sub_count); + sprintf(value_buffer,"%u",sub_count); /* attr numsubordinates could already exist in the entry, let's check whether it's already there or not */ isreplace = (attrlist_find(e->ep_entry->e_attrs, numsubordinates) != NULL); @@ -1252,7 +1252,7 @@ "ldbm2index: Unknown VLV Index named '%s'\n", index, 0, 0); LDAPDebug(LDAP_DEBUG_ANY, "ldbm2index: Known VLV Indexes are: %s\n", text, 0, 0); - slapi_ch_free((void**)&text); + slapi_ch_free_string(&text); } /* @@ -1276,20 +1276,25 @@ IDList *idl = NULL; /* optimization for vlv index creation */ int numvlv = 0; int return_value = -1; + int rc = -1; ID temp_id; - int i, j; + int i, j, vlvidx; ID lastid; - struct backentry *ep; + struct backentry *ep = NULL; char *type; NIDS idindex = 0; int count = 0; Slapi_Attr *attr; Slapi_Task *task; - int ret = 0; int isfirst = 1; int index_aid = 0; /* index ancestorid */ + struct vlvIndex *vlvip = NULL; + back_txn txn; LDAPDebug( LDAP_DEBUG_TRACE, "=> ldbm_back_ldbm2index\n", 0, 0, 0 ); + if ( g_get_shutdown() || c_get_shutdown() ) { + return return_value; + } slapi_pblock_get(pb, SLAPI_BACKEND_INSTANCE_NAME, &instance_name); slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li); @@ -1301,6 +1306,7 @@ /* No ldbm backend exists until we process the config info. */ li->li_flags |= TASK_RUNNING_FROM_COMMANDLINE; ldbm_config_load_dse_info(li); + txn.back_txn_txn = NULL; /* no transaction */ } inst = ldbm_instance_find_by_name(li, instance_name); @@ -1311,7 +1317,7 @@ } LDAPDebug(LDAP_DEBUG_ANY, "Unknown ldbm instance %s\n", instance_name, 0, 0); - return -1; + return return_value; } be = inst->inst_be; slapi_pblock_set(pb, SLAPI_BACKEND, be); @@ -1326,14 +1332,14 @@ if (0 != dblayer_start(li,DBLAYER_INDEX_MODE)) { LDAPDebug( LDAP_DEBUG_ANY, "ldbm2index: Failed to init database\n", 0, 0, 0 ); - return( -1 ); + return return_value; } /* dblayer_instance_start will init the id2entry index. */ if (0 != dblayer_instance_start(be, DBLAYER_INDEX_MODE)) { - LDAPDebug(LDAP_DEBUG_ANY, "db2ldif: Failed to init instance\n", + LDAPDebug(LDAP_DEBUG_ANY, "ldbm2index: Failed to init instance\n", 0, 0, 0); - return -1; + return return_value; } /* Initialise the Virtual List View code */ @@ -1345,34 +1351,31 @@ LDAPDebug(LDAP_DEBUG_ANY, "ldbm: '%s' is already in the middle of " "another task and cannot be disturbed.\n", inst->inst_name, 0, 0); - return -1; + return return_value; } if ((( dblayer_get_id2entry( be, &db )) != 0 ) || (db == NULL)) { LDAPDebug( LDAP_DEBUG_ANY, "Could not open/create id2entry\n", 0, 0, 0 ); - instance_set_not_busy(inst); - return( -1 ); + goto err_min; } /* get a cursor to we can walk over the table */ - return_value = db->cursor(db, NULL, &dbc, 0); - if (0 != return_value ) { + rc = db->cursor(db, NULL, &dbc, 0); + if (0 != rc ) { LDAPDebug( LDAP_DEBUG_ANY, "Failed to get cursor for ldbm2index\n", 0, 0, 0 ); - dblayer_release_id2entry(be, db); - instance_set_not_busy(inst); - return( -1 ); + goto err_min; } /* ask for the last id so we can give cute percentages */ key.flags = DB_DBT_MALLOC; data.flags = DB_DBT_MALLOC; - return_value = dbc->c_get(dbc, &key, &data, DB_LAST); - if (return_value == DB_NOTFOUND) { + rc = dbc->c_get(dbc, &key, &data, DB_LAST); + if (rc == DB_NOTFOUND) { lastid = 0; isfirst = 0; /* neither a first nor a last */ - } else if (return_value == 0) { + } else if (rc == 0) { lastid = id_stored_to_internal((char *)key.data); free(key.data); free(data.data); @@ -1381,10 +1384,7 @@ LDAPDebug(LDAP_DEBUG_ANY, "Failed to seek within id2entry (BAD %d)\n", return_value, 0 ,0); - dbc->c_close(dbc); - dblayer_release_id2entry(be, db); - instance_set_not_busy(inst); - return( -1 ); + goto err_out; } /* Work out which indexes we should build */ @@ -1395,11 +1395,13 @@ */ { char **attrs = NULL; - struct vlvIndex *p = NULL; struct attrinfo *ai = NULL; slapi_pblock_get(pb, SLAPI_DB2INDEX_ATTRS, &attrs); for (i = 0; attrs[i] != NULL; i++) { + if ( g_get_shutdown() || c_get_shutdown() ) { + goto err_out; + } switch(attrs[i][0]) { case 't': /* attribute type to index */ db2index_add_indexed_attr(be, attrs[i]); @@ -1427,13 +1429,11 @@ dblayer_erase_index_file(be, ai, i/* chkpt; 1st time only */); break; case 'T': /* VLV Search to index */ - p = vlv_find_searchname((attrs[i])+1, be); - if (p == NULL) { + vlvip = vlv_find_searchname((attrs[i])+1, be); + if (vlvip == NULL) { ldbm2index_bad_vlv(task, inst, attrs[i]+1); - ret = -1; - goto out; } else { - vlvIndex_go_offline(p, be); + vlvIndex_go_offline(vlvip, be); if (pvlv == NULL) { pvlv = (struct vlvIndex **)slapi_ch_calloc(1, sizeof(struct vlvIndex *)); @@ -1441,10 +1441,10 @@ pvlv = (struct vlvIndex **)slapi_ch_realloc((char*)pvlv, (numvlv+1)*sizeof(struct vlvIndex *)); } - pvlv[numvlv] = p; + pvlv[numvlv] = vlvip; numvlv++; /* Get rid of the index if it already exists */ - PR_Delete(vlvIndex_filename(p)); + PR_Delete(vlvIndex_filename(vlvip)); if (task) { slapi_task_log_notice(task, "%s: Indexing VLV: %s", inst->inst_name, attrs[i]+1); @@ -1462,12 +1462,12 @@ * entire database. */ if (!indexAttrs && !index_aid && pvlv) { - int i, err; + int err; char **suffix_list = NULL; /* create suffix list */ - for (i = 0; i < numvlv; i++) { - char *s = slapi_ch_strdup(slapi_sdn_get_dn(vlvIndex_getBase(pvlv[i]))); + for (vlvidx = 0; vlvidx < numvlv; vlvidx++) { + char *s = slapi_ch_strdup(slapi_sdn_get_dn(vlvIndex_getBase(pvlv[vlvidx]))); s = slapi_dn_normalize_case(s); charray_add(&suffix_list, s); @@ -1503,11 +1503,10 @@ idindex = 0; } - /* Bug 603120: slapd dumps core while indexing and deleting the db at the - * same time. Now added the lock for the indexing code too. - */ - vlv_acquire_lock(be); while (1) { + if ( g_get_shutdown() || c_get_shutdown() ) { + goto err_out; + } if (idl) { if (idindex >= idl->b_nids) break; @@ -1516,12 +1515,11 @@ key.size = sizeof(temp_id); data.flags = DB_DBT_MALLOC; - return_value = db->get(db, NULL, &key, &data, 0); - if (return_value) { + rc = db->get(db, NULL, &key, &data, 0); + if (rc) { LDAPDebug(LDAP_DEBUG_ANY, "%s: Failed " "to read database, errno=%d (%s)\n", - inst->inst_name, return_value, - dblayer_strerror(return_value)); + inst->inst_name, rc, dblayer_strerror(return_value)); if (task) { slapi_task_log_notice(task, "%s: Failed to read database, err %d (%s)", @@ -1537,27 +1535,24 @@ key.flags = DB_DBT_MALLOC; data.flags = DB_DBT_MALLOC; if (isfirst) { - return_value = dbc->c_get(dbc, &key, &data, DB_FIRST); + rc = dbc->c_get(dbc, &key, &data, DB_FIRST); isfirst = 0; } else{ - return_value = dbc->c_get(dbc, &key, &data, DB_NEXT); + rc = dbc->c_get(dbc, &key, &data, DB_NEXT); } - if (0 != return_value) { - if (DB_NOTFOUND == return_value) { - break; - } else { - LDAPDebug(LDAP_DEBUG_ANY, "%s: Failed to read database, " - "errno=%d (%s)\n", inst->inst_name, return_value, - dblayer_strerror(return_value)); - if (task) { - slapi_task_log_notice(task, + if (DB_NOTFOUND == rc) { + break; + } else if (0 != rc) { + LDAPDebug(LDAP_DEBUG_ANY, "%s: Failed to read database, " + "errno=%d (%s)\n", inst->inst_name, rc, + dblayer_strerror(rc)); + if (task) { + slapi_task_log_notice(task, "%s: Failed to read database, err %d (%s)", - inst->inst_name, return_value, - dblayer_strerror(return_value)); - } - break; + inst->inst_name, rc, dblayer_strerror(rc)); } + break; } temp_id = id_stored_to_internal((char *)key.data); free(key.data); @@ -1594,9 +1589,7 @@ LDAPDebug(LDAP_DEBUG_ANY, "%s: ERROR: Could not add op attrs to entry (id %lu)\n", inst->inst_name, (u_long)ep->ep_id, 0); - backentry_free( &ep ); - ret = -1; - goto out; + goto err_out; } /* @@ -1606,21 +1599,17 @@ for (i = slapi_entry_first_attr(ep->ep_entry, &attr); i == 0; i = slapi_entry_next_attr(ep->ep_entry, attr, &attr)) { Slapi_Value **svals; - int rc = 0; slapi_attr_get_type( attr, &type ); for ( j = 0; indexAttrs[j] != NULL; j++ ) { + if ( g_get_shutdown() || c_get_shutdown() ) { + goto err_out; + } if (slapi_attr_type_cmp(indexAttrs[j], type, SLAPI_TYPE_CMP_SUBTYPE) == 0 ) { - back_txn txn; svals = attr_get_present_values(attr); - if (run_from_cmdline) - { - txn.back_txn_txn = NULL; - } - else - { + if (!run_from_cmdline) { rc = dblayer_txn_begin(li, NULL, &txn); if (0 != rc) { LDAPDebug(LDAP_DEBUG_ANY, @@ -1637,8 +1626,8 @@ inst->inst_name, indexAttrs[j], rc, dblayer_strerror(rc)); } - ret = -2; - goto out; + return_value = -2; + goto err_out; } } rc = index_addordel_values_sv( @@ -1657,13 +1646,13 @@ "(err %d: %s)", inst->inst_name, indexAttrs[j], rc, dblayer_strerror(rc)); } - if (!run_from_cmdline) - dblayer_txn_abort(li, &txn); - ret = -2; - goto out; + if (!run_from_cmdline) { + dblayer_txn_abort(li, &txn); + } + return_value = -2; + goto err_out; } - if (!run_from_cmdline) - { + if (!run_from_cmdline) { rc = dblayer_txn_commit(li, &txn); if (0 != rc) { LDAPDebug(LDAP_DEBUG_ANY, @@ -1680,8 +1669,8 @@ "(err %d: %s)", inst->inst_name, indexAttrs[j], rc, dblayer_strerror(rc)); } - ret = -2; - goto out; + return_value = -2; + goto err_out; } } } @@ -1692,21 +1681,16 @@ /* * Update the Virtual List View indexes */ - for ( j = 0; jinst_name, indexAttrs[j], 0); + inst->inst_name, indexAttrs[vlvidx], 0); LDAPDebug(LDAP_DEBUG_ANY, "%s: Error %d: %s\n", inst->inst_name, rc, dblayer_strerror(rc)); @@ -1714,20 +1698,26 @@ slapi_task_log_notice(task, "%s: ERROR: failed to begin txn for update index '%s' " "(err %d: %s)", inst->inst_name, - indexAttrs[j], rc, dblayer_strerror(rc)); + indexAttrs[vlvidx], rc, dblayer_strerror(rc)); } - ret = -2; - goto out; + return_value = -2; + goto err_out; } } - vlv_update_index(pvlv[j], &txn, li, pb, NULL, ep); + /* + * lock is needed around vlv_update_index to protect the + * vlv structure. + */ + vlv_acquire_lock(be); + vlv_update_index(pvlv[vlvidx], &txn, li, pb, NULL, ep); + vlv_release_lock(be); if (!run_from_cmdline) { rc = dblayer_txn_commit(li, &txn); if (0 != rc) { LDAPDebug(LDAP_DEBUG_ANY, "%s: ERROR: failed to commit txn for update index '%s'\n", - inst->inst_name, indexAttrs[j], 0); + inst->inst_name, indexAttrs[vlvidx], 0); LDAPDebug(LDAP_DEBUG_ANY, "%s: Error %d: %s\n", inst->inst_name, rc, dblayer_strerror(rc)); @@ -1735,10 +1725,10 @@ slapi_task_log_notice(task, "%s: ERROR: failed to commit txn for update index '%s' " "(err %d: %s)", inst->inst_name, - indexAttrs[j], rc, dblayer_strerror(rc)); + indexAttrs[vlvidx], rc, dblayer_strerror(rc)); } - ret = -2; - goto out; + return_value = -2; + goto err_out; } } } @@ -1747,8 +1737,6 @@ * Update the ancestorid index */ if (index_aid) { - int rc; - rc = ldbm_ancestorid_index_entry(be, ep, BE_INDEX_ADD, NULL); if (rc != 0) { LDAPDebug(LDAP_DEBUG_ANY, @@ -1763,8 +1751,8 @@ "(err %d: %s)", inst->inst_name, rc, dblayer_strerror(rc)); } - ret = -2; - goto out; + return_value = -2; + goto err_out; } } @@ -1792,7 +1780,6 @@ backentry_free( &ep ); } - vlv_release_lock(be); /* if we got here, we finished successfully */ @@ -1804,8 +1791,8 @@ PR_ASSERT(ai != NULL); ai->ai_indexmask &= ~INDEX_OFFLINE; } - for (i = 0; i < numvlv; i++) { - vlvIndex_go_online(pvlv[i], be); + for (vlvidx = 0; vlvidx < numvlv; vlvidx++) { + vlvIndex_go_online(pvlv[vlvidx], be); } if (task) { @@ -1816,19 +1803,27 @@ } LDAPDebug(LDAP_DEBUG_ANY, "%s: Finished indexing.\n", inst->inst_name, 0, 0); - -out: + return_value = 0; /* success */ +err_out: + backentry_free( &ep ); /* if ep or *ep is NULL, it does nothing */ if (idl) { idl_free(idl); } else { dbc->c_close(dbc); } - dblayer_release_id2entry( be, db ); - + if (return_value < 0) {/* error case: undo vlv indexing */ + /* if jumped to out due to an error, vlv lock has not been released */ + for ( vlvidx = 0; vlvidx < numvlv; vlvidx++ ) { + vlvIndex_go_offline(pvlv[vlvidx], be); + vlv_acquire_lock(be); + vlvIndex_delete(&pvlv[vlvidx]); + vlv_release_lock(be); + } + } +err_min: + dblayer_release_id2entry( be, db ); /* nope */ instance_set_not_busy(inst); - LDAPDebug( LDAP_DEBUG_TRACE, "<= ldbm_back_ldbm2index\n", 0, 0, 0 ); - if (run_from_cmdline) { if (0 != dblayer_flush(li)) { LDAPDebug(LDAP_DEBUG_ANY, @@ -1844,8 +1839,13 @@ if (indexAttrs) { slapi_ch_free((void **)&indexAttrs); } + if (pvlv) { + slapi_ch_free((void **)&pvlv); + } + + LDAPDebug( LDAP_DEBUG_TRACE, "<= ldbm_back_ldbm2index\n", 0, 0, 0 ); - return (ret); + return return_value; } /* @@ -1887,7 +1887,7 @@ attr_index_config(be, "from db2index()", 0, argc, nsslapd_index_value, 0); for ( i=0; ivlv_sortkey); attrinfo_delete(&((*ppvs)->vlv_attrinfo)); + slapi_ch_free((void**)&((*ppvs)->vlv_name)); + slapi_ch_free((void**)&((*ppvs)->vlv_filename)); slapi_ch_free((void**)&((*ppvs)->vlv_mrpb)); slapi_ch_free((void**)&((*ppvs)->vlv_syntax_plugin)); PR_DestroyLock((*ppvs)->vlv_indexlength_lock); From fedora-directory-commits at redhat.com Fri Jan 11 01:02:54 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 10 Jan 2008 20:02:54 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm vlv.c, 1.6.2.2, 1.6.2.3 Message-ID: <200801110102.m0B12sMt031563@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31508 Modified Files: Tag: Directory71RtmBranch vlv.c Log Message: Resolves: #171081 Summary: ldapsearch hung at browsing index creation Description: applied the patch to Directory71RtmBranch Index: vlv.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv.c,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- vlv.c 10 Jan 2008 19:44:21 -0000 1.6.2.2 +++ vlv.c 11 Jan 2008 01:02:52 -0000 1.6.2.3 @@ -111,18 +111,28 @@ int vlv_DeleteSearchEntry(Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg) { struct vlvSearch* p=NULL; - backend *be= ((ldbm_instance*)arg)->inst_be; - + ldbm_instance *inst = (ldbm_instance*)arg; + backend *be= inst->inst_be; + + if (instance_set_busy(inst) != 0) + { + LDAPDebug( LDAP_DEBUG_ANY, + "Backend instance: '%s' is already in the middle of " + "another task and cannot be disturbed.\n", + inst->inst_name, 0, 0); + return SLAPI_DSE_CALLBACK_ERROR; + } /* vlvSearchList is modified; need Wlock */ - PR_RWLock_Wlock(be->vlvSearchList_lock); - p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, slapi_entry_get_sdn(entryBefore)); + PR_RWLock_Wlock(be->vlvSearchList_lock); + p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, slapi_entry_get_sdn(entryBefore)); if(p!=NULL) - { - LDAPDebug( LDAP_DEBUG_ANY, "Deleted Virtual List View Search (%s).\n", p->vlv_name, 0, 0); - vlvSearch_removefromlist((struct vlvSearch **)&be->vlvSearchList,p->vlv_dn); - vlvSearch_delete(&p); + { + LDAPDebug( LDAP_DEBUG_ANY, "Deleted Virtual List View Search (%s).\n", p->vlv_name, 0, 0); + vlvSearch_removefromlist((struct vlvSearch **)&be->vlvSearchList,p->vlv_dn); + vlvSearch_delete(&p); } - PR_RWLock_Unlock(be->vlvSearchList_lock); + PR_RWLock_Unlock(be->vlvSearchList_lock); + instance_set_not_busy(inst); return SLAPI_DSE_CALLBACK_OK; } @@ -131,8 +141,18 @@ int vlv_DeleteIndexEntry(Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg) { - LDAPDebug( LDAP_DEBUG_ANY, "Deleted Virtual List View Index.\n", 0, 0, 0); - return SLAPI_DSE_CALLBACK_OK; + ldbm_instance *inst = (ldbm_instance*)arg; + if (inst && (inst->inst_flags & INST_FLAG_BUSY)) { + LDAPDebug( LDAP_DEBUG_ANY, + "Backend instance: '%s' is already in the middle of " + "another task and cannot be disturbed.\n", + inst->inst_name, 0, 0); + return SLAPI_DSE_CALLBACK_ERROR; + } else { + LDAPDebug( LDAP_DEBUG_ANY, + "Deleted Virtual List View Index.\n", 0, 0, 0); + return SLAPI_DSE_CALLBACK_OK; + } } @@ -1492,11 +1512,12 @@ } id= candidates->b_ids[current]; e = id2entry( be, id, NULL, &err ); - if ( e == NULL ) - { + if ( e == NULL ) + { int rval; - LDAPDebug( LDAP_DEBUG_ANY, "vlv_trim_candidates_byvalue: Candidate ID %lu not found err=%d\n", (u_long)id, err, 0 ); - rval = idl_delete(&candidates, id); + LDAPDebug( LDAP_DEBUG_ANY, "vlv_trim_candidates_byvalue: " + "Candidate ID %lu not found err=%d\n", (u_long)id, err, 0 ); + rval = idl_delete((IDList **)&candidates, id); if (0 == rval || 1 == rval || 2 == rval) { goto retry; } else { @@ -1953,6 +1974,14 @@ const char *dn= slapi_sdn_get_dn(&e->e_sdn); backend *be= inst->inst_be; + if (instance_set_busy(inst) != 0) + { + LDAPDebug( LDAP_DEBUG_ANY, + "Backend instance: '%s' is already in the middle of " + "another task and cannot be disturbed.\n", + inst->inst_name, 0, 0); + return LDAP_OPERATIONS_ERROR; + } tag1=create_vlv_search_tag(dn); buf=slapi_ch_smprintf("%s%s%s%s%s","cn=MCC ",tag1,", cn=",inst->inst_name,LDBM_PLUGIN_ROOT); newdn=slapi_sdn_new_dn_byval(buf); @@ -1991,6 +2020,7 @@ } else { PR_RWLock_Unlock(be->vlvSearchList_lock); } + instance_set_not_busy(inst); slapi_ch_free((void **)&tag1); slapi_ch_free((void **)&buf); slapi_sdn_free(&newdn); From fedora-directory-commits at redhat.com Fri Jan 11 01:09:17 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 10 Jan 2008 20:09:17 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd libglobs.c, 1.6, 1.6.2.1 proto-slap.h, 1.10.2.3, 1.10.2.4 connection.c, 1.8, 1.8.2.1 daemon.c, 1.6, 1.6.2.1 task.c, 1.7, 1.7.2.1 monitor.c, 1.5, 1.5.2.1 psearch.c, 1.5, 1.5.2.1 fe.h, 1.4, 1.4.2.1 globals.c, 1.4, 1.4.2.1 Message-ID: <200801110109.m0B19H7h031725@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31666 Modified Files: Tag: Directory71RtmBranch libglobs.c proto-slap.h connection.c daemon.c task.c monitor.c psearch.c fe.h globals.c Log Message: Resolves: #240897 Summary: CRM 1474928 : ds7.1 db index/vlv not handling a stop-slapd, hangs slapd Description: applied the patch to Directory71RtmBranch Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- libglobs.c 19 Apr 2005 22:07:36 -0000 1.6 +++ libglobs.c 11 Jan 2008 01:09:14 -0000 1.6.2.1 @@ -651,6 +651,29 @@ } /* + * counter for active threads + */ +static PRInt32 active_threads = 0; + +void +g_incr_active_threadcnt() +{ + PR_AtomicIncrement(&active_threads); +} + +void +g_decr_active_threadcnt() +{ + PR_AtomicDecrement(&active_threads); +} + +int +g_get_active_threadcnt() +{ + return (int)active_threads; +} + +/* ** Setting this flag forces the server to shutdown. */ static int slapd_shutdown; Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -u -r1.10.2.3 -r1.10.2.4 --- proto-slap.h 18 Mar 2006 17:48:37 -0000 1.10.2.3 +++ proto-slap.h 11 Jan 2008 01:09:14 -0000 1.10.2.4 @@ -196,6 +196,9 @@ int g_get_deftime(); void be_unbindall( Connection *conn, Operation *op); int be_nbackends_public(); +void g_incr_active_threadcnt(); +void g_decr_active_threadcnt(); +int g_get_active_threadcnt(); /* * bind.c Index: connection.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/connection.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- connection.c 12 May 2005 03:43:15 -0000 1.8 +++ connection.c 11 Jan 2008 01:09:14 -0000 1.8.2.1 @@ -393,7 +393,7 @@ LDAPDebug( LDAP_DEBUG_ANY, "PR_CreateThread failed, " SLAPI_COMPONENT_NAME_NSPR " error %d (%s)\n", prerr, slapd_pr_strerror( prerr ), 0 ); } else { - PR_AtomicIncrement(&active_threads); + g_incr_active_threadcnt(); } } } @@ -730,7 +730,7 @@ } } } - PR_AtomicDecrement(&active_threads); + g_decr_active_threadcnt(); } static int handle_read_data(Connection *conn,Operation **op, @@ -1911,9 +1911,11 @@ No bother to do so much calcuation, short-cut to non-turbo mode if no activities in passed interval */ new_mode = 0; } else { + double activet = 0.0; connection_find_our_rank(conn,&connection_count, &our_rank); LDAPDebug(LDAP_DEBUG_CONNS,"conn %d turbo rank = %d out of %d conns\n",conn->c_connid,our_rank,connection_count); - threshold_rank = (int)((double)active_threads * ((double)CONN_TURBO_PERCENTILE / 100.0) ); + activet = (double)g_get_active_threadcnt(); + threshold_rank = (int)(activet * ((double)CONN_TURBO_PERCENTILE / 100.0)); /* adjust threshold_rank according number of connections, less turbo threads as more connections, @@ -1986,7 +1988,7 @@ if( op_shutdown ) { LDAPDebug( LDAP_DEBUG_TRACE, "op_thread received shutdown signal\n", 0, 0, 0 ); - PR_AtomicDecrement(&active_threads); + g_decr_active_threadcnt(); return; } @@ -2002,7 +2004,7 @@ case CONN_SHUTDOWN: LDAPDebug( LDAP_DEBUG_TRACE, "op_thread received shutdown signal\n", 0, 0, 0 ); - PR_AtomicDecrement(&active_threads); + g_decr_active_threadcnt(); return; case CONN_FOUND_WORK_TO_DO: default: @@ -2065,7 +2067,7 @@ case CONN_SHUTDOWN: LDAPDebug( LDAP_DEBUG_TRACE, "op_thread received shutdown signal\n", 0, 0, 0 ); - PR_AtomicDecrement(&active_threads); + g_decr_active_threadcnt(); return; default: break; @@ -2296,7 +2298,7 @@ #ifdef _WIN32 LDAPDebug( LDAP_DEBUG_ANY, "slapd shutting down - waiting for %d threads to terminate\n", - active_threads, 0, 0 ); + g_get_active_threadcnt(), 0, 0 ); /* kill off each worker waiting on GetQueuedCompletionStatus */ for ( i = 0; i < max_threads; ++ i ) { Index: daemon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- daemon.c 19 Apr 2005 22:07:36 -0000 1.6 +++ daemon.c 11 Jan 2008 01:09:15 -0000 1.6.2.1 @@ -695,15 +695,16 @@ housekeeping_stop(); /* Run this after op_thread_cleanup() logged sth */ #ifndef _WIN32 - if ( active_threads > 0 ) { + threads = g_get_active_threadcnt(); + if ( threads > 0 ) { LDAPDebug( LDAP_DEBUG_ANY, "slapd shutting down - waiting for %d thread%s to terminate\n", - active_threads, ( active_threads > 1 ) ? "s" : "", 0 ); + threads, ( threads > 1 ) ? "s" : "", 0 ); } #endif - threads = active_threads; - while ( active_threads > 0 ) { + threads = g_get_active_threadcnt(); + while ( threads > 0 ) { PRPollDesc xpd; char x; int spe = 0; @@ -733,11 +734,11 @@ /* no data */ } DS_Sleep(PR_INTERVAL_NO_WAIT); - if ( threads != active_threads ) { + if ( threads != g_get_active_threadcnt() ) { LDAPDebug( LDAP_DEBUG_TRACE, "slapd shutting down - waiting for %d threads to terminate\n", - active_threads, 0, 0 ); - threads = active_threads; + g_get_active_threadcnt(), 0, 0 ); + threads = g_get_active_threadcnt(); } } @@ -1096,7 +1097,7 @@ snmp_collator_update(); prevtime = curtime; - num_active_threads = active_threads; + num_active_threads = g_get_active_threadcnt(); if ( (num_active_threads == 0) || (difftime(curtime, housekeeping_fire_time) >= slapd_housekeeping_timer*3) ) { Index: task.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/task.c,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- task.c 19 Apr 2005 22:07:37 -0000 1.7 +++ task.c 11 Jan 2008 01:09:15 -0000 1.7.2.1 @@ -585,6 +585,7 @@ int count; Slapi_Task *task = pb->pb_task; + g_incr_active_threadcnt(); for (count = 0, inp = instance_names; *inp; inp++, count++) ; task->task_work = count; @@ -684,6 +685,7 @@ task->task_exitcode = rv; task->task_state = SLAPI_TASK_FINISHED; slapi_task_status_changed(task); + g_decr_active_threadcnt(); } static int task_export_add(Slapi_PBlock *pb, Slapi_Entry *e, @@ -925,6 +927,7 @@ Slapi_Task *task = pb->pb_task; int rv; + g_incr_active_threadcnt(); task->task_work = 1; task->task_progress = 0; task->task_state = SLAPI_TASK_RUNNING; @@ -953,6 +956,7 @@ slapi_ch_free((void **)&pb->pb_seq_val); slapi_pblock_destroy(pb); + g_decr_active_threadcnt(); } static int task_backup_add(Slapi_PBlock *pb, Slapi_Entry *e, @@ -1068,6 +1072,7 @@ Slapi_Task *task = pb->pb_task; int rv; + g_incr_active_threadcnt(); task->task_work = 1; task->task_progress = 0; task->task_state = SLAPI_TASK_RUNNING; @@ -1096,6 +1101,7 @@ slapi_ch_free((void **)&pb->pb_seq_val); slapi_pblock_destroy(pb); + g_decr_active_threadcnt(); } static int task_restore_add(Slapi_PBlock *pb, Slapi_Entry *e, @@ -1219,6 +1225,7 @@ Slapi_Task *task = pb->pb_task; int rv; + g_incr_active_threadcnt(); task->task_work = 1; task->task_progress = 0; task->task_state = SLAPI_TASK_RUNNING; @@ -1239,6 +1246,7 @@ charray_free(pb->pb_db2index_attrs); slapi_ch_free((void **)&pb->pb_instance_name); slapi_pblock_destroy(pb); + g_decr_active_threadcnt(); } static int task_index_add(Slapi_PBlock *pb, Slapi_Entry *e, Index: monitor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/monitor.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- monitor.c 19 Apr 2005 22:07:36 -0000 1.5 +++ monitor.c 11 Jan 2008 01:09:15 -0000 1.5.2.1 @@ -81,7 +81,7 @@ attrlist_replace( &e->e_attrs, "version", vals ); slapi_ch_free( (void **) &val.bv_val ); - sprintf( buf, "%d", active_threads ); + sprintf( buf, "%d", g_get_active_threadcnt() ); val.bv_val = buf; val.bv_len = strlen( buf ); attrlist_replace( &e->e_attrs, "threads", vals ); Index: psearch.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/psearch.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- psearch.c 19 Apr 2005 22:07:36 -0000 1.5 +++ psearch.c 11 Jan 2008 01:09:15 -0000 1.5.2.1 @@ -290,7 +290,7 @@ char **pbattrs = NULL; int conn_acq_flag = 0; - PR_AtomicIncrement( &active_threads ); + g_incr_active_threadcnt(); /* need to acquire a reference to this connection so that it will not be released or cleaned up out from under us */ @@ -438,7 +438,7 @@ pe_ch_free( &peq ); } slapi_ch_free((void **) &ps ); - PR_AtomicDecrement(&active_threads); + g_decr_active_threadcnt(); } Index: fe.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fe.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- fe.h 19 Apr 2005 22:07:36 -0000 1.4 +++ fe.h 11 Jan 2008 01:09:15 -0000 1.4.2.1 @@ -51,7 +51,6 @@ #endif /* DONT_DECLARE_SLAPD_LDAP_DEBUG */ #endif #endif -extern int active_threads; extern PRInt32 ops_initiated; extern PRInt32 ops_completed; extern PRLock *ops_mutex; Index: globals.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/globals.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- globals.c 19 Apr 2005 22:07:36 -0000 1.4 +++ globals.c 11 Jan 2008 01:09:15 -0000 1.4.2.1 @@ -86,14 +86,12 @@ /* * global variables that need mutex protection */ -int active_threads; PRInt32 ops_initiated; PRInt32 ops_completed; PRLock *ops_mutex; int num_conns; PRLock *num_conns_mutex; - /* DEC/COMPAQ has released a patch for 4.0d (e?) which will speed up malloc/free considerably in multithreaded multiprocessor From fedora-directory-commits at redhat.com Fri Jan 11 03:06:06 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 10 Jan 2008 22:06:06 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm vlv.c, 1.6.2.3, 1.6.2.4 Message-ID: <200801110306.m0B366Hq015366@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322 Modified Files: Tag: Directory71RtmBranch vlv.c Log Message: Resolves: #314851 Summary: vlv: crash after repeated backend creation/deletion Description: applied the patch to Directory71RtmBranch Index: vlv.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv.c,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -r1.6.2.3 -r1.6.2.4 --- vlv.c 11 Jan 2008 01:02:52 -0000 1.6.2.3 +++ vlv.c 11 Jan 2008 03:06:04 -0000 1.6.2.4 @@ -71,6 +71,9 @@ struct vlvSearch* newVlvSearch= vlvSearch_new(); backend *be = inst->inst_be; + if (NULL == be) { /* backend is not associated */ + return SLAPI_DSE_CALLBACK_ERROR; + } vlvSearch_init(newVlvSearch, pb, entryBefore, inst); /* vlvSearchList is modified; need Wlock */ PR_RWLock_Wlock(be->vlvSearchList_lock); @@ -275,6 +278,9 @@ ldbm_instance *inst = (ldbm_instance*)arg; backend *be= inst->inst_be; + if (NULL == be) { /* backend is not associated */ + return SLAPI_DSE_CALLBACK_ERROR; + } vlvSearch_init(newVlvSearch, pb, entryBefore, inst); vlvSearch_addtolist(newVlvSearch, (struct vlvSearch **)&be->vlvSearchList); return SLAPI_DSE_CALLBACK_OK; From fedora-directory-commits at redhat.com Fri Jan 11 18:39:13 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 13:39:13 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru ptpreop.c, 1.4, 1.4.2.1 Message-ID: <200801111839.m0BIdDXi025339@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25304 Modified Files: Tag: Directory71RtmBranch ptpreop.c Log Message: Resolves: #176302 Summary: crash in PTA plugin when bind returned controls Description: applied the patch to Directory71RtmBranch Index: ptpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptpreop.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- ptpreop.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptpreop.c 11 Jan 2008 18:39:10 -0000 1.4.2.1 @@ -143,7 +143,7 @@ static int passthru_bindpreop( Slapi_PBlock *pb ) { - int rc, method; + int rc, method, freeresctrls=1; char *normbinddn, *matcheddn; char *libldap_errmsg, *pr_errmsg, *errmsg; PassThruConfig *cfg; @@ -253,7 +253,8 @@ * Send a result to our client. */ if ( resctrls != NULL ) { - (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, &resctrls ); + (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, resctrls ); + freeresctrls=0; } slapi_send_ldap_result( pb, rc, matcheddn, errmsg, 0, urls ); } @@ -270,7 +271,7 @@ if ( pr_errmsg != NULL ) { PR_smprintf_free( pr_errmsg ); } - if ( resctrls != NULL ) { + if ( freeresctrls && (resctrls != NULL) ) { ldap_controls_free( resctrls ); } if ( matcheddn != NULL ) { From fedora-directory-commits at redhat.com Fri Jan 11 19:20:26 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 14:20:26 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/chainingdb cb_search.c, 1.5, 1.5.2.1 Message-ID: <200801111920.m0BJKQdi000649@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv554/plugins/chainingdb Modified Files: Tag: Directory71RtmBranch cb_search.c Log Message: Resolves: #204808 Summary: spurious search timeouts Description: applied the patch to Directory71RtmBranch Index: cb_search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_search.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- cb_search.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_search.c 11 Jan 2008 19:20:23 -0000 1.5.2.1 @@ -179,7 +179,7 @@ slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, NULL ); return 1; } - timeout.tv_sec=timelimit-(now-optime); + timeout.tv_sec=(time_t)timelimit-(now-optime); timeout.tv_usec=0; } @@ -414,7 +414,10 @@ { char *target; - int sizelimit,timelimit, rc, parse_rc, optime,i,retcode, attrsonly; + int sizelimit, timelimit; + int rc, parse_rc, retcode; + int i, attrsonly; + time_t optime; LDAPMessage *res=NULL; char *matched_msg,*error_msg; cb_searchContext *ctx=NULL; From fedora-directory-commits at redhat.com Fri Jan 11 19:20:26 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 14:20:26 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd pblock.c, 1.4, 1.4.2.1 Message-ID: <200801111920.m0BJKQrL000655@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv554/slapd Modified Files: Tag: Directory71RtmBranch pblock.c Log Message: Resolves: #204808 Summary: spurious search timeouts Description: applied the patch to Directory71RtmBranch Index: pblock.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- pblock.c 19 Apr 2005 22:07:36 -0000 1.4 +++ pblock.c 11 Jan 2008 19:20:24 -0000 1.4.2.1 @@ -338,7 +338,7 @@ (*(int *)value) = pblock->pb_op->o_params.operation_type; break; case SLAPI_OPINITIATED_TIME: - (*(int *)value) = pblock->pb_op->o_time; + (*(time_t *)value) = pblock->pb_op->o_time; break; case SLAPI_REQUESTOR_ISROOT: (*(int *)value) = pblock->pb_requestor_isroot; From fedora-directory-commits at redhat.com Fri Jan 11 19:20:26 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 14:20:26 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldif search.c, 1.4, 1.4.2.1 Message-ID: <200801111920.m0BJKQkb000661@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv554/slapd/back-ldif Modified Files: Tag: Directory71RtmBranch search.c Log Message: Resolves: #204808 Summary: spurious search timeouts Description: applied the patch to Directory71RtmBranch Index: search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/search.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- search.c 19 Apr 2005 22:07:39 -0000 1.4 +++ search.c 11 Jan 2008 19:20:24 -0000 1.4.2.1 @@ -143,7 +143,7 @@ /*Make sure we're not exceeding our time limit...*/ currtime = time(&dummy); - if ((tlimit > 0) && ((currtime - optime) > tlimit)){ + if ((tlimit > 0) && ((currtime - optime) > (time_t)tlimit)){ slapi_send_ldap_result( pb, LDAP_TIMELIMIT_EXCEEDED, NULL, NULL, nentries, NULL); /*We "hit" the cache*/ From fedora-directory-commits at redhat.com Fri Jan 11 19:20:27 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 14:20:27 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldbm_search.c, 1.6.2.1, 1.6.2.2 Message-ID: <200801111920.m0BJKRrw000667@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv554/slapd/back-ldbm Modified Files: Tag: Directory71RtmBranch ldbm_search.c Log Message: Resolves: #204808 Summary: spurious search timeouts Description: applied the patch to Directory71RtmBranch Index: ldbm_search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_search.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- ldbm_search.c 24 May 2006 20:46:45 -0000 1.6.2.1 +++ ldbm_search.c 11 Jan 2008 19:20:24 -0000 1.6.2.2 @@ -422,7 +422,7 @@ if (sort && (NULL != candidates)) { time_t optime = 0; - time_t tlimit = 0; + int tlimit = 0; slapi_pblock_get( pb, SLAPI_SEARCH_TIMELIMIT, &tlimit ); slapi_pblock_get( pb, SLAPI_OPINITIATED_TIME, &optime ); From fedora-directory-commits at redhat.com Fri Jan 11 20:05:17 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 15:05:17 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm index.c, 1.5.2.1, 1.5.2.2 Message-ID: <200801112005.m0BK5H41008794@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8765/slapd/back-ldbm Modified Files: Tag: Directory71RtmBranch index.c Log Message: Resolves: #219586 Summary: Slapi_Value memory leak in index code Description: applied the patch to Directory71RtmBranch Index: index.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/index.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- index.c 26 Aug 2005 15:44:36 -0000 1.5.2.1 +++ index.c 11 Jan 2008 20:05:14 -0000 1.5.2.2 @@ -527,7 +527,8 @@ slapi_entry_attr_find( olde->ep_entry, mods[i]->mod_type, &curr_attr ); if ( mods_valueArray != NULL ) { for ( j = 0; mods_valueArray[j] != NULL; j++ ) { - valuearray_remove_value(curr_attr, evals, mods_valueArray[j]); + Slapi_Value *rval = valuearray_remove_value(curr_attr, evals, mods_valueArray[j]); + slapi_value_free( &rval ); } } @@ -541,7 +542,8 @@ } } else { /* Remove duplicate value from deleted value array */ - valuearray_remove_value(curr_attr, deleted_valueArray, deleted_valueArray[j]); + Slapi_Value *rval = valuearray_remove_value(curr_attr, deleted_valueArray, deleted_valueArray[j]); + slapi_value_free( &rval ); j--; } } @@ -607,7 +609,8 @@ } } else { /* Remove duplicate value from the mod list */ - valuearray_remove_value(curr_attr, deleted_valueArray, deleted_valueArray[j]); + Slapi_Value *rval = valuearray_remove_value(curr_attr, deleted_valueArray, deleted_valueArray[j]); + slapi_value_free( &rval ); j--; } } From fedora-directory-commits at redhat.com Fri Jan 11 20:52:48 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 15:52:48 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl acl.c, 1.6, 1.6.2.1 Message-ID: <200801112052.m0BKqmo2010569@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10506/plugins/acl Modified Files: Tag: Directory71RtmBranch acl.c Log Message: Resolves: #288321 Summary: ns-slapd aborts during updating attribute values which contain + characters with nothing after them Description: applied the patch to Directory71RtmBranch Index: acl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- acl.c 19 Apr 2005 22:07:28 -0000 1.6 +++ acl.c 11 Jan 2008 20:52:46 -0000 1.6.2.1 @@ -107,7 +107,7 @@ Slapi_PBlock *pb, Slapi_Entry *e, /* The Slapi_Entry */ char *attr, /* Attribute of the entry */ - struct berval *val, /* value of attr. NOT USED */ + struct berval *val, /* value of attr */ int access /* requested access rights */ ) { @@ -337,20 +337,32 @@ TNF_PROBE_0_DEBUG(acl_aclpbinit_end,"ACL",""); - /* Here we mean if "I am trying to add/delete "myself" ? " */ + /* Here we mean if "I am trying to add/delete "myself" to a group, etc." We + * basically just want to see if the value matches the DN of the user that + * we're checking access for */ if (val && (access & SLAPI_ACL_WRITE) && (val->bv_len > 0) ) { - /* should use slapi_sdn_compare() but that'a an extra malloc/free */ + Slapi_Attr *sa = slapi_attr_new(); + char *oid = NULL; - char *dn_val_to_write = - slapi_dn_normalize(slapi_ch_strdup(val->bv_val)); + slapi_attr_init(sa, attr); + slapi_attr_get_syntax_oid_copy(sa, &oid); - if ( aclpb->aclpb_authorization_sdn && - slapi_utf8casecmp((ACLUCHP)dn_val_to_write, (ACLUCHP) - slapi_sdn_get_ndn(aclpb->aclpb_authorization_sdn)) == 0) { - access |= SLAPI_ACL_SELF; - } + /* We only want to perform this check if the attribute is + * defined using the DN syntax. */ + if (oid && (strcasecmp(oid, DN_SYNTAX_OID) == 0)) { + /* should use slapi_sdn_compare() but that'a an extra malloc/free */ + char *dn_val_to_write = slapi_dn_normalize(slapi_ch_strdup(val->bv_val)); + if ( aclpb->aclpb_authorization_sdn && + slapi_utf8casecmp((ACLUCHP)dn_val_to_write, (ACLUCHP) + slapi_sdn_get_ndn(aclpb->aclpb_authorization_sdn)) == 0) { + access |= SLAPI_ACL_SELF; + } - slapi_ch_free( (void **)&dn_val_to_write); + slapi_ch_free_string(&dn_val_to_write); + } + + slapi_ch_free_string(&oid); + slapi_attr_free(&sa); } /* Convert access to string of rights eg SLAPI_ACL_ADD->"add". */ From fedora-directory-commits at redhat.com Fri Jan 11 20:52:48 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 15:52:48 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd attrsyntax.c, 1.4, 1.4.2.1 dn.c, 1.6.2.2, 1.6.2.3 libslapd.def, 1.11.2.3, 1.11.2.4 slapi-plugin.h, 1.8.2.1, 1.8.2.2 Message-ID: <200801112052.m0BKqmdZ010578@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10506/slapd Modified Files: Tag: Directory71RtmBranch attrsyntax.c dn.c libslapd.def slapi-plugin.h Log Message: Resolves: #288321 Summary: ns-slapd aborts during updating attribute values which contain + characters with nothing after them Description: applied the patch to Directory71RtmBranch Index: attrsyntax.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attrsyntax.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- attrsyntax.c 19 Apr 2005 22:07:36 -0000 1.4 +++ attrsyntax.c 11 Jan 2008 20:52:46 -0000 1.4.2.1 @@ -726,6 +726,22 @@ } } +/* Returns the oid of the syntax of the Slapi_Attr that's passed in. + * The caller must dispose of oid by calling slapi_ch_free_string(). */ +int +slapi_attr_get_syntax_oid_copy( const Slapi_Attr *a, char **oidp ) +{ + void *pi = NULL; + + if (a && (slapi_attr_type2plugin(a->a_type, &pi) == 0)) { + *oidp = slapi_ch_strdup(plugin_syntax2oid(pi)); + return( 0 ); + } else { + *oidp = NULL; + return( -1 ); + } +} + #ifdef ATTR_LDAP_DEBUG PRIntn Index: dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- dn.c 2 Mar 2006 01:12:25 -0000 1.6.2.2 +++ dn.c 11 Jan 2008 20:52:46 -0000 1.6.2.3 @@ -337,7 +337,13 @@ /* * Track and sort attribute values within multivalued RDNs. */ - if ( rdn_av_count > 0 ) { + /* We may still be in an unexpected state, such as B4TYPE if + * we encountered something odd like a '+' at the end of the + * rdn. If this is the case, we don't want to add this bogus + * rdn to our list to sort. We should only be in the INVALUE + * or B4SEPARATOR state if we have a valid rdn component to + * be added. */ + if ((rdn_av_count > 0) && ((state == INVALUE) || (state == B4SEPARATOR))) { add_rdn_av( typestart, d, &rdn_av_count, &rdn_avs, initial_rdn_av_stack ); } @@ -347,7 +353,6 @@ if ( rdn_av_count > 0 ) { reset_rdn_avs( &rdn_avs, &rdn_av_count ); } - /* Trim trailing spaces */ while ( d != dn && *(d - 1) == ' ' ) d--; /* XXX 518524 */ Index: libslapd.def =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libslapd.def,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -r1.11.2.3 -r1.11.2.4 --- libslapd.def 19 Mar 2006 21:20:45 -0000 1.11.2.3 +++ libslapd.def 11 Jan 2008 20:52:46 -0000 1.11.2.4 @@ -1180,3 +1180,4 @@ sasl_map_done @1179 slapd_SECITEM_FreeItem @1180 slapi_op_type_to_string @1181 + slapi_attr_get_syntax_oid_copy @1182 Index: slapi-plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- slapi-plugin.h 2 Mar 2006 01:12:25 -0000 1.8.2.1 +++ slapi-plugin.h 11 Jan 2008 20:52:46 -0000 1.8.2.2 @@ -391,6 +391,7 @@ int slapi_attr_type2plugin( const char *type, void **pi ); int slapi_attr_get_type( Slapi_Attr *attr, char **type ); int slapi_attr_get_oid_copy( const Slapi_Attr *attr, char **oidp ); +int slapi_attr_get_syntax_oid_copy( const Slapi_Attr *a, char **oidp ); int slapi_attr_get_flags( const Slapi_Attr *attr, unsigned long *flags ); int slapi_attr_flag_is_set( const Slapi_Attr *attr, unsigned long flag ); int slapi_attr_value_cmp( const Slapi_Attr *attr, const struct berval *v1, const struct berval *v2 ); From fedora-directory-commits at redhat.com Fri Jan 11 21:53:22 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 11 Jan 2008 16:53:22 -0500 Subject: [Fedora-directory-commits] dsgw/orgbin - New directory Message-ID: <200801112153.m0BLrMjB019792@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/orgbin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19773/orgbin Log Message: Directory /cvs/dirsec/dsgw/orgbin added to the repository From fedora-directory-commits at redhat.com Fri Jan 11 21:54:54 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 11 Jan 2008 16:54:54 -0500 Subject: [Fedora-directory-commits] dsgw/orghtml - New directory Message-ID: <200801112154.m0BLsspM020060@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/orghtml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20045/orghtml Log Message: Directory /cvs/dirsec/dsgw/orghtml added to the repository From fedora-directory-commits at redhat.com Fri Jan 11 21:58:12 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 11 Jan 2008 16:58:12 -0500 Subject: [Fedora-directory-commits] dsgw Makefile.am, 1.3, 1.4 Makefile.in, 1.3, 1.4 configure, 1.3, 1.4 configure.ac, 1.3, 1.4 dsgw-httpd.conf.in, 1.2, 1.3 Message-ID: <200801112158.m0BLwCZh020361@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20288 Modified Files: Makefile.am Makefile.in configure configure.ac dsgw-httpd.conf.in Log Message: Added orgchart to dsgw. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 10 Jan 2008 01:19:36 -0000 1.3 +++ Makefile.am 11 Jan 2008 21:58:09 -0000 1.4 @@ -25,6 +25,7 @@ cgibindir = $(libdir)@cgibindir@ htmldir = $(datadir)@htmldir@ pbhtmldir = $(datadir)@pbhtmldir@ +orghtmldir = $(datadir)@orghtmldir@ # config is a bit of a misnomer - these are really configurable templates configdir = $(datadir)@configdir@ pbconfigdir = $(datadir)@pbconfigdir@ @@ -34,6 +35,7 @@ securitydir=$(instconfigdir)@securitydir@ # relative to $localstatedir cookiedir=$(localstatedir)@cookiedir@ +perldir = $(libdir)@perldir@ DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)" @@ -66,6 +68,8 @@ cgibin_PROGRAMS = auth doauth edit domodify dnedit dosearch $(NEED_SECGLUE) $(CKUTILPROGS) +cgibin_SCRIPTS = orgbin/org orgbin/myorg + noinst_PROGRAMS = propmaker # I need propmaker to build with no libraries - I don't know of any other way to set # the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the @@ -130,6 +134,14 @@ pbhtml/conference.gif pbhtml/orgicon.gif pbhtml/view_vcard_sm.gif \ pbhtml/confirm.html +dist_orghtml_DATA = \ + orghtml/aim-online.gif orghtml/arrow.gif orghtml/botframe.html \ + orghtml/branch-cc1.gif orghtml/index.html orghtml/ldap-person.gif \ + orghtml/mag.gif orghtml/mail.gif orghtml/new-branch-blank.gif \ + orghtml/new-branch-first.gif orghtml/new-branch-straight.gif orghtml/orgicon.gif \ + orghtml/styles.css orghtml/topframe.html + + dist_config_DATA = \ config/authPassword.html config/dsgw-l10n.conf \ config/authSearch.html config/dsgwsearchprefs.conf \ @@ -151,7 +163,7 @@ config/display-orgperson.html config/newentry.html \ config/display-orgunit.html config/newentryName.html \ config/display-person.html config/newentryType.html \ - config/search.html \ + config/orgchart.tmpl config/search.html \ config/dsgwfilter.conf config/searchString.html \ config/en/dsgwcollate.conf config/en/dsgw-l10n.conf @@ -220,15 +232,20 @@ -e 's, at localstatedir\@,$(localstatedir),g' \ -e 's, at cgibindir\@,$(cgibindir),g' \ -e 's, at cgiuri\@,$(cgiuri),g' \ + -e 's, at orguri\@,$(orguri),g' \ + -e 's, at dsgwuri\@,$(dsgwuri),g' \ -e 's, at cmdbindir\@,$(cmdbindir),g' \ -e 's, at propertydir\@,$(propertydir),g' \ -e 's, at htmldir\@,$(htmldir),g' \ -e 's, at pbhtmldir\@,$(pbhtmldir),g' \ + -e 's, at orghtmldir\@,$(orghtmldir),g' \ -e 's, at configdir\@,$(configdir),g' \ -e 's, at pbconfigdir\@,$(pbconfigdir),g' \ -e 's, at contextdir\@,$(contextdir),g' \ -e 's, at securitydir\@,$(securitydir),g' \ -e 's, at instconfigdir\@,$(instconfigdir),g' \ + -e 's, at perlpath\@,$(perldir),g' \ + -e 's, at perlexec\@, at perlexec@,g' \ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \ -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \ -e 's, at package_name\@,$(PACKAGE_NAME),g' \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 10 Jan 2008 01:19:36 -0000 1.3 +++ Makefile.in 11 Jan 2008 21:58:09 -0000 1.4 @@ -35,6 +35,7 @@ # END COPYRIGHT BLOCK + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -64,11 +65,11 @@ $(am__EXEEXT_1) noinst_PROGRAMS = propmaker$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \ - $(dist_html_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \ - ChangeLog NEWS compile config.guess config.sub depcomp \ - install-sh ltmain.sh missing + $(dist_html_DATA) $(dist_orghtml_DATA) $(dist_pbconfig_DATA) \ + $(dist_pbhtml_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS ChangeLog NEWS 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 \ @@ -84,8 +85,9 @@ CONFIG_CLEAN_FILES = am__EXEEXT_1 = unauth$(EXEEXT) search$(EXEEXT) csearch$(EXEEXT) \ newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT) -am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" \ +am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" \ + "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" \ "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" \ "$(DESTDIR)$(propertydir)" cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -139,6 +141,8 @@ secglue.$(OBJEXT) unauth_OBJECTS = $(am_unauth_OBJECTS) unauth_LDADD = $(LDADD) +cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(cgibin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -168,13 +172,14 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; dist_configDATA_INSTALL = $(INSTALL_DATA) dist_htmlDATA_INSTALL = $(INSTALL_DATA) +dist_orghtmlDATA_INSTALL = $(INSTALL_DATA) dist_pbconfigDATA_INSTALL = $(INSTALL_DATA) dist_pbhtmlDATA_INSTALL = $(INSTALL_DATA) nodist_contextDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_config_DATA) $(dist_html_DATA) $(dist_pbconfig_DATA) \ - $(dist_pbhtml_DATA) $(nodist_context_DATA) \ - $(nodist_property_DATA) +DATA = $(dist_config_DATA) $(dist_html_DATA) $(dist_orghtml_DATA) \ + $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \ + $(nodist_context_DATA) $(nodist_property_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -305,6 +310,7 @@ # relative to $localstatedir cookiedir = $(localstatedir)@cookiedir@ datadir = @datadir@ +dsgwuri = @dsgwuri@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ @@ -335,8 +341,12 @@ nss_lib = @nss_lib@ nss_libdir = @nss_libdir@ oldincludedir = @oldincludedir@ +orghtmldir = $(datadir)@orghtmldir@ +orguri = @orguri@ pbconfigdir = $(datadir)@pbconfigdir@ pbhtmldir = $(datadir)@pbhtmldir@ +perldir = $(libdir)@perldir@ +perlexec = @perlexec@ prefix = @prefix@ program_transform_name = @program_transform_name@ propertydir = $(datadir)@propertydir@ @@ -364,6 +374,7 @@ # these are programs which we do not want to link with nss NEED_SECGLUE = unauth search csearch newentry tutor lang +cgibin_SCRIPTS = orgbin/org orgbin/myorg # I need propmaker to build with no libraries - I don't know of any other way to set # the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the # last thing on the link line before LIBS, so just have it terminate the command @@ -424,6 +435,13 @@ pbhtml/conference.gif pbhtml/orgicon.gif pbhtml/view_vcard_sm.gif \ pbhtml/confirm.html +dist_orghtml_DATA = \ + orghtml/aim-online.gif orghtml/arrow.gif orghtml/botframe.html \ + orghtml/branch-cc1.gif orghtml/index.html orghtml/ldap-person.gif \ + orghtml/mag.gif orghtml/mail.gif orghtml/new-branch-blank.gif \ + orghtml/new-branch-first.gif orghtml/new-branch-straight.gif orghtml/orgicon.gif \ + orghtml/styles.css orghtml/topframe.html + dist_config_DATA = \ config/authPassword.html config/dsgw-l10n.conf \ config/authSearch.html config/dsgwsearchprefs.conf \ @@ -445,7 +463,7 @@ config/display-orgperson.html config/newentry.html \ config/display-orgunit.html config/newentryName.html \ config/display-person.html config/newentryType.html \ - config/search.html \ + config/orgchart.tmpl config/search.html \ config/dsgwfilter.conf config/searchString.html \ config/en/dsgwcollate.conf config/en/dsgw-l10n.conf @@ -491,15 +509,20 @@ -e 's, at localstatedir\@,$(localstatedir),g' \ -e 's, at cgibindir\@,$(cgibindir),g' \ -e 's, at cgiuri\@,$(cgiuri),g' \ + -e 's, at orguri\@,$(orguri),g' \ + -e 's, at dsgwuri\@,$(dsgwuri),g' \ -e 's, at cmdbindir\@,$(cmdbindir),g' \ -e 's, at propertydir\@,$(propertydir),g' \ -e 's, at htmldir\@,$(htmldir),g' \ -e 's, at pbhtmldir\@,$(pbhtmldir),g' \ + -e 's, at orghtmldir\@,$(orghtmldir),g' \ -e 's, at configdir\@,$(configdir),g' \ -e 's, at pbconfigdir\@,$(pbconfigdir),g' \ -e 's, at contextdir\@,$(contextdir),g' \ -e 's, at securitydir\@,$(securitydir),g' \ -e 's, at instconfigdir\@,$(instconfigdir),g' \ + -e 's, at perlpath\@,$(perldir),g' \ + -e 's, at perlexec\@, at perlexec@,g' \ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \ -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \ -e 's, at package_name\@,$(PACKAGE_NAME),g' \ @@ -639,6 +662,25 @@ unauth$(EXEEXT): $(unauth_OBJECTS) $(unauth_DEPENDENCIES) @rm -f unauth$(EXEEXT) $(LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS) +install-cgibinSCRIPTS: $(cgibin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)" + @list='$(cgibin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(cgibinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(cgibindir)/$$f'"; \ + $(cgibinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(cgibindir)/$$f"; \ + else :; fi; \ + done + +uninstall-cgibinSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(cgibin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(cgibindir)/$$f'"; \ + rm -f "$(DESTDIR)$(cgibindir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -744,6 +786,23 @@ echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ rm -f "$(DESTDIR)$(htmldir)/$$f"; \ done +install-dist_orghtmlDATA: $(dist_orghtml_DATA) + @$(NORMAL_INSTALL) + test -z "$(orghtmldir)" || $(mkdir_p) "$(DESTDIR)$(orghtmldir)" + @list='$(dist_orghtml_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(dist_orghtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(orghtmldir)/$$f'"; \ + $(dist_orghtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(orghtmldir)/$$f"; \ + done + +uninstall-dist_orghtmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_orghtml_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(orghtmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(orghtmldir)/$$f"; \ + done install-dist_pbconfigDATA: $(dist_pbconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pbconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pbconfigdir)" @@ -864,7 +923,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/pbconfig $(distdir)/pbhtml + $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/orghtml $(distdir)/pbconfig $(distdir)/pbhtml @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -990,9 +1049,9 @@ exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(DATA) config.h +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -1042,8 +1101,9 @@ info-am: -install-data-am: install-cgibinPROGRAMS install-dist_configDATA \ - install-dist_htmlDATA install-dist_pbconfigDATA \ +install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \ + install-dist_configDATA install-dist_htmlDATA \ + install-dist_orghtmlDATA install-dist_pbconfigDATA \ install-dist_pbhtmlDATA install-nodist_contextDATA \ install-nodist_propertyDATA @@ -1075,8 +1135,9 @@ ps-am: -uninstall-am: uninstall-cgibinPROGRAMS uninstall-dist_configDATA \ - uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \ +uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-dist_configDATA uninstall-dist_htmlDATA \ + uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \ uninstall-dist_pbhtmlDATA uninstall-info-am \ uninstall-nodist_contextDATA uninstall-nodist_propertyDATA @@ -1087,17 +1148,20 @@ 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-cgibinPROGRAMS install-data \ - install-data-am install-dist_configDATA install-dist_htmlDATA \ - install-dist_pbconfigDATA install-dist_pbhtmlDATA install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-cgibinPROGRAMS \ + install-cgibinSCRIPTS install-data install-data-am \ + install-dist_configDATA install-dist_htmlDATA \ + install-dist_orghtmlDATA install-dist_pbconfigDATA \ + install-dist_pbhtmlDATA install-exec install-exec-am \ + install-info install-info-am install-man \ install-nodist_contextDATA install-nodist_propertyDATA \ install-strip 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-cgibinPROGRAMS uninstall-dist_configDATA \ - uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \ + uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-dist_configDATA uninstall-dist_htmlDATA \ + uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \ uninstall-dist_pbhtmlDATA uninstall-info-am \ uninstall-nodist_contextDATA uninstall-nodist_propertyDATA Index: configure =================================================================== RCS file: /cvs/dirsec/dsgw/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure 10 Jan 2008 01:19:36 -0000 1.3 +++ configure 11 Jan 2008 21:58:09 -0000 1.4 @@ -466,7 +466,7 @@ #endif" ac_default_prefix=/opt/dirsrv -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri propertydir htmldir pbhtmldir configdir pbconfigdir contextdir securitydir cookiedir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri dsgwuri orguri propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir securitydir cookiedir perldir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -21242,6 +21242,14 @@ CXXLINK_REQUIRED=0 +# on most platforms, we will just use perl from PATH +# On some platforms, we cannot. Why not just use any old +# perl? Because of perldap. We use a perldap that is +# compiled to either 32bit or 64bit, so we must use a native +# perl binary compiled with the same bitsize. On Solaris +# and HP-UX, /usr/bin/perl is 32 bit, so we cannot use +# those with our 64 bit compiled product. +perlexec='/usr/bin/env perl' case $host in *-*-linux*) @@ -21308,6 +21316,8 @@ _ACEOF CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; hppa*-hp-hpux*) @@ -21357,6 +21367,8 @@ _ACEOF CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; sparc-sun-solaris*) @@ -21423,12 +21435,16 @@ LIBCRUN=$LIBCRUN CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl5x/bin/perl' platform="solaris" ;; *) esac + + if test "$CXXLINK_REQUIRED" = 1; then CXXLINK_REQUIRED_TRUE= CXXLINK_REQUIRED_FALSE='#' @@ -21490,38 +21506,40 @@ # relative to datadir htmldir=/$PACKAGE_NAME/html pbhtmldir=/$PACKAGE_NAME/pbhtml + orghtmldir=/$PACKAGE_NAME/orghtml configdir=/$PACKAGE_NAME/config pbconfigdir=/$PACKAGE_NAME/pbconfig manualuri=/$PACKAGE_NAME/manual propertydir=/$PACKAGE_NAME/properties # relative to libdir cgibindir=/$PACKAGE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin + perldir=/$PACKAGE_NAME/perl elif test "$with_fhs_opt" = "yes"; then # relative to datadir htmldir=/dsgw/html pbhtmldir=/dsgw/pbhtml + orghtmldir=/dsgw/orghtml configdir=/dsgw/config pbconfigdir=/dsgw/pbconfig manualuri=/dsgw/manual propertydir=/properties/dsgw + # relative to libdir + perldir=/perl # same as server's cgibindir cgibindir=/cgi-bin - cgiuri=/cgi-bin else # relative to datadir htmldir=/$PACKAGE_BASE_NAME/dsgw/html pbhtmldir=/$PACKAGE_BASE_NAME/dsgw/pbhtml + orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml configdir=/$PACKAGE_BASE_NAME/dsgw/config pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig manualuri=/$PACKAGE_BASE_NAME/dsgw/manual propertydir=/$PACKAGE_BASE_NAME/properties/dsgw # relative to libdir + perldir=/$PACKAGE_BASE_NAME/perl # CGI program directory cgibindir=/$PACKAGE_BASE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin fi # relative to instconfigdir @@ -21529,6 +21547,10 @@ securitydir=/dsgw # relative to $localstatedir cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies +# URIs +cgiuri=/cgi-bin +dsgwuri=/dsgw +orguri=/orgchart # Check for library dependencies # BEGIN COPYRIGHT BLOCK @@ -22600,6 +22622,10 @@ + + + + # need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not @@ -23433,6 +23459,7 @@ s, at LIBNSL@,$LIBNSL,;t t s, at LIBCSTD@,$LIBCSTD,;t t s, at LIBCRUN@,$LIBCRUN,;t t +s, at perlexec@,$perlexec,;t t s, at CXXLINK_REQUIRED_TRUE@,$CXXLINK_REQUIRED_TRUE,;t t s, at CXXLINK_REQUIRED_FALSE@,$CXXLINK_REQUIRED_FALSE,;t t s, at HPUX_TRUE@,$HPUX_TRUE,;t t @@ -23463,14 +23490,18 @@ s, at icu_bin@,$icu_bin,;t t s, at cgibindir@,$cgibindir,;t t s, at cgiuri@,$cgiuri,;t t +s, at dsgwuri@,$dsgwuri,;t t +s, at orguri@,$orguri,;t t s, at propertydir@,$propertydir,;t t s, at htmldir@,$htmldir,;t t s, at pbhtmldir@,$pbhtmldir,;t t +s, at orghtmldir@,$orghtmldir,;t t s, at configdir@,$configdir,;t t s, at pbconfigdir@,$pbconfigdir,;t t s, at contextdir@,$contextdir,;t t s, at securitydir@,$securitydir,;t t s, at cookiedir@,$cookiedir,;t t +s, at perldir@,$perldir,;t t s, at NEED_LDIF_TRUE@,$NEED_LDIF_TRUE,;t t s, at NEED_LDIF_FALSE@,$NEED_LDIF_FALSE,;t t s, at WINNT_TRUE@,$WINNT_TRUE,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/dsgw/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure.ac 10 Jan 2008 01:19:36 -0000 1.3 +++ configure.ac 11 Jan 2008 21:58:09 -0000 1.4 @@ -125,6 +125,14 @@ m4_include(m4/fhs.m4) CXXLINK_REQUIRED=0 +# on most platforms, we will just use perl from PATH +# On some platforms, we cannot. Why not just use any old +# perl? Because of perldap. We use a perldap that is +# compiled to either 32bit or 64bit, so we must use a native +# perl binary compiled with the same bitsize. On Solaris +# and HP-UX, /usr/bin/perl is 32 bit, so we cannot use +# those with our 64 bit compiled product. +perlexec='/usr/bin/env perl' case $host in *-*-linux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -143,6 +151,8 @@ AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; hppa*-hp-hpux*) @@ -156,6 +166,8 @@ AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; sparc-sun-solaris*) @@ -180,10 +192,14 @@ LIBCRUN=-lCrun AC_SUBST([LIBCRUN], [$LIBCRUN]) CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl5x/bin/perl' platform="solaris" ;; *) esac +AC_SUBST(perlexec) + AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1) AM_CONDITIONAL([HPUX],test "$platform" = "hpux") AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris") @@ -217,38 +233,40 @@ # relative to datadir htmldir=/$PACKAGE_NAME/html pbhtmldir=/$PACKAGE_NAME/pbhtml + orghtmldir=/$PACKAGE_NAME/orghtml configdir=/$PACKAGE_NAME/config pbconfigdir=/$PACKAGE_NAME/pbconfig manualuri=/$PACKAGE_NAME/manual propertydir=/$PACKAGE_NAME/properties # relative to libdir cgibindir=/$PACKAGE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin + perldir=/$PACKAGE_NAME/perl elif test "$with_fhs_opt" = "yes"; then # relative to datadir htmldir=/dsgw/html pbhtmldir=/dsgw/pbhtml + orghtmldir=/dsgw/orghtml configdir=/dsgw/config pbconfigdir=/dsgw/pbconfig manualuri=/dsgw/manual propertydir=/properties/dsgw + # relative to libdir + perldir=/perl # same as server's cgibindir cgibindir=/cgi-bin - cgiuri=/cgi-bin else # relative to datadir htmldir=/$PACKAGE_BASE_NAME/dsgw/html pbhtmldir=/$PACKAGE_BASE_NAME/dsgw/pbhtml + orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml configdir=/$PACKAGE_BASE_NAME/dsgw/config pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig manualuri=/$PACKAGE_BASE_NAME/dsgw/manual propertydir=/$PACKAGE_BASE_NAME/properties/dsgw # relative to libdir + perldir=/$PACKAGE_BASE_NAME/perl # CGI program directory cgibindir=/$PACKAGE_BASE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin fi # relative to instconfigdir @@ -256,6 +274,10 @@ securitydir=/dsgw # relative to $localstatedir cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies +# URIs +cgiuri=/cgi-bin +dsgwuri=/dsgw +orguri=/orgchart # Check for library dependencies m4_include(m4/nspr.m4) @@ -291,14 +313,18 @@ # write out paths for data/config files AC_SUBST(cgibindir) AC_SUBST(cgiuri) +AC_SUBST(dsgwuri) +AC_SUBST(orguri) AC_SUBST(propertydir) AC_SUBST(htmldir) AC_SUBST(pbhtmldir) +AC_SUBST(orghtmldir) AC_SUBST(configdir) AC_SUBST(pbconfigdir) AC_SUBST(contextdir) AC_SUBST(securitydir) AC_SUBST(cookiedir) +AC_SUBST(perldir) # need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not Index: dsgw-httpd.conf.in =================================================================== RCS file: /cvs/dirsec/dsgw/dsgw-httpd.conf.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsgw-httpd.conf.in 2 Jun 2006 22:57:17 -0000 1.2 +++ dsgw-httpd.conf.in 11 Jan 2008 21:58:09 -0000 1.3 @@ -28,6 +28,10 @@ # Enable CGI execution for these uris in this directory ScriptAlias @cgiuri@ "@cgibindir@" +# URI aliases for html content +Alias @dsgwuri@ @htmldir@ +Alias @orguri@ @orghtmldir@ + # Allow access to the dsgw html files AllowOverride None @@ -44,6 +48,14 @@ Allow from all +# Allow access to the org html files + + AllowOverride None + Options None + Order allow,deny + Allow from all + + # Allow access to the dsgw html templates AllowOverride None From fedora-directory-commits at redhat.com Fri Jan 11 21:58:12 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 11 Jan 2008 16:58:12 -0500 Subject: [Fedora-directory-commits] dsgw/config orgchart.tmpl,NONE,1.1 Message-ID: <200801112158.m0BLwChq020369@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20288/config Added Files: orgchart.tmpl Log Message: Added orgchart to dsgw. --- NEW FILE orgchart.tmpl --- # # 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) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # ############# # # # Configuration file for Directory Server Org Chart # ---------------------------------------------------------- # # ############# # # Blank lines in this file, as well as lines that # start with at least one "#" character, are both ignored. # # # Name/Value pairs below are (and need to be) separated with # one or more tabs (or spaces) # #ldap-host localhost #ldap-port 389 #ldap-search-base dc=example,dc=com ldap-host @host@ ldap-port @port@ ldap-search-base @suffix@ # # If you would like to have the phonebook icon visible, you must # supply the partial phonebook URL below, which will have each # given user's DN attribute value concatenated to the end. # # For example, you could specify below something close to: # # url-phonebook-base http://hostname.domain.com/dsgw/bin/dosearch?context=default&hp=localhost&dn= # # # A name that has no value after it equates to "" for the value, # like the two below settings. # # Not listing an entire name/value pair at all in this file # sets its value to "" as well. # # So the below two names therefore don't even need to be in this file # (but are here to show them as possible options that can be changed). # # Having no value below for "ldap-bind-dn" and "ldap-bind-pass" # indicates that you want anonymous binding to the LDAP server. # ldap-bind-dn ldap-bind-pass # # Allowed values for below icon-related setting: # # forefront means show this icon next to the person's name # layer means show this icon inside the person's floating layer # no means never show this icon anywhere, but MyOrgChart settings can override this setting. # disabled means never show this icon. Period. So MyOrgChart will not even show this icon as a setting. # icons-aim-visible disabled icons-email-visible layer #icons-phonebook-visible forefront icons-phonebook-visible disabled icons-locator-visible disabled # # There is also the same concept below for a person-locator # type application, to show graphically where a given employee's office is located. # You also specify the partial URL, up until where the user's URL- # encoded cn value will be concatenated. # # url-locator-base http://hostname.domain.com/submit.cgi?empfullname= # # # This is where you specify which specific LDAP attributes # from your LDAP server that you would like used for both org chart # generation as well as final display values. # # The value of the attribute specified for "attrib-job-title" will # be listed below anybody's name that is listed in their own box. # If you don't specify this setting in this file, the default used # will be "title". # # For "attrib-farleft-rdn", this specifies which attribute you are # using as the leftmost RDN for the DN's of your user entries. # attrib-job-title title attrib-manager manager attrib-farleft-rdn uid # # This is where you specify the maximum levels that are allowed # to be generated for any given org chart, and the MyOrgChart version # of this setting will never be allowed to be higher than the below. # # A "level" is defined as a reporting level, meaning that if you # generate an org chart for a given director, all direct reports to him # (whether they have people below them or not) are level 1, people below # any of them are level 2, etc. # # So a setting of 1 would list the full name of the user entered, and # then just people that directly report to that person only. # # The purpose of having this configuration setting is to give you # control over users that may try to generate an org chart on the # CEO of a company, and heavily tax the LDAP server to generate # an org chart that may be thousands of people deep. # # If this setting is not listed below, the default is 3. # # The valid range of values for this setting would be a minimum of 1, # with no hard-coded maximum. # max-levels-drawn 3 # # The below setting relates to whether a specific assumption should be made # on all values that you currently have stored for your manager LDAP attribute. # # The assumption: That all user entries are stored in LDAP on the # same flat level location, at least for a given # group of people that org charts will be generated for. # # So when you enter: # # Steve Jones # # to generate an org chart on, which let's say equates to this DN: # # uid=sjones, ou=People, dc=acme, dc=com # # then should this application assume that the manager attrib value # of this entry is in this same location as Steve Jones: # # manager = "uid=XXXXXX, ou=People, dc=acme, dc=com" # # or is it possible that the manager's LDAP entry is at another level? # # # The below two options for this setting specifies one of two scenarios, # based on how you have configured your directory information tree: # # # Either the value: # # same This means assume the same location (such as # "ou=People, dc=acme, dc=com" above) that the inital # user entry is found at for all subsequent entries # involved in drawing that given org chart. # # In other words, this setting assumes a totally # flat namespace, at least for all users that will # be in a given generated org chart. # # search This means there is no guarantee that other entries # that need to be discovered to draw the org chart # are in the same area of the directory tree, so when # searching the manager attribute DN values for a given # exact uid, search like this instead: # # manager = "uid=sjones,*" # # This will be much more expensive of a search, so # if you fit this scenario, at least make sure on your LDAP # server that you have the substring index created for your # manager attribute, to make drawing the org chart as fast # as possible. # # Default value (if this setting is not listed in this file): same # manager-DN-location same # # This setting helps you configure against users entering LDAP # queries for "A" or "MI" and then taxing the LDAP server by asking # for thousands of search results back. # # The value you specify below for "min-chars-searchstring" means # that the user must enter AT LEAST this many characters for # their request to even make it to the LDAP server. If they type # less characters than this setting, they will get a message that # they need to enter at least X characters to search, where X will # be the below value. # # NOTE: This setting purposely does not apply to allowing a user # to search for an exact UID (to avoid search results). The logic # is that: # # [1] Search LDAP for an equality search of (uid=XXXX), regardless # of both this below setting / how many characters were entered. # # [2] If this single LDAP entry was not found, then make sure the # number of characters entered for the search are at least the below # number of characters, before sending a broader search to LDAP. # # If this setting is not configured below (the line is absent), # the default value used is 4. min-chars-searchstring 4 # Allowed characters in search filters. If the user enters a search that # contains a character not in the allowed-filter-chars list, the user # will be notified the search needs to be modified. allowed-filter-chars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 _- From fedora-directory-commits at redhat.com Fri Jan 11 21:58:12 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 11 Jan 2008 16:58:12 -0500 Subject: [Fedora-directory-commits] dsgw/orghtml aim-online.gif, NONE, 1.1 arrow.gif, NONE, 1.1 botframe.html, NONE, 1.1 branch-cc1.gif, NONE, 1.1 index.html, NONE, 1.1 ldap-person.gif, NONE, 1.1 mag.gif, NONE, 1.1 mail.gif, NONE, 1.1 new-branch-blank.gif, NONE, 1.1 new-branch-first.gif, NONE, 1.1 new-branch-straight.gif, NONE, 1.1 orgicon.gif, NONE, 1.1 starthelp.gif, NONE, 1.1 styles.css, NONE, 1.1 topframe.html.in, NONE, 1.1 Message-ID: <200801112158.m0BLwCPL020379@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/orghtml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20288/orghtml Added Files: aim-online.gif arrow.gif botframe.html branch-cc1.gif index.html ldap-person.gif mag.gif mail.gif new-branch-blank.gif new-branch-first.gif new-branch-straight.gif orgicon.gif starthelp.gif styles.css topframe.html.in Log Message: Added orgchart to dsgw. --- NEW FILE botframe.html --- Directory Server Org Chart
Welcome!
To find a person in your corporate organization chart, enter their
name in the search box above, then click "Go"

Below is a sample of an organization chart, with a description of the
types of actions you can take

Thank you for using the Directory Server Org Chart!


--- NEW FILE index.html --- Directory Server Org Chart --- NEW FILE styles.css --- /* --- 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) 2005 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- */ /* ======================================================================= * * Style sheet for the Directory Server Org Chart application * * ======================================================================= */ .bgColor7 {background-color: #66ccff;} /* All Links */ A:link { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px} A:active { color: #000000;} /*All Regular Table Data--for the whole application*/ td { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px; vertical-align : middle; } td.bold { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px; vertical-align : middle; font-weight: bold; } /* *********Start Page Text*************/ td.startPage { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px; color:#000000; vertical-align : middle; } A.searchlinknorm:link {color: #FFFFFF} A.searchlinknorm:visited {color: #FFFFFF} A.searchlinknorm:active {color: #FFFFFF} A.searchlinkspec:link {color: #FF0000} A.searchlinkspec:visited {color: #FF0000} A.searchlinkspec:active {color: #CCFFFF} /* *********Search frame*************/ body.Search { background-color: #000000; font-family: Verdana, Arial, Helvetica, san-serif; color: #ccffff; font-size: 12px; } td.appName { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 16px; vertical-align : middle; color: #ffffff; font-weight: bold; } .apptext { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px; vertical-align: middle; color: #ffffff; font-weight: bold; } /* *********Search results frame*************/ th.resultsHeader { font-family: Verdana, Arial, Helvetica, san-serif; color: #003366; background-color: #CCCCCC; font-size: 13px; } td.pageHeader { font-family: Verdana, Arial, Helvetica, san-serif; color: #000000; font-size: 14px; font-weight : bold; } td.searchHelp { font-family: Verdana, Arial, Helvetica, san-serif; color: #003366; font-size: 12px; } /* *********Org Chart frame*************/ td.hidden { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 19px; vertical-align : top; } tr.hidden { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 19px; vertical-align : top; } td.selected { /* background-color: transparent; */ color: #000000; font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px; font-weight : bold; } body.orgWindow { /* background-color: transparent; */ font-family: Verdana, Arial, Helvetica, san-serif; color: #003366; font-size: 12px; } .thinline { font-size : 5px; } /* *********Preference "Customize View" Page*************/ td.prefsPageHead { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 13px; color:#000000; font-weight: bold; vertical-align : middle; border : none; } td.prefsPageData { font-family: verdana, Arial, Helvetica, sans-serif; font-size: 12px; color:#000000; vertical-align : middle; border : none; } tr.prefs{ border : none; } --- NEW FILE topframe.html.in ---
 Directory Server Org Chart
      Search for:
Customize
From fedora-directory-commits at redhat.com Fri Jan 11 21:58:12 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 11 Jan 2008 16:58:12 -0500 Subject: [Fedora-directory-commits] dsgw/orgbin myorg.in, NONE, 1.1 org.in, NONE, 1.1 Message-ID: <200801112158.m0BLwC2s020374@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/orgbin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20288/orgbin Added Files: myorg.in org.in Log Message: Added orgchart to dsgw. --- NEW FILE myorg.in --- #!@perlexec@ # # 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) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # #set ts=4 $|=1; print "Content-type: te at orguri@;charset=UTF-8\n\n"; #print "Content-type: te at orguri@\n\n"; # # Read orgchart.conf settings for MyOrgChart-specific items # &read_config_file(); #------------------------------------- print " Customize: Directory Server Org Chart "; #------------------------------------- &print_javascript(); print ""; &print_body(); print @orguri@>"; exit(0); #============================================================================== sub read_config_file() { if (!open (FILE, "@contextdir@/orgchart.conf") ) { print "\n\n

Can't open configuration file: orgchart.conf\n\n

Error from OS: $!\n\n"; exit; } # # let's set some default values, so in case a setting # does not exist both in the orgchart.conf file, as well # as does not exist via a user's MyOrgChart cookie, # we at least have some type of valid value present. # %config_tokens = ( "icons-aim-visible","disabled", "icons-email-visible","disabled", "icons-phonebook-visible","disabled", "icons-locator-visible","disabled", "max-levels-drawn", "3", ); # # read in the orgchart.conf file # while() { chop; foreach $f (keys %config_tokens) { $config_tokens{$f} = $1 if ($_ =~ /^$f[ \t]+(.+)/); } } close (FILE); # # check the "max-levels-drawn" setting for numeric, and to # make sure it is a number greater than zero. # # If a bad setting, let's set it to 3 so that at least it # is set to a valid number, but then a user's MyOrgChart # preferences can override it (if their setting is 1, 2, # or 3 only). # # check for non-numeric first $temp = $config_tokens{"max-levels-drawn"}; $temp =~ s/[\d]//g; if ( length($temp) != 0 ) { # a non-numeric setting $config_tokens{"max-levels-drawn"} = 3; } else { # a numeric setting, but: check for less than value of 1 if ( $config_tokens{"max-levels-drawn"} < 1 ) { $config_tokens{"max-levels-drawn"} = 3; } } # # if every icon has been disabled, set a state so that later on # we don't draw the header and the footer text for the icons. # if ( ($config_tokens{"icons-email-visible"} eq "disabled") && ($config_tokens{"icons-phonebook-visible"} eq "disabled") && ($config_tokens{"icons-aim-visible"} eq "disabled") && ($config_tokens{"icons-locator-visible"} eq "disabled") ) { $all_icons_disabled = "yes"; } else { $all_icons_disabled = "no"; } } #============================================================================== sub print_body() { print "
 
Customize View
"; # # If all icons are "disabled" by the admin, we better not display the # window dressing (header and footer) text that normally surrounds the # icon options. This is the header. # if ( "$all_icons_disabled" eq "no" ) { print " "; } # # don't draw the email option if admin has disabled it ! # if ( $config_tokens{"icons-email-visible"} ne "disabled" ) { print " "; } # # don't draw the phonebook option if admin has disabled it ! # if ( $config_tokens{"icons-phonebook-visible"} ne "disabled" ) { print " "; } # # don't draw the locator option if admin has disabled it ! # if ( $config_tokens{"icons-locator-visible"} ne "disabled" ) { print " "; } # # don't draw the AIM option if admin has disabled it ! # if ( $config_tokens{"icons-aim-visible"} ne "disabled" ) { print " "; } # # If all icons are "disabled" by the admin, we better not display the # window dressing (header and footer) text that normally surrounds the # icon options. This is the footer. # if ( "$all_icons_disabled" eq "no" ) { print " "; } print "
  Icon Settings
Icon: Description: Location:
 \"\" EMail
 \"\" Phonebook Entry
 \"\" Locate User
 \"\" AIM Presence
 
  Organization Chart Depth
Show     levels of organization depth
 
"; } #============================================================================== sub print_javascript() { print " "; } #============================================================================== --- NEW FILE org.in --- #!@perlexec@ # # 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) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # #set ts=4 # ------------ # # Notes for anybody reading the code below: # # [1] The concept of the $uid variable throughout the code # is whatever the leftmost RDN value is for a given user DN, # and this relates to the "attrib-farleft-rdn" setting in # orgchart.conf, of what the attribute name will always be. # # ------------ use lib qw(@perlpath@); use Mozilla::LDAP::Conn; use Mozilla::LDAP::Utils qw(:all); use CGI; $cg = new CGI; $|=1; print "Content-type: text/html;charset=UTF-8\n\n"; ########################################## # # Let's find out what browswer they are using # ########################################## $agentstring = $ENV{'HTTP_USER_AGENT'}; # IE 6.0 : ---Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)--- # Comm478 : ---Mozilla/4.78 [en] (Windows NT 5.0; U)--- # Nscp622 : ---Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:0.9.4.1) Gecko/20020314 Netscape6/6.2.2--- $browser_is_msie = "MSIE" if $agentstring =~ /MSIE/; # is this Windows? $isWindows = -d '\\'; ########################################## # # Read orgchart.conf settings, set by the administrator # ########################################## &read_config_file(); ########################################## # # Let's look at what is being passed in, from the user. # ########################################## # # "data" is a generic FORM variable name from # the topframe.html document that we receive our incoming query # from. # # (See comment at start of this file about "$uid" variable.) # if ( defined $cg->param("data") ) { $uid = $cg->param("data"); } # # For coexistence with the DSGW, when we crosslink, we need to # make sure that the user is taken back to the correct dsgw # context # $contextParamString = ""; if ( defined $cg->param("context") ) { $context = $cg->param("context"); $contextParamString = "context=${context}&"; $config_tokens{"url-phonebook-base"} =~ s/context=.*?&/$contextParamString/g; } # # But they may have entered this code from clicking on an org # chart icon from an already-drawn org chart, in which case # we know what the RDN attribute name is (cn, uid, etc.), so i # that has priority, if present. # if ( defined $cg->param("$config_tokens{'attrib-farleft-rdn'}") ) { $uid = $cg->param("$config_tokens{'attrib-farleft-rdn'}") } if ($uid eq "") { &output_html_header("no-javascript"); print "No username selected..."; #print "\n"; exit(0); } ########################################## # # If the user has asked this org chart to be prepared for printing # ########################################## if ( (defined $cg->param("print")) && ( $cg->param("print") eq "yes" ) ) { $print_mode = 1; } else { $print_mode = 0; } if ( !($print_mode) ) { $fontstring=""; } else { # if printing, let's make the font smaller, to fit more org chart on one page # $fontstring=""; } ########################################## # # See if the user has their own preferences to use. # # ########################################## &check_myorgchart_settings(); ########################################## # # Let's configure which attributes to request from LDAP, # based on preferences read above... # ########################################## &config_ldap_return_attrib_list(); ########################################## # # global variable descriptions: # # $total : stores the displayed statistic of "Total # of people" that is printed under org chart # $display_indent : helps track how deeply "indented" in the org chart hierarchy a given person is, to help # draw an internal data structure of the hierarchy. See details in get_org_data() function. # $tempnum : just generic variable used for different reasons, always within a very small (controllable) # scope within a given function only, since a generic all-purpose variable # $anothertempnum : same idea as $tempnum, just another variable for the same generic purpose # $tempstr : same idea as $tempnum, just another variable for the same generic purpose # [...1645 lines suppressed...] { print ""; } } else { for ( $anothertempnum = 0 ; $anothertempnum < $current_indent - 2 ; $anothertempnum++ ) { print ""; } } if ( ("$sortedPeople[$tempnum][8]" eq "cc1") || ( $sortedPeople[$tempnum][8] =~ /rounded/ ) ) { print ""; } else { print ""; } } $aimid = is_aimid_in_layer ( $config_tokens{"icons-aim-visible"} , "discover" , $sortedPeople[$tempnum][5] ); $emailstr = is_email_in_layer ( $config_tokens{"icons-email-visible"}, $sortedPeople[$tempnum][3] ); $pbstr = is_pb_in_layer ( $config_tokens{"icons-phonebook-visible"}, $sortedPeople[$tempnum][2] ); $locatorstr = is_locator_in_layer ( $config_tokens{"icons-locator-visible"}, $sortedPeople[$tempnum][6] ); if ( !($print_mode) ) { print "\n\n "; print ""; print " \n"; } print "$tempdata[@tempdata-1] \n"; # # If they are a nonleaf entry based on the next person being below them, or if they # are a nonleaf person based on "nonleaf" value which happens when max depth is exceeded # such that all people below them were chopped off (were on the next level that was chopped # off, hence why we needed to previously record "nonleaf" before the chop happened) # # then print the org chart icon # if ( ( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]/ ) || ( $sortedPeople[$tempnum][7] =~ /nonleaf/ ) ) { if ( ($print_mode) && ($current_indent == 1 ) ) { # special exception #1 of 2: # if we are in "prepare this page for printing" mode, and drawing a user in # a box, then let's not print the org icon next to their name ---> not needed # in the hardcopy printout (not helpful) } else { if ( ($print_mode) && ( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]/ ) ) { # special exception #2 of 2: if we are preparing this org chart for printing, # and if the org icon we are about to draw is for a group of people that are # already being printed on this same org chart under that person, there is # no point in hardcopy printing this icon next to the person's name # # but in the "else" block below, we do want to print the icon next to their name # (both for print and non-print org charts) because it signifies people underneath # that person when we CANNOT/WON'T see those people listed under that person } else { if ( !( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]\/$/ ) ) { print ""; print ""; } } } } print_aim_icon_if_outside_layer( $config_tokens{"icons-aim-visible"}, "discover", $sortedPeople[$tempnum][5] ); print_email_icon_if_outside_layer( $config_tokens{"icons-email-visible"}, $sortedPeople[$tempnum][3] ); print_pb_icon_if_outside_layer( $config_tokens{"icons-phonebook-visible"}, $sortedPeople[$tempnum][2] ); print_locator_icon_if_outside_layer( $config_tokens{"icons-locator-visible"}, $sortedPeople[$tempnum][6] ); # # if the person's name is being printed within a box, # then also print their title below their name # if ( $current_indent == 1 ) { print "
$sortedPeople[$tempnum][4]"; } print ""; if ( $current_indent == 1 ) { print" "; } print "
"; } } } ########################################## # # If they exceeded max depth allowed, let's still figure out # which people are managers of some type and make sure we # still put an org chart icon next to their name, so that the # user can tell that there is extra org chart branches that were # chopped off. # # We do this by over-filling the array of the org chart structure, # and then make sure that when we chop off the extra level below, # we record for the manager-types that have now chopped-off people # that they are a non-leaf item (which needs an org chart icon next # to their name # ########################################## sub detect_nonleaf_depth_exceeded() { if ( $incomplete == 1 ) { $indelete = 0; $anothertempnum = @sortedPeople; for ( $tempnum = $anothertempnum-1 ; $tempnum >= 0 ; $tempnum-- ) { # number of levels in current array element # $num = ($sortedPeople[$tempnum][0] =~ tr/\//\//) - 1; if ( $num > $config_tokens{"max-levels-drawn"} ) { splice(@sortedPeople,$tempnum,1); $indelete = 1; # $total is the total number of people we read in from LDAP # as reporting to the person entered. But now that we are # chopping people off that exceed the max depth, we better # adjust the $total accordingly as well, or else the # "Total Reports: XXX" summary info at bottom of org chart # will be too high/inaccurate. # --$total; } else { if ( $indelete == 1 ) { $indelete = 0; $sortedPeople[$tempnum][7] = "nonleaf"; } else { $sortedPeople[$tempnum][7] = "leaf"; } } } } } ########################################## # # See location this function is called from for comments on purpose. # ########################################## sub output_html_header() { my ($js_output) = @_; print "\n"; print "\n"; print "\n"; print " Directory Server Org Chart\n"; if ( $js_output ne "with-javascript" ) { print " \n"; } if ( $js_output eq "with-javascript" ) { &print_javascript(); } print "\n"; print "\n"; } #=== end =================================================================== From fedora-directory-commits at redhat.com Fri Jan 11 22:01:46 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 11 Jan 2008 17:01:46 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication cl5_api.c, 1.9, 1.9.2.1 repl5_replica_config.c, 1.6, 1.6.2.1 Message-ID: <200801112201.m0BM1ko5027424@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667/plugins/replication Modified Files: Tag: Directory71RtmBranch cl5_api.c repl5_replica_config.c Log Message: Resolves: #238630 Summary: ns-slapd sometimes fails with SIGSEGV when removing and recreating replica entry Description: applied the patch to Directory71RtmBranch Index: cl5_api.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- cl5_api.c 19 Apr 2005 22:07:32 -0000 1.9 +++ cl5_api.c 11 Jan 2008 22:01:44 -0000 1.9.2.1 @@ -6223,19 +6223,23 @@ _cl5WriteRUV (file, PR_FALSE); } - /* close file */ + /* close the db */ if (file->db) file->db->close(file->db, 0); if (file->flags & DB_FILE_DELETED) { + int rc = 0; + /* We need to use the libdb API to delete the files, otherwise we'll + * run into problems when we try to checkpoint transactions later. */ PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name); - if (PR_Delete(fullpathname) != PR_SUCCESS) - { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " - "failed to remove (%s) file; NSPR error - %d\n", file->name, PR_GetError ()); - - } + rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, fullpathname, 0, 0); + if (rc != 0) + { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " + "failed to remove (%s) file; libdb error - %d (%s)\n", + fullpathname, rc, db_strerror(rc)); + } } /* slapi_ch_free accepts NULL pointer */ Index: repl5_replica_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica_config.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- repl5_replica_config.c 19 Apr 2005 22:07:32 -0000 1.6 +++ repl5_replica_config.c 11 Jan 2008 22:01:44 -0000 1.6.2.1 @@ -455,9 +455,17 @@ if (mtnode_ext->replica) { + char ebuf[BUFSIZ]; + /* remove object from the hash */ r = (Replica*)object_get_data (mtnode_ext->replica); PR_ASSERT (r); + /* The changelog for this replica is no longer valid, so we should remove it. */ + slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_delete: " + "Warning: The changelog for replica %s is no longer valid since " + "the replica config is being deleted. Removing the changelog.\n", + escape_string(slapi_sdn_get_dn(replica_get_root(r)),ebuf)); + cl5DeleteDBSync(mtnode_ext->replica); replica_delete_by_name (replica_get_name (r)); object_release (mtnode_ext->replica); mtnode_ext->replica = NULL; From fedora-directory-commits at redhat.com Mon Jan 14 19:26:50 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 14 Jan 2008 14:26:50 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.16, 1.1.2.17 redhat-patch.inf, 1.1.2.17, 1.1.2.18 Message-ID: <200801141926.m0EJQorR013012@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12789 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Resolves: #203670 Summary: Tracking bug for Directory Server 7.1 SP 4 Description: updating patch info file to include the following patches: 171081, 176302, 183222, 196523, 199321, 204808, 208058, 219586, 238630, 240897, 243820, 288321, 311851, 314851 Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -r1.1.2.16 -r1.1.2.17 --- fedora-patch.inf 7 Jan 2008 22:32:16 -0000 1.1.2.16 +++ fedora-patch.inf 14 Jan 2008 19:26:47 -0000 1.1.2.17 @@ -49,22 +49,27 @@ base: ... file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229,173687,175063,202890,247725,297221: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687,175063,202890,247725,297221,196523,208058,311851: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897: bin/slapd/server/libslapd.* +file: 204808: bin/slapd/server/migratecred +file: 204808: bin/slapd/server/mmldif +file: 204808: bin/slapd/server/pwdhash file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create -file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507: lib/libback-ldbm.* +file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507,183222,314851,171081,243820,219586: lib/libback-ldbm.* file: 160003: bin/slapd/admin/scripts/template-db2index.pl file: 160003: bin/slapd/admin/bin/upgradeServer -file: 164836,165600: lib/attr-unique-plugin.* +file: 164836,165600,288321: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* file: 339791: lib/syntax-plugin.* -file: 297221: lib/acl-plugin.* +file: 297221,288321: lib/acl-plugin.* file: 297221: lib/statechange-plugin.* +file: 204808: lib/chainingdb-plugin.* +file: 176302: lib/passthru-plugin.* file: 167478,160589: setup/setup file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar -file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.* +file: 169388,169954,170071,170350,181827,179135,179137,238630: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt file: M324525,M324529: shared/lib/libldap50.* Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -r1.1.2.17 -r1.1.2.18 --- redhat-patch.inf 7 Jan 2008 22:32:16 -0000 1.1.2.17 +++ redhat-patch.inf 14 Jan 2008 19:26:47 -0000 1.1.2.18 @@ -49,22 +49,27 @@ base: /share/builds/products/server/directry/7.1 file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229,173687,175063,202890,247725,297221: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687,175063,202890,247725,297221,196523,208058,311851: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137,202890,247725,297221,240897: bin/slapd/server/libslapd.* +file: 204808: bin/slapd/server/migratecred +file: 204808: bin/slapd/server/mmldif +file: 204808: bin/slapd/server/pwdhash file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create -file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507: lib/libback-ldbm.* +file: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810,189264,192901,231507,183222,314851,171081,243820,219586: lib/libback-ldbm.* file: 160003: bin/slapd/admin/scripts/template-db2index.pl file: 160003: bin/slapd/admin/bin/upgradeServer -file: 164836,165600: lib/attr-unique-plugin.* +file: 164836,165600,288321: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* file: 339791: lib/syntax-plugin.* -file: 297221: lib/acl-plugin.* +file: 297221,288321: lib/acl-plugin.* file: 297221: lib/statechange-plugin.* +file: 204808: lib/chainingdb-plugin.* +file: 176302: lib/passthru-plugin.* file: 167478,160589: setup/setup file: 156120,159037,170321,170328,170556,170558,170816,185765: winsync/PassSync.msi file: 167761: java/jars/ds71.jar -file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.* +file: 169388,169954,170071,170350,181827,179135,179137,238630: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt file: M324525,M324529: shared/lib/libldap50.* From fedora-directory-commits at redhat.com Mon Jan 14 19:33:10 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 14 Jan 2008 14:33:10 -0500 Subject: [Fedora-directory-commits] fedora-idm-console LICENSE, NONE, 1.1 build.properties, 1.1.1.1, 1.2 fedora-idm-console.spec, 1.3, 1.4 Message-ID: <200801141933.m0EJXAc4013311@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/fedora-idm-console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13293/fedora-idm-console Modified Files: build.properties fedora-idm-console.spec Added Files: LICENSE Log Message: Resolves: bug 428352 Description: Review Request: fedora-idm-console: Fedora branded Java console for Fedora Directory Server Fix Description: Bump version to 1.1.1 - add LICENSE --- NEW FILE LICENSE --- GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS Index: build.properties =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/build.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- build.properties 1 Aug 2007 23:08:51 -0000 1.1.1.1 +++ build.properties 14 Jan 2008 19:33:08 -0000 1.2 @@ -23,7 +23,7 @@ console.root=. console.version=11 -console.dotversion=1.1.0 +console.dotversion=1.1.1 console.dotgenversion=1.1 theme.core=fedora-idm-console Index: fedora-idm-console.spec =================================================================== RCS file: /cvs/dirsec/fedora-idm-console/fedora-idm-console.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-idm-console.spec 19 Dec 2007 20:08:44 -0000 1.3 +++ fedora-idm-console.spec 14 Jan 2008 19:33:08 -0000 1.4 @@ -1,22 +1,24 @@ %define major_version 1.1 -%define minor_version 0 +%define minor_version 1 Name: fedora-idm-console Version: %{major_version}.%{minor_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Fedora Management Console -Group: Applications -License: LGPL +Group: Applications/System +License: LGPLv2 URL: http://directory.fedoraproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 Requires: idm-console-framework >= 1.1 +Requires: java-1.7.0-icedtea BuildRequires: ant >= 1.6.2 BuildRequires: ldapjdk BuildRequires: jss >= 4.2 BuildRequires: idm-console-framework >= 1.1 +BuildRequires: java-1.7.0-icedtea-devel %description A Java based remote management console used for Managing Fedora @@ -33,9 +35,9 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -install -m777 built/*.jar $RPM_BUILD_ROOT%{_javadir} +install -m644 built/*.jar $RPM_BUILD_ROOT%{_javadir} install -d $RPM_BUILD_ROOT%{_bindir} -install -m777 built/%{name} $RPM_BUILD_ROOT/%{_bindir} +install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir} # create symlinks pushd $RPM_BUILD_ROOT%{_javadir} @@ -48,12 +50,18 @@ %files %defattr(-,root,root,-) +%doc LICENSE %{_javadir}/%{name}-%{version}_en.jar %{_javadir}/%{name}-%{major_version}_en.jar %{_javadir}/%{name}_en.jar %{_bindir}/%{name} %changelog +* Thu Jan 10 2008 Rich Megginson 1.1.1-1 +- this is the fedora package review candidate +- added LICENSE file +- changed permissions on jar files and shell script + * Wed Dec 19 2007 Rich Megginson 1.1.0-5 - for the Fedora DS 1.1 release From fedora-directory-commits at redhat.com Mon Jan 14 19:39:22 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 14 Jan 2008 14:39:22 -0500 Subject: [Fedora-directory-commits] directoryconsole build.properties, 1.7, 1.8 fedora-ds-console.spec, 1.5, 1.6 Message-ID: <200801141939.m0EJdM7h013590@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13571/directoryconsole Modified Files: build.properties fedora-ds-console.spec Log Message: Resolves: bug 428357 Description: Review Request: fedora-ds-console: Fedora Directory Server Management Console Fix Description: Bump version to 1.1.1 - add LICENSE Index: build.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/build.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.properties 2 Jul 2007 19:44:08 -0000 1.7 +++ build.properties 14 Jan 2008 19:39:20 -0000 1.8 @@ -21,7 +21,7 @@ lang=en ldapconsole.root=.. -ldapconsole.version=1.1.0 +ldapconsole.version=1.1.1 ldapconsole.gen.version=1.1 brand=fedora ldapconsole.name=${brand}-ds-${ldapconsole.version} Index: fedora-ds-console.spec =================================================================== RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-ds-console.spec 19 Dec 2007 20:11:31 -0000 1.5 +++ fedora-ds-console.spec 14 Jan 2008 19:39:20 -0000 1.6 @@ -1,25 +1,27 @@ %define major_version 1.1 -%define minor_version 0 +%define minor_version 1 %define shortname fedora-ds %define pkgname dirsrv Name: fedora-ds-console Version: %{major_version}.%{minor_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Fedora Directory Server Management Console -Group: Applications -License: LGPL +Group: Applications/System +License: GPLv2 URL: http://directory.fedoraproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 Requires: %{shortname}-admin +Requires: java-1.7.0-icedtea BuildRequires: ant >= 1.6.2 BuildRequires: ldapjdk BuildRequires: idm-console-framework +BuildRequires: java-1.7.0-icedtea-devel %description A Java based remote management console used for Managing Fedora @@ -36,7 +38,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java -install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java +install -m644 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd/help install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd @@ -54,7 +56,8 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc LICENSE %{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar %{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar %{_datadir}/%{pkgname}/html/java/%{shortname}.jar @@ -67,6 +70,11 @@ %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html %changelog +* Thu Jan 10 2008 Rich Megginson 1.1.1-1 +- changes for fedora package review +- added requires for icedtea java +- added LICENSE + * Wed Dec 19 2007 Rich Megginson 1.1.0-5 - This is for the Fedora DS 1.1 release From fedora-directory-commits at redhat.com Mon Jan 14 19:42:50 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 14 Jan 2008 14:42:50 -0500 Subject: [Fedora-directory-commits] admservconsole build.properties, 1.5, 1.6 fedora-admin-console.spec, 1.5, 1.6 Message-ID: <200801141942.m0EJgoBP013695@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/admservconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13676/admservconsole Modified Files: build.properties fedora-admin-console.spec Log Message: Resolves: bug 428364 Description: Review Request: fedora-admin-console: Fedora Directory Administration Server Management Console Fix Description: Bump version to 1.1.1 - add LICENSE Index: build.properties =================================================================== RCS file: /cvs/dirsec/admservconsole/build.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.properties 2 Aug 2007 23:16:15 -0000 1.5 +++ build.properties 14 Jan 2008 19:42:48 -0000 1.6 @@ -21,7 +21,7 @@ lang=en admservconsole.root=.. -admservconsole.version=1.1.0 +admservconsole.version=1.1.1 admservconsole.gen.version=1.1 brand=fedora admservconsole.name=${brand}-admin-${admservconsole.version} Index: fedora-admin-console.spec =================================================================== RCS file: /cvs/dirsec/admservconsole/fedora-admin-console.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-admin-console.spec 19 Dec 2007 20:13:44 -0000 1.5 +++ fedora-admin-console.spec 14 Jan 2008 19:42:48 -0000 1.6 @@ -1,5 +1,5 @@ %define major_version 1.1 -%define minor_version 0 +%define minor_version 1 %define dsname fedora-ds %define shortname fedora-admin @@ -7,20 +7,22 @@ Name: fedora-admin-console Version: %{major_version}.%{minor_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Fedora Admin Server Management Console -Group: Applications -License: LGPL +Group: Applications/System +License: GPLv2 URL: http://directory.fedoraproject.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 Requires: %{dsname}-admin +Requires: java-1.7.0-icedtea BuildRequires: ant >= 1.6.2 BuildRequires: ldapjdk BuildRequires: idm-console-framework +BuildRequires: java-1.7.0-icedtea-devel %description A Java based remote management console used for Managing Fedora @@ -37,7 +39,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java -install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java +install -m644 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin @@ -55,7 +57,8 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc LICENSE %{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar %{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar %{_datadir}/%{pkgname}/html/java/%{shortname}.jar @@ -68,6 +71,11 @@ %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html %changelog +* Thu Jan 10 2008 Rich Megginson 1.1.1-1 +- changes for fedora package review +- added requires for icedtea java +- added LICENSE + * Wed Dec 19 2007 Rich Megginson - 1.1.0-4 - This is for the Fedora DS 1.1 release From fedora-directory-commits at redhat.com Mon Jan 14 22:31:20 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 14 Jan 2008 17:31:20 -0500 Subject: [Fedora-directory-commits] dsgw/config/de display-country.html.in, NONE, 1.1 display-group.html.in, NONE, 1.1 display-groupun.html.in, NONE, 1.1 display-mailgroup.html.in, NONE, 1.1 display-ntgroup.html.in, NONE, 1.1 display-ntperson.html.in, NONE, 1.1 display-org.html.in, NONE, 1.1 display-orgperson.html.in, NONE, 1.1 display-person.html.in, NONE, 1.1 display-umperson.html.in, NONE, 1.1 newentry.html.in, NONE, 1.1 search.html.in, NONE, 1.1 display-country.html, 1.1.1.1, NONE display-group.html, 1.1.1.1, NONE display-groupun.html, 1.1.1.1, NONE display-mailgroup.html, 1.1.1.1, NONE display-ntgroup.html, 1.1.1.1, NONE display-ntperson.html, 1.1.1.1, NONE display-org.html, 1.1.1.1, NONE display-orgperson.html, 1.1.1.1, NONE display-person.html, 1.1.1.1, NONE display-umperson.html, 1.1.1.1, NONE newentry.html, 1.1.1.1, NONE search.html, 1.1.1.1, NONE Message-ID: <200801142231.m0EMVKja008147@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/config/de In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982/config/de Added Files: display-country.html.in display-group.html.in display-groupun.html.in display-mailgroup.html.in display-ntgroup.html.in display-ntperson.html.in display-org.html.in display-orgperson.html.in display-person.html.in display-umperson.html.in newentry.html.in search.html.in Removed Files: display-country.html display-group.html display-groupun.html display-mailgroup.html display-ntgroup.html display-ntperson.html display-org.html display-orgperson.html display-person.html display-umperson.html newentry.html search.html Log Message: General templating work for DSGW CGI URI's. --- NEW FILE display-country.html.in --- Land - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Land
Landesname: Beschreibung:
Siehe auch:
URL:
Eintrag zuletzt geändert am von --- NEW FILE display-group.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> Gruppeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Gruppe Neue Gruppe -
        
* bezeichnet einen Pflichteintrag
Name: *
Beschreibung:
Eigentümer:
Siehe auch:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
Gruppenmitglieder:
Eintrag zuletzt geändert am von --- NEW FILE display-groupun.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> Gruppeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Gruppe Neue Gruppe -
        
* bezeichnet einen Pflichteintrag
Name: *
Beschreibung:
Eigentümer:
Siehe auch:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
Gruppenmitglieder:
Eintrag zuletzt geändert am von --- NEW FILE display-mailgroup.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> E-Mail-Gruppeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Gruppe Neue E-Mail-Gruppe
        
Name: Beschreibung:
Eigentümer:
Siehe auch:
Gruppenmitglieder:
E-Mail-Mitglieder:
Eintrag zuletzt geändert am von --- NEW FILE display-ntgroup.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> NT-Gruppeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Gruppe Neue NT-Gruppe -
        
* bezeichnet einen Pflichteintrag
Name: *
NT-Gruppenname: *
NT-Gruppentyp: *
NT-Gruppendomäne *
Beschreibung:
Lokal:
Geschäftsbereich:
Eigentümer:
Siehe auch:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
NT-Gruppenmitglieder:
NT-Gruppe löschen, wenn Gruppe gelöscht wird:
Neues NT-Gruppenkonto erstellen:
Eintrag zuletzt geändert am von --- NEW FILE display-ntperson.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> NT-Benutzereintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> Benutzer (Anklicken, um Karte anzuzeigen) > Click to display organization chart Neuer NT-Benutzer -
>Download Certificate    >Play Audio Clip
           
* bezeichnet einen Pflichteintrag
Kontaktinformationen
Vorname: Vollständiger Name: *
Nachname: *
Directory-Server-Kennwort: Kennwort zur Bestätigung wiederholen:
Telefon: E-Mail-Adresse:
Fax: Benutzer-ID:
Pager: Mobiltelefon:
Windows NT Kontoinformationen
NT-Benutzer-ID: * NT-Domäne: *
NT-Benutzerkonto löschen, wenn Benutzer gelöscht wird:
Neues NT-Benutzerkonto erstellen:
NT-Benutzer-Kommentar: Eindeutige NT-Benutzer-ID:
NT-Kennwort abgelaufen: Anzahl falscher NT-Kennworteingaben:
Letzte NT-Anmeldung: Letzte NT-Abmeldung:
Verfalldatum NT-Benutzerkonto: Anzahl NT-Anmeldungen:
NT-Anmelde-Server: NT-Arbeitsstationen:
NT-Codeseite: NT-Landescode:
Primäre NT-Gruppen-ID: NT-Profil:
NT-Basisverzeichnis: Laufwerk des NT-Basisverzeichnisses:
NT-Skriptpfad: Maximaler NT-Speicherplatz:
NT-Einheiten pro Woche: Rechte des NT-Benutzers:
Operator-Rechte des NT-Benutzers: Div. betr. NT-Benutzerkonto: Funktionen:
Branchen- und Positionsinformationen
Branche: Titel:
Geschäftsbereich: Leiter:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
Raum: Sekr.:
Abt.-Nr.: MA-Nr.:
Kfz-Kennzeichen:      
Postadresse:
-->
Zusätzliche Informationen
Beschreibung:
Siehe auch:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
URL:
Eintrag zuletzt geändert am von --- NEW FILE display-org.html.in --- <!-- IF "Adding" --> Neue <!-- ENDIF // Adding --> Firma - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Firma Neue Firma -
        
* bezeichnet einen Pflichteintrag
Firmenname: * Beschreibung:
Telefon: Branche:
Fax: Standort:
Postadresse:
Siehe auch:
Eintrag zuletzt geändert am von --- NEW FILE display-orgperson.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> Personeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> Benutzer (Anklicken, um Karte anzuzeigen) > Click to display organization chart Neue Person -
>Zertifikat laden    >Audio-Clip abspielen
           
* bezeichnet einen Pflichteintrag
Kontaktinformationen
Vorname: Vollständiger Name: *
Nachname: *
Kennwort: Kennwort zur Bestätigung wiederholen:
Telefon: E-Mail-Adresse:
Fax: Benutzer-ID:
Pager: Mobiltelefon:
Branchen- und Positionsinformationen
Branche: Titel:
Geschäftsbereich: Leiter:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
Raum: Sekr.:
Abt.-Nr.: MA-Nr.:
Kfz-Kennzeichen:      
Postadresse:
-->
Zusätzliche Informationen
Beschreibung:
Siehe auch:
 Sie müssen diesen Eintrag speichern, bevor Sie dieses Feld bearbeiten können.
URL:
Eintrag zuletzt geändert am von --- NEW FILE display-person.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> Personeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Benutzer (Anklicken, um Karte anzuzeigen) > Click to display organization chart Neue Person -
           
* bezeichnet einen Pflichteintrag
Nachname: * Vollständiger Name:
Kennwort: Kennwort zur Bestätigung wiederholen:
Telefon: E-Mail-Adresse:
Fax: Benutzer-ID:
Pager: Mobiltelefon:
Titel:
Postadresse:
Beschreibung:
Siehe auch:
 Sie müssen diesen Eintrag speichern, bevor Sie diese Felder bearbeiten können.
URL:
Lieblingsgetränk:
Eintrag zuletzt geändert am von --- NEW FILE display-umperson.html.in --- <!-- IF "Adding" --> Neuer <!-- ENDIF // Adding --> Personeneintrag - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
> Person > Click to display organization chart Neue Person -
>Audio-Clip abspielen
        
* bezeichnet einen Pflichteintrag
Nachname: * Vollständiger Name: *
Telefon: E-Mail-Adresse:
Fax: Eindeutiger Name:
Pager: Mobiltelefon:
Titel:
Postadresse:
Beschreibung:
Siehe auch:
URL:
Lieblingsgetränk:
Eintrag zuletzt geändert am von --- NEW FILE newentry.html.in --- Netscape Directory Server Gateway Neuer Eintrag <BODY> Sie ben&ouml;tigen einen Client, der Rahmen darstellen kann, um dieses Dokument zu betrachten. </BODY> --- NEW FILE search.html.in --- Netscape Directory Server Gateway: Standardsuche --- display-country.html DELETED --- --- display-group.html DELETED --- --- display-groupun.html DELETED --- --- display-mailgroup.html DELETED --- --- display-ntgroup.html DELETED --- --- display-ntperson.html DELETED --- --- display-org.html DELETED --- --- display-orgperson.html DELETED --- --- display-person.html DELETED --- --- display-umperson.html DELETED --- --- newentry.html DELETED --- --- search.html DELETED --- From fedora-directory-commits at redhat.com Mon Jan 14 22:31:20 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 14 Jan 2008 17:31:20 -0500 Subject: [Fedora-directory-commits] dsgw/config/fr csearch.html.in, NONE, 1.1 display-country.html.in, NONE, 1.1 display-group.html.in, NONE, 1.1 display-groupun.html.in, NONE, 1.1 display-mailgroup.html.in, NONE, 1.1 display-ntgroup.html.in, NONE, 1.1 display-ntperson.html.in, NONE, 1.1 display-org.html.in, NONE, 1.1 display-orgperson.html.in, NONE, 1.1 display-orgunit.html.in, NONE, 1.1 display-person.html.in, NONE, 1.1 display-umperson.html.in, NONE, 1.1 newentry.html.in, NONE, 1.1 search.html.in, NONE, 1.1 csearch.html, 1.1.1.1, NONE display-country.html, 1.1.1.1, NONE display-group.html, 1.1.1.1, NONE display-groupun.html, 1.1.1.1, NONE display-mailgroup.html, 1.1.1.1, NONE display-ntgroup.html, 1.1.1.1, NONE display-ntperson.html, 1.1.1.1, NONE display-org.html, 1.1.1.1, NONE display-orgperson.html, 1.1.1.1, NONE display-orgunit.html, 1.1.1.1, NONE display-person.html, 1.1.1.1, NONE display-umperson.html, 1.1.1.1, NONE newentry.html, 1.1.1.1, NONE search.html, 1.1.1.1, NONE Message-ID: <200801142231.m0EMVKJM008199@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/config/fr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982/config/fr Added Files: csearch.html.in display-country.html.in display-group.html.in display-groupun.html.in display-mailgroup.html.in display-ntgroup.html.in display-ntperson.html.in display-org.html.in display-orgperson.html.in display-orgunit.html.in display-person.html.in display-umperson.html.in newentry.html.in search.html.in Removed Files: csearch.html display-country.html display-group.html display-groupun.html display-mailgroup.html display-ntgroup.html display-ntperson.html display-org.html display-orgperson.html display-orgunit.html display-person.html display-umperson.html newentry.html search.html Log Message: General templating work for DSGW CGI URI's. --- NEW FILE csearch.html.in --- Netscape Directory Server Gateway : Advanced Search --- NEW FILE display-country.html.in --- Pays - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Country
Nom de pays : Description:
Voir également :
URL :
La dernière modification de cette entrée date du par --- NEW FILE display-group.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Entrée de groupe <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Groupe Nouveau groupe -
        
* Indique une zone d'entrée obligatoire
Nom : *
Description :
Propriétaire :
Voir également :
 Vous devez enregistrer cette entrée pour pouvoir modifier ces champs.
Membres du groupe :
La dernière modification de cette entrée date du par --- NEW FILE display-groupun.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Entrée de groupe <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Groupe Nouveau groupe -
        
* Indique une zone d'entrée obligatoire
Nom : *
Description :
Propriétaire :
Voir également :
 Vous devez enregistrer cette entrée pour pouvoir modifier ces champs.
Membres du groupe :
La dernière modification de cette entrée date du par --- NEW FILE display-mailgroup.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> entr??e de groupe de courrier - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Groupe Nouveau groupe de courrier
        
Nom : Description :
Propriétaire :
Voir également :
Membres du groupe :
Membres de courrier électronique :
La dernière modification de cette entrée date du par --- NEW FILE display-ntgroup.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Entrée du groupe NT - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Groupe Nouveau groupe NT -
        
* Indique une zone d'entrée obligatoire
Nom : *
Nom du groupe NT : *
Type de groupe NT : *
Domaine du groupe NT : *
Description :
Lieu :
Service de la société :
Propriétaire :
Voir également :
 Vous devez enregistrer cette entrée pour pouvoir modifier ces champs.
Membres du groupe NT :
Supprimer le groupe NT si le groupe est supprimé :
Créer un nouveau groupe NT :
La dernière modification de cette entrée date du par --- NEW FILE display-ntperson.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Entrée de personne NT- <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> Personne (cliquez pour afficher la carte) > Click to display organization chart Nouvelle personne NT
>Download Certificate    >Play Audio Clip
           
* Indique une zone d'entrée obligatoire
Contacts
Prénom : Nom complet : *
Nom de famille : *
Mot de passe du Directory Server : Retaper le mot de passe pour confirmation
Téléphone : Adresse électronique :
Télécopie : Id utilisateur :
Téléavertisseur : Téléphone mobile :
Informations sur le compte Windows NT
Id utilisateur NT : * Nom de domaine NT : *
Supprimer le compte NT si la personne est supprimée
Créer un nouveau compte NT
Commentaire utilisateur NT Id utilisateur NT unique :
Mot de passe NT périmé : Compte de mots de passe NT incorrect :
Dernière date de connexion au système NT : Dernière date de déconnexion du système NT :
Date d'expiration du compte NT : Nombre de connexions NT :
Serveur de connexions NT : Postes de travail NT :
Page de codes NT : Code de pays NT :
Id de groupe principal NT : Profil NT :
Annuaire personnel NT : Lecteur d'annuaire personnel NT :
Chemin script NT : Mise en mémoire maximale NT :
Unités NT par semaine : Privilèges de l'utilisateur NT :
Privilèges de l'utilisateur NT : Diverses fonctions de compte de personne NT : Features:
Informations sur l'activité et l'emplacement
Secteur d'activité : Titre :
Unité organisationnelle : Gestionnaire :
 Vous devez enregistrer cette entrée pour pouvoir modifier ces champs.
Numéro de poste : Admin.:
N° de service : N° d'employé :
N° de permis de circulation :      
Adresse postale :
-->
Informations supplémentaires
Description:
Voir également :
 Vous devez enregistrer cette entrée pour pouvoir modifier ce champ.
URL:
La dernière modification de cette entrée date du Dans --- NEW FILE display-org.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Organisation - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Organization Nouvelle organisation -
        
* Indique une zone d'entrée obligatoire
Nom de l'organisation : * Description:
Téléphone : Catégorie commerciale :
Télécopie : Emplacement :
Adresse postale :
Voir également :
La dernière modification de cette entrée date du par --- NEW FILE display-orgperson.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Entrée de personne <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> Personne (cliquez pour afficher la carte) > Click to display organization chart Nouvelle personne -
>Télécharger un certificat    >Lire le clip audio
           
* Indique une zone d'entrée obligatoire
Contacts
Prénom : Nom complet : *
Nom : *
Mot de passe : Retaper le mot de passe pour confirmation :
Téléphone : Adresse électronique :
Télécopie : Id d'utilisateur :
Radiomessagerie : Téléphone mobile :
Informations sur l'activité et l'emplacement
Secteur d'activité : Titre :
Service de la société : Responsable :
 Vous devez enregistrer cette entrée avant de pouvoir modifier ces champs.
Numéro de poste : Admin. :
N° de service : N° d'employé :
N° d'immatriculation :      
Adresse postale :
-->
Informations supplémentaires
Description :
Voir également :
 Vous devez enregistrer cette entrée avant de pouvoir modifier ce champ.
URL :
La dernière modification de cette entrée date du par --- NEW FILE display-orgunit.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Unit?? organisationnelle - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Unit?? Org Nouvelle unit?? organisationnelle -
        
* Indique une zone d'entr??e obligatoire
Nom de l'unit?? : * Description :
T??l??phone : Cat??gorie commerciale :
T??l??copie : Emplacement :
Adresse postale :
Voir ??galement :
La derni??re modification de cette entr??e date du par --- NEW FILE display-person.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> Entrée de personne <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Personne (cliquez pour afficher la carte) > Click to display organization chart Nouvelle personne
           
* Indique une zone d'entrée obligatoire
Nom : * Nom complet :
Mot de passe : Retaper le mot de passe pour confirmation :
Téléphone : Adresse électronique :
Télécopie : Id d'utilisateur :
Radiomessagerie : Téléphone mobile :
Titre :
Adresse postale :
Description :
Voir également :
 Vous devez enregistrer cette entrée avant de pouvoir modifier ce champ.
URL :
Boisson favorite :
La dernière modification de cette entrée date du par --- NEW FILE display-umperson.html.in --- <!-- IF "Adding" --> Nouvelle <!-- ENDIF // Adding --> entrée de personne U-M - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
> Personne > Click to display organization chart Nouvel personne U-M -
>Lecture de clip audio
        
* Indique une zone d'entr??e obligatoire
Nom de famille : * Nom complet : *
Téléphone : Adresse électronique :
Télécopie : Nom unique :
Téléavertisseur : Téléphone mobile :
Titre :
Adresse postale :
Description :
Voir également :
URL :
Boisson favorite :
La dernière modification de cette entrée date du par --- NEW FILE newentry.html.in --- Passerelle Netscape Directory Server : New Entry <BODY> Vous devez utiliser un client qui g&egrave;re la fonction de cadres pour pouvoir afficher ce document. </BODY> --- NEW FILE search.html.in --- Passerelle Netscape Directory Server : Standard Search --- csearch.html DELETED --- --- display-country.html DELETED --- --- display-group.html DELETED --- --- display-groupun.html DELETED --- --- display-mailgroup.html DELETED --- --- display-ntgroup.html DELETED --- --- display-ntperson.html DELETED --- --- display-org.html DELETED --- --- display-orgperson.html DELETED --- --- display-orgunit.html DELETED --- --- display-person.html DELETED --- --- display-umperson.html DELETED --- --- newentry.html DELETED --- --- search.html DELETED --- From fedora-directory-commits at redhat.com Mon Jan 14 22:31:19 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 14 Jan 2008 17:31:19 -0500 Subject: [Fedora-directory-commits] dsgw/config authPassword.html.in, NONE, 1.1 authSearch.html.in, NONE, 1.1 csearch.html.in, NONE, 1.1 csearchAttr.html.in, NONE, 1.1 csearchBase.html.in, NONE, 1.1 csearchMatch.html.in, NONE, 1.1 csearchString.html.in, NONE, 1.1 csearchType.html.in, NONE, 1.1 display-country.html.in, NONE, 1.1 display-dc.html.in, NONE, 1.1 display-dnedit.html.in, NONE, 1.1 display-dneditpeople.html.in, NONE, 1.1 display-group.html.in, NONE, 1.1 display-groupun.html.in, NONE, 1.1 display-ntgroup.html.in, NONE, 1.1 display-ntperson.html.in, NONE, 1.1 display-org.html.in, NONE, 1.1 display-orgperson.html.in, NONE, 1.1 display-orgunit.html.in, NONE, 1.1 display-person.html.in, NONE, 1.1 list-Anything.html.in, NONE, 1.1 list-Auth.html.in, NONE, 1.1 list-Domaincomponent.html.in, NONE, 1.1 list-Groups.html.in, NONE, 1.1 list-NT-Groups.html.in, NONE, 1.1 list-NT-People.html.in, NONE, 1.1 list-Org-Units.html.in, NONE, 1.1 list-Organizations.html.in, NONE, 1.1 list-People.html.in, NONE, 1.1 list-fa-Groups.html.in, NONE, 1.1 list-fa-People.html.in, NONE, ! 1.1 list-urlsearch.html.in, NONE, 1.1 newentry.html.in, NONE, 1.1 newentryName.html.in, NONE, 1.1 newentryType.html.in, NONE, 1.1 search.html.in, NONE, 1.1 searchString.html.in, NONE, 1.1 authPassword.html, 1.1.1.1, NONE authSearch.html, 1.1.1.1, NONE csearch.html, 1.1.1.1, NONE csearchAttr.html, 1.1.1.1, NONE csearchBase.html, 1.1.1.1, NONE csearchMatch.html, 1.1.1.1, NONE csearchString.html, 1.1.1.1, NONE csearchType.html, 1.1.1.1, NONE display-country.html, 1.1.1.1, NONE display-dc.html, 1.1.1.1, NONE display-dnedit.html, 1.1.1.1, NONE display-dneditpeople.html, 1.1.1.1, NONE display-group.html, 1.1.1.1, NONE display-groupun.html, 1.1.1.1, NONE display-ntgroup.html, 1.1.1.1, NONE display-ntperson.html, 1.1.1.1, NONE display-org.html, 1.1.1.1, NONE display-orgperson.html, 1.1.1.1, NONE display-orgunit.html, 1.1.1.1, NONE display-person.html, 1.1.1.1, NONE list-Anything.html, 1.1.1.1, NONE list-Auth.html, 1.1.1.1, NONE list-Domaincomponent.html, 1.1.1.1, NONE list-Groups.html, 1.1.1.1, NONE list-NT-Groups.html, 1.1.1.1, NONE list-NT-! People.html,1.1.1.1,NONE list-Org-Units.html,1.1.1.1,NONE list! -Organ Message-ID: <200801142231.m0EMVKqi008144@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982/config Added Files: authPassword.html.in authSearch.html.in csearch.html.in csearchAttr.html.in csearchBase.html.in csearchMatch.html.in csearchString.html.in csearchType.html.in display-country.html.in display-dc.html.in display-dnedit.html.in display-dneditpeople.html.in display-group.html.in display-groupun.html.in display-ntgroup.html.in display-ntperson.html.in display-org.html.in display-orgperson.html.in display-orgunit.html.in display-person.html.in list-Anything.html.in list-Auth.html.in list-Domaincomponent.html.in list-Groups.html.in list-NT-Groups.html.in list-NT-People.html.in list-Org-Units.html.in list-Organizations.html.in list-People.html.in list-fa-Groups.html.in list-fa-People.html.in list-urlsearch.html.in newentry.html.in newentryName.html.in newentryType.html.in search.html.in searchString.html.in Removed Files: authPassword.html authSearch.html csearch.html csearchAttr.html csearchBase.html csearchMatch.html csearchString.html csearchType.html display-country.html display-dc.html display-dnedit.html display-dneditpeople.html display-group.html display-groupun.html display-ntgroup.html display-ntperson.html display-org.html display-orgperson.html display-orgunit.html display-person.html list-Anything.html list-Auth.html list-Domaincomponent.html list-Groups.html list-NT-Groups.html list-NT-People.html list-Org-Units.html list-Organizations.html list-People.html list-fa-Groups.html list-fa-People.html list-urlsearch.html newentry.html newentryName.html newentryType.html search.html searchString.html Log Message: General templating work for DSGW CGI URI's. --- NEW FILE authPassword.html.in --- Authenticate...

Password for :

--- NEW FILE authSearch.html.in --- Authenticate... The first step in authenticating to the directory is identifying yourself.
Please type your name:

 (only available to Directory Administrators) --- NEW FILE csearch.html.in --- Netscape Directory Server Gateway: Advanced Search --- NEW FILE csearchAttr.html.in ---
where the
--- NEW FILE csearchBase.html.in ---
within
--- NEW FILE csearchMatch.html.in ---
--- NEW FILE csearchString.html.in ---
--- NEW FILE csearchType.html.in ---
Find
--- NEW FILE display-country.html.in --- Country - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Country
 
Country Name: Description:
See Also:
URL:
 

This entry was last modified on by
--- NEW FILE display-dc.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Domaincomponent - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Domaincomponent Entry
Domaincomponent New Domaincomponent -
        
 * Indicates a required field
 
class="bold" >Domaincomponent Name: * class="bold" >Description:
class="bold" >Phone: class="bold" >Business Category:
class="bold" >Fax: class="bold" >Location:
class="bold" >Mailing Address:
class="bold" >See Also:
 
 This entry was last modified on by
--- NEW FILE display-dnedit.html.in --- Edit <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Edit :
Find matching 

--- NEW FILE display-dneditpeople.html.in --- Edit <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Edit :
Find matching 

--- NEW FILE display-group.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Group Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Group Entry
Group New Group -
        
  * Indicates a required field
 
class="bold" >Name: *
class="bold" >Description:
class="bold" >Owner:
class="bold" >See Also:
 You must save this entry before you can edit these fields.
class="bold" >Group Members:
 
 This entry was last modified on by
--- NEW FILE display-groupun.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Group Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Group Entry
Group New Group -
        
 * Indicates a required field
 
class="bold" >Name: *
class="bold" >Description:
class="bold" >Owner:
class="bold" >See Also:
 You must save this entry before you can edit these fields.
class="bold" >Group Members:
 
  This entry was last modified on by
--- NEW FILE display-ntgroup.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> NT Group Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
NT Group Entry
Group New NT Group -
        
  * Indicates a required field
 
class="bold" >Name: *
class="bold" >NT Group Name: *
class="bold" >Description:
class="bold" >Owner:
class="bold" >See Also:
 You must save this entry before you can edit these fields.
class="bold" >NT Group Members:
class="bold" >Delete NT Group if Group deleted:
Create New NT Group:
 
  This entry was last modified on by
--- NEW FILE display-ntperson.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> NT Person Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
NT Person Entry
BORDER=0> NT Person (click to show card) > Click to display organization chart New NT Person -
>Download Certificate    >Play Audio Clip
           
  * Indicates a required field

Contact Information
class="bold" >First Name: class="bold" >Common Name: *
class="bold" >Last Name: * class="bold" >E-Mail Address:
Directory Password: Repeat password to confirm:
class="bold" >Phone: class="bold" >AIM ID:
class="bold" >Fax: class="bold" >User ID:
class="bold" >Pager: class="bold" >Mobile Phone:
Windows NT Account Information
class="bold" >NT User Id: *
class="bold" >Delete NT Account if Person deleted:
Create New NT Account :
NT User Comment: NT User Unique Id:
NT Password Expired: NT Bad Password Count:
NT Last Logon Date: NT Last Logoff Date:
NT Account Expiration Date: Number of NT Logons:
NT Logon Server: NT Workstations:
NT Code Page: NT Country Code:
NT Primary Group Id: NT Profile:
NT Home Directory: NT Home Directory Drive:
NT Script Path: NT Max Storage:
NT Units Per Week: NT User's Privileges:
NT User's Operator Privileges: NT User Account Misc. Features:
Business and Location Information
class="bold" >Business Category: class="bold" >Title:
class="bold" >Organizational Unit: class="bold" >Manager:
 You must save this entry before you can edit these fields.
class="bold" >Room Number: class="bold" >Admin.:
class="bold" >Dept#: class="bold" >Emp#:
class="bold" >Car License#:      
class="bold" >Mailing Address:
class="bold" >Unique ID: -->
Additional Information
class="bold" >Description:
class="bold" >See Also:
 You must save this entry before you can edit this field.
class="bold" >URL:
 
  This entry was last modified on by
--- NEW FILE display-org.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Organization - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Organization Entry
Organization New Organization -
        
 * Indicates a required field
 
class="bold" >Organization Name: * class="bold" >Description:
class="bold" >Phone: class="bold" >Business Category:
class="bold" >Fax: class="bold" >Location:
class="bold" >Mailing Address:
class="bold" >See Also:
 
  This entry was last modified on by
--- NEW FILE display-orgperson.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Person Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Person Entry
BORDER=0> Person (click to show card) > Click to display organization chart New Person -
>Download Certificate    >Play Audio Clip
           
  * Indicates a required field
Contact Information
class="bold" >First Name: class="bold" >Common Name: *
class="bold" >Last Name: * class="bold" >E-Mail Address:
Password: Repeat password to confirm:
class="bold" >Phone: class="bold" >AIM ID:
class="bold" >Fax: class="bold" >User ID:
class="bold" >Pager: class="bold" >Mobile Phone:
Business and Location Information
class="bold" >Business Category: class="bold" >Title:
class="bold" >Organizational Unit: class="bold" >Manager:
 You must save this entry before you can edit these fields.
class="bold" >Room Number: class="bold" >Admin.:
class="bold" >Dept#: class="bold" >Emp#:
class="bold" >Car License#:      
class="bold" >Mailing Address:
class="bold" >Unique ID: -->
Additional Information
class="bold" >Description:
class="bold" >See Also:
 You must save this entry before you can edit this field.
class="bold" >URL:
 
  This entry was last modified on by
--- NEW FILE display-orgunit.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Organizational Unit - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Organizational Unit Entry
Org Unit New Organizational Unit -
        
 * Indicates a required field
 
class="bold" >Unit Name: * class="bold" >Description:
class="bold" >Phone: class="bold" >Business Category:
class="bold" >Fax: class="bold" >Location:
class="bold" >Mailing Address:
class="bold" >See Also:
 
  This entry was last modified on by
--- NEW FILE display-person.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Person Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Person Entry
Person (click to show card) >Click to display organization chart New Person -
           
  * Indicates a required field

Contact Information
class="bold" >Last Name: class="bold" >Common Name: *
class="bold" >E-Mail Address:
Password: Repeat password to confirm:
class="bold" >Phone: class="bold" >AIM ID:
class="bold" >Fax: class="bold" >User ID:
class="bold" >Pager: class="bold" >Mobile Phone:
Business and Location Information
class="bold" >Title:
class="bold" >Mailing Address:
class="bold" >Unique ID: -->
Additional Information
class="bold" >Description:
class="bold" >See Also:
 You must save this entry before you can edit this field.
class="bold" >URL:
 
  This entry was last modified on by
--- NEW FILE list-Anything.html.in --- Search for Anything

 
Name Phone E-mail Description
 
Click on an entry's Name to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-Auth.html.in --- Authenticate as...
>

Please click on the name of the entry you would like to use for authentication.

Authenticate As Title

Please go back and try again.
--- NEW FILE list-Domaincomponent.html.in --- Search for Domaincomponents

 
Domaincomponent Description Phone
 
Click on an domaincomponent's name to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-Groups.html.in --- Search for Groups

 
Group Name Description
 
 
Click on a Group's Name to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-NT-Groups.html.in --- Search for NT Groups

 
LDAP Group Name NT Group Name Description
 
Click on an entry's Name to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-NT-People.html.in --- Search for NT-People"

 
Name NT Domain NT Username AIM ID Phone
 
Click on an entry's ID to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-Org-Units.html.in --- Search for Organizational Units

 
Organizational Unit Description Phone
 
Click on an entry's ID to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-Organizations.html.in --- Search for Organizations

 
Organization Description Phone
 
Click on an organization's name to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-People.html.in --- Search for People

 
Name ID Phone E-mail AIM ID Group
 
Click on an entry's ID to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE list-fa-Groups.html.in --- Search for People
--- NEW FILE list-fa-People.html.in --- Search for People
--- NEW FILE list-urlsearch.html.in --- URL-based Search

 
Name Phone E-mail
 
Click on an entry's Name to bring up more information about that entry.

 

No match found.

No entries match the requested search term. Please try a different search.

--- NEW FILE newentry.html.in --- Netscape Directory Server Gateway: New Entry <BODY> You must use a client that supports frames to view this document. </BODY> --- NEW FILE newentryName.html.in ---

Step 2. Provide a name for the new .
:

Step 3. Select a directory location for this , or select Other and enter the complete distinguished name where this entry should be added.


Step 4. Click Continue. You will be presented with an editable view of the entry. When you are done filling in information, save the entry.

--- NEW FILE newentryType.html.in ---
Create New Entry
Step 1. Select the type of entry to create.
--- NEW FILE search.html.in --- Netscape Directory Server Gateway: Standard Search --- NEW FILE searchString.html.in ---
Find within
Search for
--- authPassword.html DELETED --- --- authSearch.html DELETED --- --- csearch.html DELETED --- --- csearchAttr.html DELETED --- --- csearchBase.html DELETED --- --- csearchMatch.html DELETED --- --- csearchString.html DELETED --- --- csearchType.html DELETED --- --- display-country.html DELETED --- --- display-dc.html DELETED --- --- display-dnedit.html DELETED --- --- display-dneditpeople.html DELETED --- --- display-group.html DELETED --- --- display-groupun.html DELETED --- --- display-ntgroup.html DELETED --- --- display-ntperson.html DELETED --- --- display-org.html DELETED --- --- display-orgperson.html DELETED --- --- display-orgunit.html DELETED --- --- display-person.html DELETED --- --- list-Anything.html DELETED --- --- list-Auth.html DELETED --- --- list-Domaincomponent.html DELETED --- --- list-Groups.html DELETED --- --- list-NT-Groups.html DELETED --- --- list-NT-People.html DELETED --- --- list-Org-Units.html DELETED --- --- list-Organizations.html DELETED --- --- list-People.html DELETED --- --- list-fa-Groups.html DELETED --- --- list-fa-People.html DELETED --- --- list-urlsearch.html DELETED --- --- newentry.html DELETED --- --- newentryName.html DELETED --- --- newentryType.html DELETED --- --- search.html DELETED --- --- searchString.html DELETED --- From fedora-directory-commits at redhat.com Mon Jan 14 22:31:20 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 14 Jan 2008 17:31:20 -0500 Subject: [Fedora-directory-commits] dsgw/config/es csearch.html.in, NONE, 1.1 display-country.html.in, NONE, 1.1 display-group.html.in, NONE, 1.1 display-groupun.html.in, NONE, 1.1 display-ntgroup.html.in, NONE, 1.1 display-ntperson.html.in, NONE, 1.1 display-org.html.in, NONE, 1.1 display-orgperson.html.in, NONE, 1.1 display-orgunit.html.in, NONE, 1.1 display-person.html.in, NONE, 1.1 newentry.html.in, NONE, 1.1 search.html.in, NONE, 1.1 csearch.html, 1.1.1.1, NONE display-country.html, 1.1.1.1, NONE display-group.html, 1.1.1.1, NONE display-groupun.html, 1.1.1.1, NONE display-ntgroup.html, 1.1.1.1, NONE display-ntperson.html, 1.1.1.1, NONE display-org.html, 1.1.1.1, NONE display-orgperson.html, 1.1.1.1, NONE display-orgunit.html, 1.1.1.1, NONE display-person.html, 1.1.1.1, NONE newentry.html, 1.1.1.1, NONE search.html, 1.1.1.1, NONE Message-ID: <200801142231.m0EMVKo8008174@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/config/es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982/config/es Added Files: csearch.html.in display-country.html.in display-group.html.in display-groupun.html.in display-ntgroup.html.in display-ntperson.html.in display-org.html.in display-orgperson.html.in display-orgunit.html.in display-person.html.in newentry.html.in search.html.in Removed Files: csearch.html display-country.html display-group.html display-groupun.html display-ntgroup.html display-ntperson.html display-org.html display-orgperson.html display-orgunit.html display-person.html newentry.html search.html Log Message: General templating work for DSGW CGI URI's. --- NEW FILE csearch.html.in --- Netscape Directory Server Gateway : Advanced Search --- NEW FILE display-country.html.in --- País: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
País
Nombre del país: Descripción
Ver también:
Página web:
Esta entrada fue modificada por última vez el por --- NEW FILE display-group.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Entrada de grupo: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Grupo Nuevo grupo:
        
El asterisco (*) indica los campos obligatorios
Nombre: *
Descripción:
Propietario:
Ver también:
 Tiene que guardar esta entrada para poder modificar este campo.
Miembros del grupo:
Esta entrada fue modificada por última vez el por --- NEW FILE display-groupun.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Entrada de grupo: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Grupo Nuevo grupo:
        
El asterisco (*) indica los campos obligatorios
Nombre: *
Description:
Propietario:
Ver también:
 Tiene que guardar esta entrada para poder modificar este campo.
Miembros del grupo:
Esta entrada fue modificada por última vez el por --- NEW FILE display-ntgroup.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Entrada de grupo NT: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Grupo Nuevo grupo NT:
        
El asterisco (*) indica los campos obligatorios
Nombre: *
Nombre de grupo NT: *
Tipo del grupo NT: *
Dominio del grupo NT: *
Descripción:
Escenario:
Departamento:
Propietario:
Ver también
 Tiene que guardar esta entrada para poder modificar el campo.
Miembros del grupo NT
Borrar grupo NT si el grupo borrado es:
Crear nuevo grupo NT:
Esta entrada fue modificada por última vez el por --- NEW FILE display-ntperson.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Entrada personal NT: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> Persona (haga clic para ver la tarjeta) > Click to display organization chart Nueva persona NT:
>Recibir certificado    >Play Audio Clip
           
El asterisco (*) indica los campos obligatorios
Información de contacto
Nombre: Nombre y apellidos: *
Apellidos: *
Contraseña del directorio: Repítala para confirmar:
Teléfono: Dirección electrónica:
Fax: Identificación de usuario:
Localizador: Teléfono móvil:
 
Información sobre cuenta Windows NT
Identificación de usuario NT: * Nombre de dominio NT: *
Borrar cuenta NT si la persona borrada es:
Crear nueva cuenta NT:
Comentario del usuario NT: Identificador exclusivo usuario NT:
Caducidad contraseña NT: Nº de contraseñas erróneas NT:
Última fecha de entrada NT: Última fecha de salida NT
Fecha de caducidad cuenta NT: Nº de accesos NT:
Servidor de acceso NT: Estaciones NT:
Pág. de códigos NT: Cógido de país NT:
Identif. grupo principal NT: Perfil NT:
Directorio principal NT: Unidad directorio ppal. NT:
Vía de acceso a guión NT: Almacenamiento máx. NT:
Unidades NT por semana Privilegios de usuario NT:
Privilegios de operador usuario NT: Funciones varias cta. usuario NT:
 
Información sobre actividad profesional y ubicación
Categoría comercial: Cargo:
Departamento: Responsable:
 Tiene que guardar esta entrada para poder modificar este campo.
Nº de despacho Admin.:
Nº de dpto.: Nº empleado:
C. identidad/pasaporte:      
Dirección postal:
-->
Información adicional
Descripción:
Ver también:
 Tiene que guardar esta entrada para poder modificar este campo.
Página web:
Esta entrada fue modificada por última vez el por --- NEW FILE display-org.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Empresa: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Empresa Nueva empresa:
        
El asterisco (*) indica los campos obligatorios
Nombre de la empresa: * Descripción:
Teléfono: Categoría comercial:
Fax: Dirección:
Dirección postal:
Ver también:
Esta entrada fue modificada por última vez el por --- NEW FILE display-orgperson.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Entrada personal: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> Persona (haga clic para ver la tarjeta) > Click to display organization chart Nueva persona:
>Recibir certificado    >Reproducir fragmento de sonido
           
El asterisco (*) indica los campos obligatorios
Información de contacto
Nombre: Nombre y apellidos: *
Apellidos: *
Contraseña: Repetir la contraseña para confirmarla:
Teléfono: Dirección electrónica:
Fax: Identificador de usuario:
Buscapersonas: Teléfono móvil:
Información sobre actividad comercial y ubicación
Categoría comercial: Cargo:
Departamento: Responsable:
 Tiene que guardar esta entrada para poder modificar este campo.
Nº de despacho: Admin.:
Nº de dpto.: Nº empleado:
C. identidad/pasaporte:      
Dirección postal:
-->
Información adicional
Descripción:
Ver también:
 Tiene que guardar esta entrada para poder modificar este campo.
Página web:
Esta entrada fue modificada por última vez el por --- NEW FILE display-orgunit.html.in --- <!-- IF "Adding" --> Nuevo <!-- ENDIF // Adding --> Departamento: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Departamento Nuevo Departamento:
        
El asterisco (*) indica los campos obligatorios.
Nombre del dpto.: * Descripción:
Teléfono: Categoría comercial:
Fax: Dirección:
Dirección postal:
Ver también:
Esta entrada fue modificada por última vez el por --- NEW FILE display-person.html.in --- <!-- IF "Adding" --> Nueva <!-- ENDIF // Adding --> Entrada personal: <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Persona (haga clic para ver la tarjeta) > Click to display organization chart Nueva persona:
           
El asterisco (*) indica los campos obligatorios
Apellidos: * Nombre y apellidos:
Contraseña: Repita la contraseña para confirmarla:
Teléfono: Dirección electrónica:
Fax: User ID:
Buscapersonas: Teléfono móvil:
Cargo:
Dirección postal:
Descripción:
Ver también:
 Tiene que guardar esta entrada para poder modificar el campo.
Página web:
Bebida favorita:
Esta entrada fue modificada por última vez el por --- NEW FILE newentry.html.in --- Pasarela de Netscape Directory Server: Nueva entrada <BODY> Tiene que emplear un programa de acceso que admita marcos para poder ver este documento. </BODY> --- NEW FILE search.html.in --- Pasarela de Netscape Directory Server: Standard Search --- csearch.html DELETED --- --- display-country.html DELETED --- --- display-group.html DELETED --- --- display-groupun.html DELETED --- --- display-ntgroup.html DELETED --- --- display-ntperson.html DELETED --- --- display-org.html DELETED --- --- display-orgperson.html DELETED --- --- display-orgunit.html DELETED --- --- display-person.html DELETED --- --- newentry.html DELETED --- --- search.html DELETED --- From fedora-directory-commits at redhat.com Mon Jan 14 22:31:22 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 14 Jan 2008 17:31:22 -0500 Subject: [Fedora-directory-commits] dsgw/config/ja csearch.html.in, NONE, 1.1 display-country.html.in, NONE, 1.1 display-group.html.in, NONE, 1.1 display-groupun.html.in, NONE, 1.1 display-mailgroup.html.in, NONE, 1.1 display-ntgroup.html.in, NONE, 1.1 display-ntperson.html.in, NONE, 1.1 display-org.html.in, NONE, 1.1 display-orgperson.html.in, NONE, 1.1 display-orgunit.html.in, NONE, 1.1 display-person.html.in, NONE, 1.1 display-umperson.html.in, NONE, 1.1 newentry.html.in, NONE, 1.1 search.html.in, NONE, 1.1 csearch.html, 1.1.1.1, NONE display-country.html, 1.1.1.1, NONE display-group.html, 1.1.1.1, NONE display-groupun.html, 1.1.1.1, NONE display-mailgroup.html, 1.1.1.1, NONE display-ntgroup.html, 1.1.1.1, NONE display-ntperson.html, 1.1.1.1, NONE display-org.html, 1.1.1.1, NONE display-orgperson.html, 1.1.1.1, NONE display-orgunit.html, 1.1.1.1, NONE display-person.html, 1.1.1.1, NONE display-umperson.html, 1.1.1.1, NONE newentry.html, 1.1.1.1, NONE search.html, 1.1.1.1, NONE Message-ID: <200801142231.m0EMVMj4008246@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/config/ja In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982/config/ja Added Files: csearch.html.in display-country.html.in display-group.html.in display-groupun.html.in display-mailgroup.html.in display-ntgroup.html.in display-ntperson.html.in display-org.html.in display-orgperson.html.in display-orgunit.html.in display-person.html.in display-umperson.html.in newentry.html.in search.html.in Removed Files: csearch.html display-country.html display-group.html display-groupun.html display-mailgroup.html display-ntgroup.html display-ntperson.html display-org.html display-orgperson.html display-orgunit.html display-person.html display-umperson.html newentry.html search.html Log Message: General templating work for DSGW CGI URI's. --- NEW FILE csearch.html.in --- Netscape Directory Server Gateway: Advanced Search --- NEW FILE display-country.html.in --- ??? - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
Country
??????: ??????:
??????:
URL:
????????????????????????????????????: ?????????: --- NEW FILE display-group.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Group Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
???????????? ?????????????????? -
        
* ???????????????????????????????????????????????????
??????: *
??????:
?????????:
??????:
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????
???????????? ????????????:
????????????????????????????????????: ?????????: --- NEW FILE display-groupun.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Group Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
???????????? ?????????????????? -
        
* ???????????????????????????????????????????????????
??????: *
??????:
?????????:
??????:
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????
???????????? ????????????:
????????????????????????????????????: ?????????: --- NEW FILE display-mailgroup.html.in --- <!-- IF "Adding" --> ?????? <!-- ENDIF // Adding --> ????????? ??????????????????????????? - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
???????????? ??????????????? ????????????
        
??????: ??????:
?????????:
??????:
???????????? ????????????:
???????????????????????????:
????????????????????????????????????: ?????????: --- NEW FILE display-ntgroup.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> NT Group Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
???????????? ??????NT???????????? -
        
* ???????????????????????????????????????????????????
??????: *
NT???????????????: *
NT???????????? ?????????: *
NT???????????? ????????????: *
??????:
????????????:
????????????:
?????????:
??????:
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????
NT???????????? ????????????:
????????????????????????????????????NT?????????????????????:
??????NT????????????????????? :
????????????????????????????????????: ?????????: --- NEW FILE display-ntperson.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> NT Person Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> ?????????(???????????????????????????????????????????????????) > Click to display organization chart ??????NT????????? -
>Download Certificate    >Play Audio Clip
           
* ???????????????????????????????????????????????????
?????????
???: * ??????: *
???:
Directory Password: Repeat password to confirm:
??????: ???????????????????????????:
???????????????: ????????? ID:
??????????????????: ????????????:
WindowsNT?????????????????????
NT????????? ID: * NT???????????????: *
????????????????????????????????? NT????????????????????????:
??????NT???????????????????????? :
NT?????????????????????????????????: NT?????????????????? ID:
NT?????????????????????: NT???????????????????????????:
NT????????????????????????: NT ????????????????????????:
NT????????????????????????: NT?????????????????????:
NT?????????????????????: NT???????????????????????????:
NT??????????????????: NT????????????:
NT?????????????????? ID: NT??????????????????:
NT???????????????????????????: NT ????????? ??????????????????????????????:
NT?????????????????????: NT??????????????????:
NT????????????/???: NT??????????????????:
NT?????????????????????????????????: NT ????????? ????????????????????????????????????:
???????????????????????????????????????
??????????????????: ??????:
????????????: ???????????????:
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????: ?????????:
????????????: ????????????:
??????????????????????????????????????????:      
??????:
-->
????????????
??????:
??????:
 ???????????????????????????????????????????????????????????????????????????????????????????????????
URL:
????????????????????????????????????: ?????????: --- NEW FILE display-org.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Organization - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
?????? ???????????? -
        
* ???????????????????????????????????????????????????
?????????: * ??????:
??????: ??????????????????:
???????????????: ??????:
??????:
??????:
????????????????????????????????????: ?????????: --- NEW FILE display-orgperson.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Person Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
BORDER=0> ????????? (???????????????????????????????????????????????????) > Click to display organization chart ??????????????? -
>??????????????????????????????    >????????????????????????????????????
           
* ???????????????????????????????????????????????????
?????????
???: * ??????: *
???:
???????????????: ?????????????????????????????????????????????:
??????: ???????????????????????????:
???????????????: ????????? ID:
??????????????????: ????????????:
???????????????????????????????????????
??????????????????: ??????:
????????????: ???????????????:
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????: ?????????:
????????????: ????????????:
??????????????????????????????????????????:      
??????:
-->
????????????
??????:
??????:
 ???????????????????????????????????????????????????????????????????????????????????????????????????
URL:
????????????????????????????????????: ?????????: --- NEW FILE display-orgunit.html.in --- <!-- IF "Adding" --> ?????? <!-- ENDIF // Adding --> ???????????? - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
???????????? ?????????????????? -
        
* ???????????????????????????????????????????????????
?????????: * ??????:
??????: ??????????????????:
???????????????: ??????:
??????:
??????:
????????????????????????????????????: ?????????: --- NEW FILE display-person.html.in --- <!-- IF "Adding" --> New <!-- ENDIF // Adding --> Person Entry - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
?????????(???????????????????????????????????????????????????) > Click to display organization chart ??????????????? -
           
* ???????????????????????????????????????????????????
??????: * ??????:
???????????????: ?????????????????????????????????????????????:
??????: ???????????????????????????:
???????????????: ????????? ID:
??????????????????: ????????????:
??????:
??????:
??????:
??????:
 ???????????????????????????????????????????????????????????????????????????????????????????????????
URL:
???????????????:
????????????????????????????????????: ?????????: --- NEW FILE display-umperson.html.in --- <!-- IF "Adding" --> ?????? <!-- ENDIF // Adding --> ?????????????????????????????????????????? - <!-- DS_ATTRIBUTE "attr=dn" "syntax=dn" "options=nolink" -->
> ????????? > Click to display organization chart ????????????????????????????????? -
>????????????????????????????????????
        
* ???????????????????????????????????????????????????
??????: * ??????: *
??????: ???????????????????????????:
???????????????: ???????????????:
??????????????????: ????????????:
??????:
??????:
??????:
??????:
URL:
???????????????:
????????????????????????????????????: ?????????: --- NEW FILE newentry.html.in --- Netscape Directory Server Gateway: New Entry <BODY> ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????? </BODY> --- NEW FILE search.html.in --- Netscape Directory Server Gateway: Standard Search --- csearch.html DELETED --- --- display-country.html DELETED --- --- display-group.html DELETED --- --- display-groupun.html DELETED --- --- display-mailgroup.html DELETED --- --- display-ntgroup.html DELETED --- --- display-ntperson.html DELETED --- --- display-org.html DELETED --- --- display-orgperson.html DELETED --- --- display-orgunit.html DELETED --- --- display-person.html DELETED --- --- display-umperson.html DELETED --- --- newentry.html DELETED --- --- search.html DELETED --- From fedora-directory-commits at redhat.com Mon Jan 14 22:31:22 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 14 Jan 2008 17:31:22 -0500 Subject: [Fedora-directory-commits] dsgw/html alert.html.in, NONE, 1.1 auth.html.in, NONE, 1.1 authroot.html.in, NONE, 1.1 authtitle.html.in, NONE, 1.1 confirm.html.in, NONE, 1.1 csearchtitle.html.in, NONE, 1.1 greeting.html.in, NONE, 1.1 index.html.in, NONE, 1.1 maintitle.html.in, NONE, 1.1 newentrytitle.html.in, NONE, 1.1 searchtitle.html.in, NONE, 1.1 alert.html, 1.1.1.1, NONE auth.html, 1.1.1.1, NONE authroot.html, 1.1.1.1, NONE authtitle.html, 1.1.1.1, NONE confirm.html, 1.1.1.1, NONE csearchtitle.html, 1.1.1.1, NONE greeting.html, 1.1.1.1, NONE index.html, 1.1.1.1, NONE maintitle.html, 1.1.1.1, NONE newentrytitle.html, 1.1.1.1, NONE searchtitle.html, 1.1.1.1, NONE Message-ID: <200801142231.m0EMVNN1008289@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsgw/html In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7982/html Added Files: alert.html.in auth.html.in authroot.html.in authtitle.html.in confirm.html.in csearchtitle.html.in greeting.html.in index.html.in maintitle.html.in newentrytitle.html.in searchtitle.html.in Removed Files: alert.html auth.html authroot.html authtitle.html confirm.html csearchtitle.html greeting.html index.html maintitle.html newentrytitle.html searchtitle.html Log Message: General templating work for DSGW CGI URI's. --- NEW FILE alert.html.in --- <!-- DS_POSTEDVALUE "NAME=TITLE" -->
Alert
--- NEW FILE auth.html.in --- Directory Server Gateway: Authenticate <H3>Frames-capable browser required</H3> Sorry, but in order to use the Directory Server Gateway, you must use a browser which supports HTML forms and JavaScript, such as Mozilla Firefox. To learn how to obtain Firefox, visit the <A HREF="http://www.mozilla.org">Mozilla Home Page</A>. --- NEW FILE authroot.html.in --- Directory Server Gateway: Authenticate <H3>Frames-capable browser required</H3> Sorry, but in order to use the Directory Server Gateway, you must use a browser which supports HTML forms and JavaScript, such as Mozilla Firefox. To learn how to obtain Firefox, visit the <A HREF="http://www.mozilla.org">Mozilla Home Page</A>. --- NEW FILE authtitle.html.in --- Directory Server
Directory Server Gateway
Standard Search
Advanced Search
New Entry
Authentication
--- NEW FILE confirm.html.in ---
Confirm
--- NEW FILE csearchtitle.html.in --- Directory Server
Directory Server Gateway
Standard Search
Advanced Search
New Entry
Authentication
--- NEW FILE gree