[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm back-ldbm.h, 1.13, 1.14 index.c, 1.14, 1.15 ldbm_attr.c, 1.9, 1.10 ldbm_index_config.c, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2672/ldap/servers/slapd/back-ldbm
Modified Files:
back-ldbm.h index.c ldbm_attr.c ldbm_index_config.c
Log Message:
Resolves: #447353
Summary: RFE: search optimization and single character substring searches
Description: extended the substring key to have 3 types:
* begin (e.g., *^a)
* middle (e.g., *abc)
* end (e.g., *xy$)
* Usage: turn an index object to extensibleobject and set an integer value as
follows:
* dn: cn=sn, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
* objectClass: extensibleObject
* nsSubStrBegin: 2
* nsSubStrMiddle: 3
* nsSubStrEnd: 2
* [...]
Index: back-ldbm.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- back-ldbm.h 3 Apr 2008 16:52:47 -0000 1.13
+++ back-ldbm.h 15 Jul 2008 16:49:43 -0000 1.14
@@ -346,6 +346,34 @@
typedef struct idl_private idl_private;
typedef struct attrcrypt_private attrcrypt_private;
+/*
+ * Special attribute for an index entry
+ * Usage: turn an index object to extensibleobject and
+ * set an integer value for each
+ * dn: cn=sn, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
+ * objectClass: extensibleObject
+ * nsSubStrBegin: 2
+ * nsSubStrMiddle: 3
+ * nsSubStrEnd: 2
+ * [...]
+ *
+ * By default, the minimum key length triplets of substring index is 2, 3, 2.
+ * The length is changed by setting this nsSubStrLen value.
+ *
+ * Note: If any of the key length value is modified, the index file needs
+ * to be regenerated. Otherwise, the index file is going to have mixed
+ * key length.
+ * To change the key length,
+ * 1) stop the server, 2) run db2index -t <attr>, 3) start the server.
+ */
+#define INDEX_ATTR_SUBSTRBEGIN "nsSubStrBegin"
+#define INDEX_ATTR_SUBSTRMIDDLE "nsSubStrMiddle"
+#define INDEX_ATTR_SUBSTREND "nsSubStrEnd"
+
+#define INDEX_SUBSTRBEGIN 0
+#define INDEX_SUBSTRMIDDLE 1
+#define INDEX_SUBSTREND 2
+
/* for the cache of attribute information (which are indexed, etc.) */
struct attrinfo {
@@ -382,6 +410,10 @@
specify an ORDERING matching rule, or the index
configuration must define an ORDERING matching rule.
*/
+ int *ai_substr_lens; /* if the attribute nsSubStrXxx is specivied in
+ * an index instance (dse.ldif), the substr key
+ * len value(s) are stored here. If not specified,
+ * the default length triplet is 2, 3, 2.
};
#define MAXDBCACHE 20
Index: index.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/index.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- index.c 20 Jun 2008 15:10:00 -0000 1.14
+++ index.c 15 Jul 2008 16:49:43 -0000 1.15
@@ -1830,8 +1830,13 @@
Slapi_Value **esubvals = NULL;
Slapi_Value **substresult = NULL;
Slapi_Value **origvals = NULL;
- slapi_call_syntax_values2keys_sv( ai->ai_plugin, vals, &ivals,
- LDAP_FILTER_SUBSTRINGS );
+ Slapi_PBlock pipb;
+
+ /* prepare pblock to pass ai_substr_lens */
+ pblock_init( &pipb );
+ slapi_pblock_set( &pipb, SLAPI_SYNTAX_SUBSTRLENS, ai->ai_substr_lens );
+ slapi_call_syntax_values2keys_sv_pb( ai->ai_plugin, vals, &ivals,
+ LDAP_FILTER_SUBSTRINGS, &pipb );
origvals = ivals;
/* delete only: if the attribute has multiple values,
@@ -1840,8 +1845,8 @@
* then get rid of them from the being deleted values
*/
if ( evals != NULL ) {
- slapi_call_syntax_values2keys_sv( ai->ai_plugin, evals, &esubvals,
- LDAP_FILTER_SUBSTRINGS );
+ slapi_call_syntax_values2keys_sv_pb( ai->ai_plugin, evals,
+ &esubvals, LDAP_FILTER_SUBSTRINGS, &pipb );
substresult = valuearray_minus_valuearray( ai->ai_plugin, ivals, esubvals );
ivals = substresult;
valuearray_free( &esubvals );
Index: ldbm_attr.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attr.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ldbm_attr.c 18 Oct 2007 00:08:34 -0000 1.9
+++ ldbm_attr.c 15 Jul 2008 16:49:43 -0000 1.10
@@ -50,14 +50,6 @@
attrinfo_new()
{
struct attrinfo *p= (struct attrinfo *)slapi_ch_calloc(1, sizeof(struct attrinfo));
- p->ai_type= 0;
- p->ai_indexmask= 0;
- p->ai_plugin= NULL;
- p->ai_index_rules= NULL;
- p->ai_dblayer= NULL;
- p->ai_dblayer_count = 0;
- p->ai_idl= NULL;
- p->ai_key_cmp_fn = NULL;
return p;
}
@@ -156,6 +148,25 @@
}
void
+_set_attr_substrlen(int index, char *str, int **substrlens)
+{
+ char *p = NULL;
+ /* nsSubStrXxx=<VAL> is passed;
+ set it to the attribute's plugin */
+ p = strchr(str, '=');
+ if (NULL != p) {
+ long sublen = strtol(++p, (char **)NULL, 10);
+ if (sublen > 0) { /* 0 is not acceptable */
+ if (NULL == *substrlens) {
+ *substrlens = (int *)slapi_ch_calloc(1,
+ sizeof(int) * INDEX_SUBSTRLEN);
+ }
+ (*substrlens)[index] = sublen;
+ }
+ }
+}
+
+void
attr_index_config(
backend *be,
char *fname,
@@ -172,6 +183,8 @@
char **index_rules = NULL;
struct attrinfo *a;
int return_value = -1;
+ char *p;
+ int *substrlens = NULL;
attrs = str2charray( argv[0], "," );
if ( argc > 1 ) {
@@ -189,34 +202,29 @@
attrsyntax_oid = slapi_ch_strdup(plugin_syntax2oid(a->ai_plugin));
if ( argc == 1 ) {
a->ai_indexmask = (INDEX_PRESENCE | INDEX_EQUALITY |
- INDEX_APPROX | INDEX_SUB);
+ INDEX_APPROX | INDEX_SUB);
} else {
a->ai_indexmask = 0;
for ( j = 0; indexes[j] != NULL; j++ ) {
- if ( strncasecmp( indexes[j], "pres", 4 )
- == 0 ) {
+ if ( strncasecmp( indexes[j], "pres", 4 ) == 0 ) {
a->ai_indexmask |= INDEX_PRESENCE;
- } else if ( strncasecmp( indexes[j], "eq", 2 )
- == 0 ) {
+ } else if ( strncasecmp( indexes[j], "eq", 2 ) == 0 ) {
a->ai_indexmask |= INDEX_EQUALITY;
- } else if ( strncasecmp( indexes[j], "approx",
- 6 ) == 0 ) {
+ } else if ( strncasecmp( indexes[j], "approx", 6 ) == 0 ) {
a->ai_indexmask |= INDEX_APPROX;
- } else if ( strncasecmp( indexes[j], "sub", 3 )
- == 0 ) {
+ } else if ( strncasecmp( indexes[j], "sub", 3 ) == 0 ) {
a->ai_indexmask |= INDEX_SUB;
- } else if ( strncasecmp( indexes[j], "none", 4 )
- == 0 ) {
+ } else if ( strncasecmp( indexes[j], "none", 4 ) == 0 ) {
if ( a->ai_indexmask != 0 ) {
LDAPDebug(LDAP_DEBUG_ANY,
"%s: line %d: index type \"none\" cannot be combined with other types\n",
- fname, lineno, 0);
+ fname, lineno, 0);
}
a->ai_indexmask = INDEX_OFFLINE; /* note that the index isn't available */
} else {
LDAPDebug(LDAP_DEBUG_ANY,
"%s: line %d: unknown index type \"%s\" (ignored)\n",
- fname, lineno, indexes[j]);
+ fname, lineno, indexes[j]);
LDAPDebug(LDAP_DEBUG_ANY,
"valid index types are \"pres\", \"eq\", \"approx\", or \"sub\"\n",
0, 0, 0);
@@ -227,53 +235,66 @@
j = 0;
if (index_rules != NULL) for (; index_rules[j] != NULL; ++j);
if (j > 0) { /* there are some candidates */
- char** official_rules = (char**)
- slapi_ch_malloc ((j + 1) * sizeof (char*));
- size_t k = 0;
- for (j = 0; index_rules[j] != NULL; ++j) {
- /* Check that index_rules[j] is an official OID */
- char* officialOID = NULL;
- IFP mrINDEX = NULL;
- Slapi_PBlock* pb = slapi_pblock_new();
- if (!slapi_pblock_set (pb, SLAPI_PLUGIN_MR_OID, index_rules[j]) &&
- !slapi_pblock_set (pb, SLAPI_PLUGIN_MR_TYPE, a->ai_type) &&
- !slapi_mr_indexer_create (pb) &&
- !slapi_pblock_get (pb, SLAPI_PLUGIN_MR_INDEX_FN, &mrINDEX) &&
- mrINDEX != NULL &&
- !slapi_pblock_get (pb, SLAPI_PLUGIN_MR_OID, &officialOID) &&
- officialOID != NULL) {
- if (!strcasecmp (index_rules[j], officialOID)) {
- official_rules[k++] = slapi_ch_strdup (officialOID);
- } else {
- char* preamble = slapi_ch_smprintf("%s: line %d", fname, lineno);
- LDAPDebug (LDAP_DEBUG_ANY, "%s: use \"%s\" instead of \"%s\" (ignored)\n",
- preamble, officialOID, index_rules[j] );
- slapi_ch_free((void**)&preamble);
- }
- } else if (!slapi_matchingrule_is_ordering(index_rules[j], attrsyntax_oid)) {
- LDAPDebug (LDAP_DEBUG_ANY, "%s: line %d: "
- "unknown or invalid matching rule \"%s\" in index configuration (ignored)\n",
- fname, lineno, index_rules[j] );
- } else { /* assume builtin and use compare fn provided by syntax plugin */
- need_compare_fn = 1;
+ char** official_rules =
+ (char**)slapi_ch_malloc ((j + 1) * sizeof (char*));
+ size_t k = 0;
+ for (j = 0; index_rules[j] != NULL; ++j) {
+ /* Check that index_rules[j] is an official OID */
+ char* officialOID = NULL;
+ IFP mrINDEX = NULL;
+ Slapi_PBlock* pb = slapi_pblock_new();
+ if (!slapi_pblock_set (pb, SLAPI_PLUGIN_MR_OID, index_rules[j]) &&
+ !slapi_pblock_set (pb, SLAPI_PLUGIN_MR_TYPE, a->ai_type) &&
+ !slapi_mr_indexer_create (pb) &&
+ !slapi_pblock_get (pb, SLAPI_PLUGIN_MR_INDEX_FN, &mrINDEX) &&
+ mrINDEX != NULL &&
+ !slapi_pblock_get (pb, SLAPI_PLUGIN_MR_OID, &officialOID) &&
+ officialOID != NULL) {
+ if (!strcasecmp (index_rules[j], officialOID)) {
+ official_rules[k++] = slapi_ch_strdup (officialOID);
+ } else {
+ char* preamble = slapi_ch_smprintf("%s: line %d", fname, lineno);
+ LDAPDebug (LDAP_DEBUG_ANY, "%s: use \"%s\" instead of \"%s\" (ignored)\n",
+ preamble, officialOID, index_rules[j] );
+ slapi_ch_free((void**)&preamble);
+ }
+ } else if (p =
+ strstr(index_rules[j], INDEX_ATTR_SUBSTRBEGIN)) {
+ _set_attr_substrlen(INDEX_SUBSTRBEGIN, index_rules[j],
+ &substrlens);
+ } else if (p =
+ strstr(index_rules[j], INDEX_ATTR_SUBSTRMIDDLE)) {
+ _set_attr_substrlen(INDEX_SUBSTRMIDDLE, index_rules[j],
+ &substrlens);
+ } else if (p =
+ strstr(index_rules[j], INDEX_ATTR_SUBSTREND)) {
+ _set_attr_substrlen(INDEX_SUBSTREND, index_rules[j],
+ &substrlens);
+ } else if (!slapi_matchingrule_is_ordering(index_rules[j], attrsyntax_oid)) {
+ LDAPDebug (LDAP_DEBUG_ANY, "%s: line %d: "
+ "unknown or invalid matching rule \"%s\" in index configuration (ignored)\n",
+ fname, lineno, index_rules[j] );
+ } else { /* assume builtin and use compare fn provided by syntax plugin */
+ need_compare_fn = 1;
+ }
+ {/* It would improve speed to save the indexer, for future use.
+ But, for simplicity, we destroy it now: */
+ IFP mrDESTROY = NULL;
+ if (!slapi_pblock_get (pb, SLAPI_PLUGIN_DESTROY_FN, &mrDESTROY) &&
+ mrDESTROY != NULL) {
+ mrDESTROY (pb);
+ }
+ }
+ slapi_pblock_destroy (pb);
}
- {/* It would improve speed to save the indexer, for future use.
- But, for simplicity, we destroy it now: */
- IFP mrDESTROY = NULL;
- if (!slapi_pblock_get (pb, SLAPI_PLUGIN_DESTROY_FN, &mrDESTROY) &&
- mrDESTROY != NULL) {
- mrDESTROY (pb);
- }
+ official_rules[k] = NULL;
+ a->ai_substr_lens = substrlens;
+ if (k > 0) {
+ a->ai_index_rules = official_rules;
+ a->ai_indexmask |= INDEX_RULES;
+ } else {
+ slapi_ch_free((void**)&official_rules);
}
- slapi_pblock_destroy (pb);
- }
- official_rules[k] = NULL;
- if (k > 0) {
- a->ai_index_rules = official_rules;
- a->ai_indexmask |= INDEX_RULES;
- } else {
- slapi_ch_free((void**)&official_rules);
- }
}
}
@@ -283,7 +304,7 @@
if (0 != return_value) {
/* fatal error, exit */
LDAPDebug(LDAP_DEBUG_ANY,"%s: line %d:Fatal Error: Failed to initialize attribute structure\n",
- fname, lineno, 0);
+ fname, lineno, 0);
exit( 1 );
}
@@ -300,24 +321,24 @@
if (need_compare_fn) {
int rc = plugin_call_syntax_get_compare_fn( a->ai_plugin, &a->ai_key_cmp_fn );
if (rc != LDAP_SUCCESS) {
- LDAPDebug(LDAP_DEBUG_ANY,
- "The attribute [%s] does not have a valid ORDERING matching rule\n",
- a->ai_type, 0, 0);
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "The attribute [%s] does not have a valid ORDERING matching rule\n",
+ a->ai_type, 0, 0);
a->ai_key_cmp_fn = NULL;
}
}
if ( avl_insert( &inst->inst_attrs, a, ainfo_cmp, ainfo_dup ) != 0 ) {
/* duplicate - existing version updated */
- attrinfo_delete(&a);
+ attrinfo_delete(&a);
}
}
charray_free( attrs );
if ( indexes != NULL ) {
- charray_free( indexes );
+ charray_free( indexes );
}
if ( index_rules != NULL ) {
- charray_free( index_rules );
+ charray_free( index_rules );
}
}
Index: ldbm_index_config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_index_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ldbm_index_config.c 10 Nov 2006 23:45:39 -0000 1.7
+++ ldbm_index_config.c 15 Jul 2008 16:49:43 -0000 1.8
@@ -122,7 +122,7 @@
/* used by the two callbacks below, to parse an index entry into something
* awkward that we can pass to attr_index_config().
*/
-#define MAX_TMPBUF 256
+#define MAX_TMPBUF 1024
#define ZCAT_SAFE(_buf, _x1, _x2) do { \
if (strlen(_buf) + strlen(_x1) + strlen(_x2) + 2 < MAX_TMPBUF) { \
strcat(_buf, _x1); \
@@ -170,18 +170,71 @@
arglist[argc++] = slapi_ch_strdup(tmpBuf);
}
+ tmpBuf[0] = 0;
/* Get the list of matching rules from the entry. */
if (0 == slapi_entry_attr_find(e, "nsMatchingRule", &attr)) {
for (i = slapi_attr_first_value(attr, &sval); i != -1;
i = slapi_attr_next_value(attr, i, &sval)) {
attrValue = slapi_value_get_berval(sval);
if (0 == i) {
- tmpBuf[0] = 0;
ZCAT_SAFE(tmpBuf, "", attrValue->bv_val);
} else {
ZCAT_SAFE(tmpBuf, ",", attrValue->bv_val);
}
}
+ }
+
+ /* Get the substr begin length. note: pick the first value. */
+ if (0 == slapi_entry_attr_find(e, INDEX_ATTR_SUBSTRBEGIN, &attr)) {
+ i = slapi_attr_first_value(attr, &sval);
+ if (-1 != i) {
+ attrValue = slapi_value_get_berval(sval);
+ if (0 == tmpBuf[0]) {
+ PR_snprintf(tmpBuf, MAX_TMPBUF, "%s=%s",
+ INDEX_ATTR_SUBSTRBEGIN, attrValue->bv_val);
+ } else {
+ int tmpbuflen = strlen(tmpBuf);
+ char *p = tmpBuf + tmpbuflen;
+ PR_snprintf(p, MAX_TMPBUF - tmpbuflen, ",%s=%s",
+ INDEX_ATTR_SUBSTRBEGIN, attrValue->bv_val);
+ }
+ }
+ }
+
+ /* Get the substr middle length. note: pick the first value. */
+ if (0 == slapi_entry_attr_find(e, INDEX_ATTR_SUBSTRMIDDLE, &attr)) {
+ i = slapi_attr_first_value(attr, &sval);
+ if (-1 != i) {
+ attrValue = slapi_value_get_berval(sval);
+ if (0 == tmpBuf[0]) {
+ PR_snprintf(tmpBuf, MAX_TMPBUF, "%s=%s",
+ INDEX_ATTR_SUBSTRMIDDLE, attrValue->bv_val);
+ } else {
+ int tmpbuflen = strlen(tmpBuf);
+ char *p = tmpBuf + tmpbuflen;
+ PR_snprintf(p, MAX_TMPBUF - tmpbuflen, ",%s=%s",
+ INDEX_ATTR_SUBSTRMIDDLE, attrValue->bv_val);
+ }
+ }
+ }
+
+ /* Get the substr end length. note: pick the first value. */
+ if (0 == slapi_entry_attr_find(e, INDEX_ATTR_SUBSTREND, &attr)) {
+ i = slapi_attr_first_value(attr, &sval);
+ if (-1 != i) {
+ attrValue = slapi_value_get_berval(sval);
+ if (0 == tmpBuf[0]) {
+ PR_snprintf(tmpBuf, MAX_TMPBUF, "%s=%s",
+ INDEX_ATTR_SUBSTREND, attrValue->bv_val);
+ } else {
+ int tmpbuflen = strlen(tmpBuf);
+ char *p = tmpBuf + tmpbuflen;
+ PR_snprintf(p, MAX_TMPBUF - tmpbuflen, ",%s=%s",
+ INDEX_ATTR_SUBSTREND, attrValue->bv_val);
+ }
+ }
+ }
+ if (0 != tmpBuf[0]) {
arglist[argc++] = slapi_ch_strdup(tmpBuf);
}
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd pblock.c, 1.14, 1.15 plugin_syntax.c, 1.6, 1.7 schema.c, 1.15, 1.16 slap.h, 1.34, 1.35 slapi-plugin.h, 1.25, 1.26
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2672/ldap/servers/slapd
Modified Files:
pblock.c plugin_syntax.c schema.c slap.h slapi-plugin.h
Log Message:
Resolves: #447353
Summary: RFE: search optimization and single character substring searches
Description: extended the substring key to have 3 types:
* begin (e.g., *^a)
* middle (e.g., *abc)
* end (e.g., *xy$)
* Usage: turn an index object to extensibleobject and set an integer value as
follows:
* dn: cn=sn, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
* objectClass: extensibleObject
* nsSubStrBegin: 2
* nsSubStrMiddle: 3
* nsSubStrEnd: 2
* [...]
Index: pblock.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pblock.c 27 Jun 2008 19:28:21 -0000 1.14
+++ pblock.c 15 Jul 2008 16:49:42 -0000 1.15
@@ -1059,6 +1059,9 @@
}
(*(IFP *)value) = pblock->pb_plugin->plg_syntax_compare;
break;
+ case SLAPI_SYNTAX_SUBSTRLENS:
+ (*(int **)value) = pblock->pb_substrlens;
+ break;
/* controls we know about */
case SLAPI_MANAGEDSAIT:
@@ -2298,12 +2301,15 @@
}
pblock->pb_plugin->plg_syntax_compare = (IFP) value;
break;
- case SLAPI_ENTRY_PRE_OP:
- pblock->pb_pre_op_entry = (Slapi_Entry *) value;
- break;
- case SLAPI_ENTRY_POST_OP:
- pblock->pb_post_op_entry = (Slapi_Entry *) value;
- break;
+ case SLAPI_SYNTAX_SUBSTRLENS:
+ pblock->pb_substrlens = (int *) value;
+ break;
+ case SLAPI_ENTRY_PRE_OP:
+ pblock->pb_pre_op_entry = (Slapi_Entry *) value;
+ break;
+ case SLAPI_ENTRY_POST_OP:
+ pblock->pb_post_op_entry = (Slapi_Entry *) value;
+ break;
/* target address for all operations */
case SLAPI_TARGET_ADDRESS:
Index: plugin_syntax.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_syntax.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin_syntax.c 30 Jun 2008 17:28:16 -0000 1.6
+++ plugin_syntax.c 15 Jul 2008 16:49:42 -0000 1.7
@@ -309,6 +309,38 @@
return( rc );
}
+/*
+ * almost identical to slapi_call_syntax_values2keys_sv except accepting
+ * pblock to pass some info such as substrlen.
+ */
+int
+slapi_call_syntax_values2keys_sv_pb(
+ void *vpi,
+ Slapi_Value **vals,
+ Slapi_Value ***ivals,
+ int ftype,
+ Slapi_PBlock *pb
+)
+{
+ int rc;
+ struct slapdplugin *pi = vpi;
+
+ LDAPDebug( LDAP_DEBUG_FILTER, "=> slapi_call_syntax_values2keys\n",
+ 0, 0, 0 );
+
+ slapi_pblock_set( pb, SLAPI_PLUGIN, vpi );
+
+ *ivals = NULL;
+ rc = -1; /* means no values2keys function */
+ if ( pi != NULL && pi->plg_syntax_values2keys != NULL ) {
+ rc = pi->plg_syntax_values2keys( pb, vals, ivals, ftype );
+ }
+
+ LDAPDebug( LDAP_DEBUG_FILTER,
+ "<= slapi_call_syntax_values2keys %d\n", rc, 0, 0 );
+ return( rc );
+}
+
SLAPI_DEPRECATED int
slapi_call_syntax_assertion2keys_ava( /* JCM SLOW FUNCTION */
void *vpi,
Index: schema.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schema.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- schema.c 27 Jun 2008 19:28:21 -0000 1.15
+++ schema.c 15 Jul 2008 16:49:42 -0000 1.16
@@ -456,7 +456,7 @@
int i, oc_count = 0;
int unknown_class = 0;
char errtext[ BUFSIZ ];
- PRUint32 schema_flags;
+ PRUint32 schema_flags = 0;
/* smart referrals are not allowed in Directory Lite */
if ( config_is_slapd_lite() ) {
Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- slap.h 6 Jun 2008 17:53:35 -0000 1.34
+++ slap.h 15 Jul 2008 16:49:42 -0000 1.35
@@ -1444,8 +1444,18 @@
/* For password policy control */
int pb_pwpolicy_ctrl;
void *pb_vattr_context; /* hold the vattr_context for roles/cos */
+
+ int *pb_substrlens; /* user specified minimum substr search key lengths:
+ * nsSubStrBegin, nsSubStrMiddle, nsSubStrEnd
+ */
} slapi_pblock;
+/* index if substrlens */
+#define INDEX_SUBSTRBEGIN 0
+#define INDEX_SUBSTRMIDDLE 1
+#define INDEX_SUBSTREND 2
+#define INDEX_SUBSTRLEN 3 /* size of the substrlens */
+
/* The referral element */
typedef struct ref {
char *ref_dn; /* The DN of the entry that contains the referral */
Index: slapi-plugin.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- slapi-plugin.h 8 Jul 2008 19:59:39 -0000 1.25
+++ slapi-plugin.h 15 Jul 2008 16:49:42 -0000 1.26
@@ -891,6 +891,8 @@
*/
int slapi_call_syntax_values2keys_sv( void *vpi, Slapi_Value **vals,
Slapi_Value ***ivals, int ftype );
+int slapi_call_syntax_values2keys_sv_pb( void *vpi, Slapi_Value **vals,
+ Slapi_Value ***ivals, int ftype, Slapi_PBlock *pb );
int slapi_call_syntax_assertion2keys_ava_sv( void *vpi, Slapi_Value *val,
Slapi_Value ***ivals, int ftype );
int slapi_call_syntax_assertion2keys_sub_sv( void *vpi, char *initial,
@@ -1582,6 +1584,9 @@
#define SLAPI_PLUGIN_SYNTAX_FLAGS 707
#define SLAPI_PLUGIN_SYNTAX_COMPARE 708
+/* user defined substrlen; not stored in slapdplugin, but pblock itself */
+#define SLAPI_SYNTAX_SUBSTRLENS 709
+
/* ACL plugin functions and arguments */
#define SLAPI_PLUGIN_ACL_INIT 730
#define SLAPI_PLUGIN_ACL_SYNTAX_CHECK 731
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.11, 1.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2672/ldap/servers/plugins/syntaxes
Modified Files:
string.c
Log Message:
Resolves: #447353
Summary: RFE: search optimization and single character substring searches
Description: extended the substring key to have 3 types:
* begin (e.g., *^a)
* middle (e.g., *abc)
* end (e.g., *xy$)
* Usage: turn an index object to extensibleobject and set an integer value as
follows:
* dn: cn=sn, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
* objectClass: extensibleObject
* nsSubStrBegin: 2
* nsSubStrMiddle: 3
* nsSubStrEnd: 2
* [...]
Index: string.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- string.c 30 Jun 2008 17:28:16 -0000 1.11
+++ string.c 15 Jul 2008 16:49:41 -0000 1.12
@@ -50,10 +50,12 @@
#include <unistd.h>
#endif
+#define MAX_VAL(x,y) ((x)>(y)?(x):(y))
+
static int string_filter_approx( struct berval *bvfilter,
Slapi_Value **bvals, Slapi_Value **retVal );
static void substring_comp_keys( Slapi_Value ***ivals, int *nsubs, char *str,
- int prepost, int syntax );
+ int prepost, int syntax, char *comp_buf, int substrlen );
int
string_filter_ava( struct berval *bvfilter, Slapi_Value **bvals, int syntax,
@@ -294,7 +296,7 @@
for ( j = 0; bvals[j] != NULL; j++ ) {
int tmprc;
size_t len;
- const struct berval *bvp = slapi_value_get_berval(bvals[j]);
+ const struct berval *bvp = slapi_value_get_berval(bvals[j]);
len = bvp->bv_len;
if ( len < sizeof(buf) ) {
@@ -392,8 +394,53 @@
/* XXX should remove duplicates! XXX */
Slapi_Value *bvdup;
const struct berval *bvp;
- char buf[SUBLEN+1];
+ char *buf;
int i;
+ int *substrlens = NULL;
+ int localsublens[3] = {SUBBEGIN, SUBMIDDLE, SUBEND};/* default values */
+ int maxsublen;
+ /*
+ * Substring key has 3 types:
+ * begin (e.g., *^a)
+ * middle (e.g., *abc)
+ * end (e.g., *xy$)
+ *
+ * the each has its own key length, which can be configured as follows:
+ * Usage: turn an index object to extensibleobject and
+ * set an integer value for each.
+ * dn: cn=sn, cn=index, cn=userRoot, cn=ldbm database, cn=plugins,
+ * cn=config
+ * objectClass: extensibleObject
+ * nsSubStrBegin: 2
+ * nsSubStrMiddle: 3
+ * nsSubStrEnd: 2
+ * [...]
+ *
+ * By default, begin == 2, middle == 3, end == 2 (defined in syntax.h)
+ */
+
+ /* If nsSubStrLen is specified in each index entry,
+ respect the length for the substring index key length.
+ Otherwise, the deafult value SUBLEN is used */
+ slapi_pblock_get(pb, SLAPI_SYNTAX_SUBSTRLENS, &substrlens);
+
+ if (NULL == substrlens) {
+ substrlens = localsublens;
+ }
+ if (0 == substrlens[INDEX_SUBSTRBEGIN]) {
+ substrlens[INDEX_SUBSTRBEGIN] = SUBBEGIN;
+ }
+ if (0 == substrlens[INDEX_SUBSTRMIDDLE]) {
+ substrlens[INDEX_SUBSTRMIDDLE] = SUBMIDDLE;
+ }
+ if (0 == substrlens[INDEX_SUBSTREND]) {
+ substrlens[INDEX_SUBSTREND] = SUBEND;
+ }
+ maxsublen = MAX_VAL(substrlens[INDEX_SUBSTRBEGIN], substrlens[INDEX_SUBSTRMIDDLE]);
+ maxsublen = MAX_VAL(maxsublen, substrlens[INDEX_SUBSTREND]);
+
+ buf = (char *)slapi_ch_calloc(1, maxsublen + 1);
+
nsubs = 0;
for ( bvlp = bvals; bvlp && *bvlp; bvlp++ ) {
/*
@@ -407,11 +454,11 @@
* the only downside is that we allocate more space than
* we really need.
*/
- nsubs += slapi_value_get_length(*bvlp) - SUBLEN + 3;
+ nsubs += slapi_value_get_length(*bvlp) - substrlens[INDEX_SUBSTRMIDDLE] + 3;
}
+ nsubs += substrlens[INDEX_SUBSTRMIDDLE] * 2 - substrlens[INDEX_SUBSTRBEGIN] - substrlens[INDEX_SUBSTREND];
*ivals = (Slapi_Value **) slapi_ch_calloc( (nsubs + 1), sizeof(Slapi_Value *) );
- buf[SUBLEN] = '\0';
n = 0;
bvdup= slapi_value_new();
@@ -423,39 +470,42 @@
bvp = slapi_value_get_berval(bvdup);
/* leading */
- if ( bvp->bv_len > SUBLEN - 2 ) {
+ if ( bvp->bv_len > substrlens[INDEX_SUBSTRBEGIN] - 2 ) {
buf[0] = '^';
- for ( i = 0; i < SUBLEN - 1; i++ ) {
+ for ( i = 0; i < substrlens[INDEX_SUBSTRBEGIN] - 1; i++ ) {
buf[i + 1] = bvp->bv_val[i];
}
+ buf[substrlens[INDEX_SUBSTRBEGIN]] = '\0';
(*ivals)[n] = slapi_value_new_string(buf);
n++;
}
/* any */
for ( p = bvp->bv_val;
- p < (bvp->bv_val + bvp->bv_len - SUBLEN + 1);
+ p < (bvp->bv_val + bvp->bv_len - substrlens[INDEX_SUBSTRMIDDLE] + 1);
p++ ) {
- for ( i = 0; i < SUBLEN; i++ ) {
+ for ( i = 0; i < substrlens[INDEX_SUBSTRMIDDLE]; i++ ) {
buf[i] = p[i];
}
- buf[SUBLEN] = '\0';
+ buf[substrlens[INDEX_SUBSTRMIDDLE]] = '\0';
(*ivals)[n] = slapi_value_new_string(buf);
n++;
}
/* trailing */
- if ( bvp->bv_len > SUBLEN - 2 ) {
- p = bvp->bv_val + bvp->bv_len - SUBLEN + 1;
- for ( i = 0; i < SUBLEN - 1; i++ ) {
+ if ( bvp->bv_len > substrlens[INDEX_SUBSTREND] - 2 ) {
+ p = bvp->bv_val + bvp->bv_len - substrlens[INDEX_SUBSTREND] + 1;
+ for ( i = 0; i < substrlens[INDEX_SUBSTREND] - 1; i++ ) {
buf[i] = p[i];
}
- buf[SUBLEN - 1] = '$';
+ buf[substrlens[INDEX_SUBSTREND] - 1] = '$';
+ buf[substrlens[INDEX_SUBSTREND]] = '\0';
(*ivals)[n] = slapi_value_new_string(buf);
n++;
}
}
slapi_value_free(&bvdup);
+ slapi_ch_free_string(&buf);
}
break;
}
@@ -548,6 +598,25 @@
)
{
int nsubs, i, len;
+ int *substrlens = NULL;
+ int localsublens[3] = {SUBBEGIN, SUBMIDDLE, SUBEND};/* default values */
+ int maxsublen;
+ char *comp_buf = NULL;
+
+ slapi_pblock_get(pb, SLAPI_SYNTAX_SUBSTRLENS, &substrlens);
+
+ if (NULL == substrlens) {
+ substrlens = localsublens;
+ }
+ if (0 == substrlens[INDEX_SUBSTRBEGIN]) {
+ substrlens[INDEX_SUBSTRBEGIN] = SUBBEGIN;
+ }
+ if (0 == substrlens[INDEX_SUBSTRMIDDLE]) {
+ substrlens[INDEX_SUBSTRMIDDLE] = SUBMIDDLE;
+ }
+ if (0 == substrlens[INDEX_SUBSTREND]) {
+ substrlens[INDEX_SUBSTREND] = SUBEND;
+ }
*ivals = NULL;
@@ -561,8 +630,8 @@
nsubs = 0;
if ( initial != NULL ) {
value_normalize( initial, syntax, 0 /* do not trim leading blanks */ );
- if ( strlen( initial ) > SUBLEN - 2 ) {
- nsubs += strlen( initial ) - SUBLEN + 2;
+ if ( strlen( initial ) > substrlens[INDEX_SUBSTRBEGIN] - 2 ) {
+ nsubs += strlen( initial ) - substrlens[INDEX_SUBSTRBEGIN] + 2;
} else {
initial = NULL; /* save some work later */
}
@@ -570,14 +639,14 @@
for ( i = 0; any != NULL && any[i] != NULL; i++ ) {
value_normalize( any[i], syntax, 0 /* do not trim leading blanks */ );
len = strlen( any[i] );
- if ( len >= SUBLEN ) {
- nsubs += len - SUBLEN + 1;
+ if ( len >= substrlens[INDEX_SUBSTRMIDDLE] ) {
+ nsubs += len - substrlens[INDEX_SUBSTRMIDDLE] + 1;
}
}
if ( final != NULL ) {
value_normalize( final, syntax, 0 /* do not trim leading blanks */ );
- if ( strlen( final ) > SUBLEN - 2 ) {
- nsubs += strlen( final ) - SUBLEN + 2;
+ if ( strlen( final ) > substrlens[INDEX_SUBSTREND] - 2 ) {
+ nsubs += strlen( final ) - substrlens[INDEX_SUBSTREND] + 2;
} else {
final = NULL; /* save some work later */
}
@@ -592,21 +661,29 @@
*/
*ivals = (Slapi_Value **) slapi_ch_malloc( (nsubs + 1) * sizeof(Slapi_Value *) );
+
+ maxsublen = MAX_VAL(substrlens[INDEX_SUBSTRBEGIN], substrlens[INDEX_SUBSTRMIDDLE]);
+ maxsublen = MAX_VAL(maxsublen, substrlens[INDEX_SUBSTREND]);
nsubs = 0;
+ comp_buf = (char *)slapi_ch_malloc(maxsublen + 1);
if ( initial != NULL ) {
- substring_comp_keys( ivals, &nsubs, initial, '^', syntax );
+ substring_comp_keys( ivals, &nsubs, initial, '^', syntax,
+ comp_buf, substrlens[INDEX_SUBSTRBEGIN] );
}
for ( i = 0; any != NULL && any[i] != NULL; i++ ) {
- if ( strlen( any[i] ) < SUBLEN ) {
+ if ( strlen( any[i] ) < substrlens[INDEX_SUBSTRMIDDLE] ) {
continue;
}
- substring_comp_keys( ivals, &nsubs, any[i], 0, syntax );
+ substring_comp_keys( ivals, &nsubs, any[i], 0, syntax,
+ comp_buf, substrlens[INDEX_SUBSTRMIDDLE] );
}
if ( final != NULL ) {
- substring_comp_keys( ivals, &nsubs, final, '$', syntax );
+ substring_comp_keys( ivals, &nsubs, final, '$', syntax,
+ comp_buf, substrlens[INDEX_SUBSTREND] );
}
(*ivals)[nsubs] = NULL;
+ slapi_ch_free_string(&comp_buf);
return( 0 );
}
@@ -617,12 +694,15 @@
int *nsubs,
char *str,
int prepost,
- int syntax
+ int syntax,
+ char *comp_buf,
+ int substrlen
)
{
int i, len;
char *p;
- char buf[SUBLEN + 1];
+
+ PR_ASSERT(NULL != comp_buf);
LDAPDebug( LDAP_DEBUG_TRACE, "=> substring_comp_keys (%s) %d\n",
str, prepost, 0 );
@@ -632,37 +712,37 @@
/* prepend ^ for initial substring */
if ( prepost == '^' )
{
- buf[0] = '^';
- for ( i = 0; i < SUBLEN - 1; i++ )
+ comp_buf[0] = '^';
+ for ( i = 0; i < substrlen - 1; i++ )
{
- buf[i + 1] = str[i];
+ comp_buf[i + 1] = str[i];
}
- buf[SUBLEN] = '\0';
- (*ivals)[*nsubs] = slapi_value_new_string(buf);
+ comp_buf[substrlen] = '\0';
+ (*ivals)[*nsubs] = slapi_value_new_string(comp_buf);
(*nsubs)++;
}
- for ( p = str; p < (str + len - SUBLEN + 1); p++ )
+ for ( p = str; p < (str + len - substrlen + 1); p++ )
{
- for ( i = 0; i < SUBLEN; i++ )
+ for ( i = 0; i < substrlen; i++ )
{
- buf[i] = p[i];
+ comp_buf[i] = p[i];
}
- buf[SUBLEN] = '\0';
- (*ivals)[*nsubs] = slapi_value_new_string(buf);
+ comp_buf[substrlen] = '\0';
+ (*ivals)[*nsubs] = slapi_value_new_string(comp_buf);
(*nsubs)++;
}
if ( prepost == '$' )
{
- p = str + len - SUBLEN + 1;
- for ( i = 0; i < SUBLEN - 1; i++ )
+ p = str + len - substrlen + 1;
+ for ( i = 0; i < substrlen - 1; i++ )
{
- buf[i] = p[i];
+ comp_buf[i] = p[i];
}
- buf[SUBLEN - 1] = '$';
- buf[SUBLEN] = '\0';
- (*ivals)[*nsubs] = slapi_value_new_string(buf);
+ comp_buf[substrlen - 1] = '$';
+ comp_buf[substrlen] = '\0';
+ (*ivals)[*nsubs] = slapi_value_new_string(comp_buf);
(*nsubs)++;
}
15 years, 9 months
[Fedora-directory-commits] ldapserver/man/man1 cl-dump.1, NONE, 1.1 dbgen.pl.1, NONE, 1.1 dbscan.1, NONE, 1.1 dsktune.1, NONE, 1.1 infadd.1, NONE, 1.1 ldap-agent.1, NONE, 1.1 ldclt.1, NONE, 1.1 ldif.1, NONE, 1.1 logconv.pl.1, NONE, 1.1 migratecred.1, NONE, 1.1 mmldif.1, NONE, 1.1 pwdhash.1, NONE, 1.1 repl-monitor.1, NONE, 1.1 rsearch.1, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/man/man1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20958/ldapserver/man/man1
Added Files:
cl-dump.1 dbgen.pl.1 dbscan.1 dsktune.1 infadd.1 ldap-agent.1
ldclt.1 ldif.1 logconv.pl.1 migratecred.1 mmldif.1 pwdhash.1
repl-monitor.1 rsearch.1
Log Message:
Resolves: bug 447614
Bug Description: Lack of manpages
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: This adds man pages for the command line utilities. The configure.ac diffs were a little bit tricky - apparently, mandir is not set to a correct default value, so we have to make sure we set a reasonable default value it if the user has not set it (e.g. rpmbuild will override it with --mandir=something).
Platforms tested: Fedora 8, Fedora 9
Flag Day: no
Doc impact: no
--- NEW FILE cl-dump.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH CL-DUMP 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
cl-dump \- Dump and decode Directory Server replication change log
.SH SYNOPSIS
.B cl\-dump
[\fI-h host\fR] [\fI-p port\fR] [\fI-D bind-dn\fR] -w bind-password | -P bind-cert
[\fI-r replica-roots\fR] [\fI-o output-file\fR] [\fI-c\fR] [\fI-v\fR]
.PP
.B cl\-dump
\-i changelog\-ldif\-file\-with\-base64encoding [\fI\-o output\-file\fR] [\fI\-c\fR]
.PP
.SH DESCRIPTION
Dump and decode Directory Server replication change log
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below.
.TP
.B \-c
Dump and interpret CSN only. This option can be used with or
without -i option.
.TP
.B \-D bind\-dn
Directory server's bind DN. Default to "cn=Directory Manager" if
the option is omitted.
.TP
.B \-h host
Directory server's host. Default to the server where the script
is running.
.TP
.B \-i changelog\-ldif\-file\-with\-base64encoding
If you already have a ldif-like changelog, but the changes
in that file are encoded, you may use this option to
decode that ldif-like changelog.
.TP
.B \-o output\-file
Path name for the final result. Default to STDOUT if omitted.
.TP
.B \-p port
Directory server's port. Default to 389.
.TP
.B \-P bind\-cert
Pathname of binding certificate DB
.TP
.B \-r replica\-roots
Specify replica roots whose changelog you want to dump. The replica
roots may be seperated by comma. All the replica roots would be
dumped if the option is omitted.
.TP
.B \-v
Print the version of this script.
.TP
.B \-w bind\-password
Password for the bind DN
.SH RESTRICTIONS
If you are not using \-i option, the script should be run when the server
is running, and from where the server's changelog directory is accessible.
.br
.SH SEE ALSO
.BR repl-monitor (1)
.br
.SH AUTHOR
cl-dump was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE dbgen.pl.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DBGEN.PL 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
dbgen.pl \- Random LDIF database creator
.SH SYNOPSIS
.B dbgen.pl
[\fIOPTIONS\fR] -o output_file -n number
.SH DESCRIPTION
Random LDIF database creator. Used to generate large LDIF files
for use in testing the Directory Server.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-v
Verbose output
.TP
.B \-q
Quiet output
.TP
.B \-s suffix
LDAP suffix. Default is 'dc=example,dc=com'
.TP
.B \-c CN naming style
Naming style for RDN's. Default is UID
.TP
.B \-O organizationalPersons
Organizationalpersons objectClass. Default is inetOrgPerson.
.TP
.B \-p piranha style ACI
Piranha style aci. Default is barracua
.TP
.B \-r seed
Seed number for random number generator
.TP
.B \-g
Print extra entries for orgchart
.TP
.B \-x
Suppress printing of the preamble
.TP
.B \-y
Suppress printing of Organizational Units
.TP
.B \-l
Location of directory containing data files, default is /usr/share/dirsrv/data
.TP
.B \-n number
Number of entries to be generated
.br
.SH AUTHOR
dbgen.pl was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE dbscan.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DBSCAN 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
dbscan \- scans a Directory Server database index file and dumps the contents
.SH SYNOPSIS
.B dbscan
\fB-f <filename>\fR [\fI-R\fR] [\fI-t <size>\fR]
[\fI-K <entry_id>\fR] [\fI-k <key>\fR] [\fI-l <size>\fR]
[\fI-G <n>\fR] [\fI-n\fR] [\fI-r\fR] [\fI-s\fR]
.PP
.SH DESCRIPTION
Scans a Directory Server database index file and dumps the contents.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \fB\-f\fR <filename>
specify db file
.TP
.B \fB\-R\fR
dump as raw data
.TP
.B \fB\-t\fR <size>
entry truncate size (bytes)
.IP
entry file options:
.TP
.B \fB\-K\fR <entry_id>
lookup only a specific entry id
index file options:
.TP
.B \fB\-k\fR <key>
lookup only a specific key
.TP
.B \fB\-l\fR <size>
max length of dumped id list
(default 4096; 40 bytes <= size <= 1048576 bytes)
.TP
.B \fB\-G\fR <n>
only display index entries with more than <n> ids
.TP
.B \fB\-n\fR
display ID list lengths
.TP
.B \fB\-r\fR
display the conents of ID list
.TP
.B \fB\-s\fR
Summary of index counts
.IP
.SH USAGE
Sample usages:
.TP
Dump the entry file:
.B
dbscan \fB\-f\fR id2entry.db4
.TP
Display index keys in cn.db4:
.B dbscan \fB\-f\fR cn.db4
.TP
Display index keys and the count of entries having the key in mail.db4:
.B
dbscan \fB\-r\fR \fB\-f\fR mail.db4
.TP
Display index keys and the IDs having more than 20 IDs in sn.db4:
.B
dbscan \fB\-r\fR \fB\-G\fR 20 \fB\-f\fR sn.db4
.TP
Display summary of objectclass.db4:
.B
dbscan \fB\-f\fR objectclass.db4
.br
.SH AUTHOR
dbscan was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE dsktune.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH DSKTUNE 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
dsktune \- reports memory, network, and file system tuning settings
which can affect the performance of the Directory Server
.SH SYNOPSIS
.B dsktune
[\fI-q\fR] [\fI-c\fR] [\fI-D\fR] [\fI-v\fR] [\fI-i installdir\fR]
.SH DESCRIPTION
Reports memory, network, and file system tuning settings
which can affect the performance of the Directory Server
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \fB\-q\fR
dsktune only reports essential settings
.TP
.B \fB\-c\fR
dsktune only reports tuning information for client machines
.TP
.B \fB\-D\fR
dsktune also reports the commands executed
.TP
.B \fB\-v\fR
dsktune only reports its release version date
.TP
.B \fB\-i installdir\fR
specify alternate server installation directory
.br
.SH AUTHOR
dsktune was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE infadd.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH INFADD 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
infadd \- infinite additions to LDAP server
.SH SYNOPSIS
.B infadd
\fI-s suffix -u bindDN -w password \fR[\fIoptions\fR]
.SH DESCRIPTION
infadd is used
to measure performance of the add operation. It can
span multiple threads in order to test the performance
under heavy locking.
.PP
.SH OPTIONS
.TP
.B \-h hostname
hostname (default: localhost)
.TP
.B \-p port
port (default: 389)
.TP
.B \-t threads
number of threads to spin (default: 1)
.TP
.B \-d
use TCP no\-delay
.TP
.B \-q
quiet mode (no status updates)
.TP
.B \-v
verbose mode (give per\-thread statistics)
.TP
.B \-I num
first uid (default: 0)
.TP
.B \-l count
limit count; stops when the total count exceeds <count>
.TP
.B \-i msec
sample interval in milliseconds (default: 10000)
.TP
.B \-R size
generate <size> random names instead of using data files
.TP
.B \-z size
add binary blob of average size of <size> bytes
.PP
.SH SEE ALSO
.BR rsearch (1)
.br
.SH AUTHOR
infadd was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE ldap-agent.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH LDAP-AGENT 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
ldap-agent \- SNMP agent for Directory Server
.SH SYNOPSIS
.B ldap-agent
.RI [\fI-D\fR] <configuration-file>
.SH DESCRIPTION
ldap-agent is an SNMP subagent for Directory Server
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
.TP
.B \-D
Enable debugging
.TP
.B <configfile>
Configuration file for the ldap agent
.SH SEE ALSO
.BR snmpd(8)
.br
.SH USAGE
Sample usage:
.TP
.B ldap-agent /etc/dirsrv/config/ldap-agent.conf
.br
.SH AUTHOR
ldap\-agent was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE ldclt.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH LDCLT 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
ldclt \- load test program for LDAP
.SH SYNOPSYS
.B ldclt
[\fI\-qQvV\fR] [\fI\-E <max errors>\fR]
[\fI\-b <base DN>\fR] [\fI\-h <host>\fR] [\fI\-p <port>\fR] [\fI\-t <timeout>\fR]
[\fI\-D <bind DN>\fR] [\fI\-w <passwd>\fR] [\fI\-o <SASL option>\fR]
[\fI\-e <execParams>\fR] [\fI\-a <max pending>\fR]
[\fI\-n <nb threads>\fR] [\fI\-i <nb times>\fR] [\fI\-N <nb samples>\fR]
[\fI\-I <err number>\fR] [\fI\-T <total>\fR]
[\fI\-r <low> \-R <high>\fR]
[\fI\-f <filter>\fR] [\fI\-s <scope>\fR]
[\fI\-S <slave>\fR] [\fI\-P<master port>\fR]
[\fI\-W <waitsec>\fR] [\fI\-Z <certfile>\fR]
.PP
.SH DESCRIPTION
This tool is a LDAP client targeted to validate the reliability of
the product under a wide variety of stress conditions.
.PP
.SH OPTIONS
The valid options are:
.TP
.B \fB\-a\fR
Asynchronous mode, with max pending operations.
.TP
.B \fB\-b\fR
Give the base DN to use. Default "o=sun,c=us".
.TP
.B \fB\-D\fR
Bind DN. See \fB\-w\fR
.TP
.B \fB\-E\fR
Max errors allowed. Default 1000.
.TP
.B \fB\-f\fR
Filter for searches.
.TP
.B \fB\-h\fR
Host to connect. Default "localhost".
.TP
.B \fB\-i\fR
Number of times inactivity allowed. Default 3 (30 seconds)
.TP
\fB\-I\fR
Ignore errors (cf. \fB\-E\fR). Default none.
.TP
.B \fB\-n\fR
Number of threads. Default 10.
.TP
.B \fB\-N\fR
Number of samples (10 seconds each). Default infinite.
.TP
.B \fB\-o\fR
SASL Option.
.TP
.B \fB\-p\fR
Server port. Default 389.
.TP
.B \fB\-P\fR
Master port (to check replication). Default 16000.
.TP
.B \fB\-q\fR
Quiet mode. See option \fB\-I\fR.
.TP
.B \fB\-Q\fR
Super quiet mode.
.TP
.B \fB\-r\fR
Range's low value.
.TP
.B \fB\-R\fR
Range's high value.
.TP
.B \fB\-s\fR
Scope. May be base, subtree or one. Default subtree.
.TP
.B \fB\-S\fR
Slave to check.
.TP
.B \fB\-t\fR
LDAP operations timeout. Default 30 seconds.
.TP
.B \fB\-T\fR
Total number of operations per thread. Default infinite.
.TP
.B \fB\-v\fR
Verbose.
.TP
.B \fB\-V\fR
Very verbose.
.TP
.B \fB\-w\fR
Bind passwd. See \fB\-D\fR.
.TP
.B \fB\-W\fR
Wait between two operations. Default 0 seconds.
.TP
.B \fB\-Z\fR
certfile. Turn on SSL and use certfile as the certificate DB
.TP
.B \fB\-e\fR
Execution parameters:
.IP
\fBadd\fR ldap_add() entries.
.br
\fBappend\fR entries to the genldif file.
.br
\fBascii\fR ascii 7\-bits strings.
.br
\fBattreplace=name:mask\fR replace attribute of existing entry.
.br
\fBattrlist=name:name:name\fR specify list of attribs to retrieve
.br
\fBattrsonly=0|1\fR ldap_search() parameter. Set 0 to read values.
.br
\fBbindeach\fR ldap_bind() for each operation.
.br
\fBbindonly\fR only bind/unbind, no other operation is performed.
.br
\fBclose\fR will close() the fd, rather than ldap_unbind().
.br
\fBcltcertname=name\fR name of the SSL client certificate
.br
\fBcommoncounter\fR all threads share the same counter.
.br
\fBcounteach\fR count each operation not only successful ones.
.br
\fBdelete\fR ldap_delete() entries.
.br
\fBdontsleeponserverdown\fR will loop very fast if server down.
.br
\fBemailPerson\fR objectclass=emailPerson (\fB\-e\fR add only).
.br
\fBesearch\fR exact search.
.br
\fBgenldif=filename\fR generates a ldif file
.br
\fBimagesdir=path\fR specify where are the images.
.br
\fBincr\fR incremental values.
.br
\fBinetOrgPerson\fR objectclass=inetOrgPerson (\fB\-e\fR add only).
.br
\fBkeydbfile=file\fR filename of the key database
.br
\fBkeydbpin=password\fR password for accessing the key database
.br
\fBnoglobalstats\fR don't print periodical global statistics
.br
\fBnoloop\fR does not loop the incremental numbers.
.br
\fBobject=filename\fR build object from input file
.br
\fBperson\fR objectclass=person (\fB\-e\fR add only).
.br
\fBrandom\fR random filters, etc...
.br
\fBrandomattrlist=name:name:name\fR random select attrib in the list
.br
\fBrandombase\fR random base DN.
.br
\fBrandombaselow=value\fR low value for random generator.
.br
\fBrandombasehigh=value\fR high value for random generator.
.br
\fBrandombinddn\fR random bind DN.
.br
\fBrandombinddnfromfile=fine\fR retrieve bind DN & passwd from file
.br
\fBrandombinddnlow=value\fR low value for random generator.
.br
\fBrandombinddnhigh=value\fR high value for random generator.
.br
\fBrdn=attrname:value\fR alternate for \fB\-f\fR.
.br
\fBreferral=on|off|rebind\fR change referral behaviour.
.br
\fBscalab01\fR activates scalab01 scenario.
.br
\fBscalab01_cnxduration\fR maximum connection duration.
.br
\fBscalab01_maxcnxnb\fR modem pool size.
.br
\fBscalab01_wait\fR sleep() between 2 attempts to connect.
.br
\fBsmoothshutdown\fR main thread waits till the worker threads exit.
.br
\fBstring\fR create random strings rather than random numbers.
.br
\fBv2\fR ldap v2.
.br
\fBwithnewparent\fR rename with newparent specified as argument.
.br
\fBrandomauthid\fR random SASL Authid.
.br
\fBrandomauthidlow=value\fR low value for random SASL Authid.
.br
\fBrandomauthidhigh=value\fR high value for random SASL Authid.
.PP
.SH AUTHOR
ldclt was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE ldif.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH LDIF 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
ldif \- manipulates an LDIF stream by adding a column with the
defined attribute type
.SH SYNOPSIS
.B ldif
[\fI-b\fR] attrtype
.SH DESCRIPTION
Manipulates an LDIF stream by adding a column with the
defined attribute type
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-b
Output base64 binary format
.SH USAGE
.TP
.B
ldif dn < /tmp/ldif
.SH AUTHOR
ldif was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE logconv.pl.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH LOGCONV.PL 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
logconv.pl \- analyzes Directory Server access log files
.SH SYNOPSIS
.B logconv.pl
[\fI\-h\fR] [\fI\-d <rootDN>\fR] [\fI\-s <size limit>\fR] [\fI\-v\fR] [\fI\-V\fR]
[\fI\-S <start time>\fR] [\fI\-E <end time>\fR]
[\fI\-efcibaltnxgju\fR] [\fI access log ... ... \fR]
.PP
.SH DESCRIPTION
Analyzes Directory Server access log files for specific information defined on the command
line
.SH OPTIONS
A summary of options is included below:
.TP
.B \fB\-h\fR
help/usage
.TP
.B \fB\-d\fR <Directory Managers DN>
DEFAULT \-> cn=directory manager
.TP
.B \fB\-s\fR <Number of results to return per category>
DEFAULT \-> 20
.TP
.B \fB\-X\fR <IP address to exclude from connection stats>
E.g. Load balancers
.TP
.B \fB\-v\fR show version of tool
Print version of the tool
.TP
.B \fB\-S\fR <time to begin analyzing logfile from>
Time to begin analyzing logile from
E.g. [28/Mar/2002:13:14:22 \fB\-0800]\fR
.TP
.B \fB\-E\fR <time to stop analyzing logfile>
Time to stop analyzing logile from
E.g. [28/Mar/2002:13:24:62 \fB\-0800]\fR
.TP
\fB\-V\fR <enable verbose output \- includes all stats listed below>
Verbose output
.TP
.B \fB\-[efcibaltnxgju]\fR
.br
\fBe\fR Error Code stats
.br
\fBf\fR Failed Login Stats
.br
\fBc\fR Connection Code Stats
.br
\fBi\fR Client Stats
.br
\fBb\fR Bind Stats
.br
\fBa\fR Search Base Stats
.br
\fBl\fR Search Filter Stats
.br
\fBt\fR Etime Stats
.br
\fBn\fR Nentries Stats
.br
\fBx\fR Extended Operations
.br
\fBr\fR Most Requested Attribute Stats
.br
\fBg\fR Abandoned Operation Stats
.br
\fBj\fR Recommendations
.br
\fBu\fR Unindexed Search Stats
.br
\fBy\fR Connection Latency Stats
.br
\fBp\fR Open Connection ID Stats
.PP
.SH USAGE
Examples:
.IP
logconv.pl \fB\-s\fR 10 \fB\-V\fR access
.IP
logconv.pl \fB\-d\fR "cn=directory manager" /export/server4/slapd\-host/logs/access*
.IP
logconv.pl \fB\-s\fR 50 \fB\-ibgju\fR access*
.IP
logconv.pl \fB\-S\fR "[28/Mar/2002:13:14:22 \fB\-0800]\fR" \fB\-E\fR "[28/Mar/2002:13:50:05 \fB\-0800]\fR" \fB\-e\fR access
.br
.SH AUTHOR
logconv.pl was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE migratecred.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH MIGRATECRED 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
migratecred \- Migrate credentials from one instance of Directory Server
to another
.SH SYNOPSIS
.B migratecred
-o OldInstancePath -n NewInstancePath -c OldCredential [\fI-p NewPluginPath\fR]
.SH DESCRIPTION
migratecred migrates credentials from one Directory Server instance to the other.
New plugin path defaults to [\fBlibdir\fP/dirsrv/plugins] if not given
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fBmigratecred\fP is a program that migrates credentials used for
replication and chaining - that is, the password used by the server
to perform the simple BIND operation for server to server communications.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-o OldInstancePath
Path to the source instance
.TP
.B \-n NewInstancePath
Path to the destination instance
.TP
.B \-c OldCredential
Old credential
.TP
.B \-p NewPluginPath
New plugin path (of the new instance)
.br
.SH AUTHOR
migratecred was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE mmldif.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH MMLDIF 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
mmldif \- mmldif util
.SH SYNOPSIS
.B mmldif
[-c] [-D] [-o out.ldif] in1.ldif in2.ldif ...
.SH DESCRIPTION
This manual page documents briefly the
.B mmldif
command.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-c
Write a change file (.delta) for each input file
.TP
.B \-D
Print debugging information
.TP
.B \-o
Write authoritative data to this file
.SH SEE ALSO
.BR ldif (1)
.br
.SH AUTHOR
mmldif was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE pwdhash.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH PWDHASH 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
pwdhash \- Generator of password hashes
.SH SYNOPSIS
.B pwdhash
[\fI-D config-dir\fR] [\fI-H\fR] [\fI-s scheme | -c comparepwd\fR] password
.PP
.SH DESCRIPTION
Generates password hashes which can also be used in LDIF password fields.
This uses the Directory Server password generator.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-H
Show summary of options.
.TP
.B \-s scheme
Password scheme to be used (e.g. MD5, SHA1, SHA256, SHA512,
SSHA, SSHA256, SSHA512)
.TP
.B \-c comparepassword
Password to be compared against
.TP
.B \-D configdir
Takes the password schema directly from the ns-slapd configuration
.br
.SH AUTHOR
dbscan was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE repl-monitor.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH REPL-MONITOR 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
repl-monitor \- Directory Server replication monitor
.SH SYNOPSIS
.B repl-monitor
-f configuration-file [\fI-h host\fR] [\fI-p port\fR] [\fI-r\fR]
[\fI-u refresh-url\fR] [\fI-t refresh-interval\fR] [\fI-v\fR]
.SH DESCRIPTION
Outputs the status of all of the configured Directory Servers
participating in replication. The servers to query for status
are specified in the configuration file.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-h host
Hostname of DS server
.TP
.B \-p port
TCP port
.TP
.B \-f configuration\-file
Configuration file
.TP
.B \-r
Removes extra HTML tags
.TP
.B \-u refresh\-url
Refresh url
.TP
.B \-t refresh\-interval
Refresh interval
.br
.SH AUTHOR
repl-monitor was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE rsearch.1 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH RSEARCH 1 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
rsearch \- Stress test an LDAP server with search operations
.SH SYNOPSIS
.B rsearch
\fB\-D\fR binddn \fB\-w\fR bindpw \fB\-s\fR suffix \fB\-f\fR filter [\fIoptions\fR]
.PP
.SH DESCRIPTION
Stress tests an LDAP server with search operations.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-H
print Usage (this message)
.TP
.B \fB\-h\fR host
ldap server host (default: localhost)
.TP
.B \fB\-p\fR port
ldap server port (default: 389)
.TP
.B \fB\-S\fR scope
search SCOPE [0,1,or 2] (default: 2)
.TP
.B \fB\-b\fR
bind before every operation
.TP
.B \fB\-u\fR
don't unbind \fB\-\-\fR just close the connection
.TP
.B \fB\-L\fR
set linger \fB\-\-\fR connection discarded when closed
.TP
.B \fB\-N\fR
No operation \fB\-\-\fR just bind (ignore mdc)
.TP
.B \fB\-v\fR
verbose
.TP
.B \fB\-y\fR
nodelay
.TP
.B \fB\-q\fR
quiet
.TP
.B \fB\-l\fR
logging
.TP
.B \fB\-m\fR
operaton: modify non\-indexed attr (description). \fB\-B\fR required
.TP
.B \fB\-M\fR
operaton: modify indexed attr (telephonenumber). \fB\-B\fR required
.TP
.B \fB\-d\fR
operaton: delete. \fB\-B\fR required
.TP
.B \fB\-c\fR
operaton: compare. \fB\-B\fR required
.TP
.B \fB\-i\fR file
name file; used for the search filter
.TP
.B \fB\-B\fR file
[DN and] UID file (use '\-B \e?' to see the format)
.TP
.B \fB\-A\fR attrs
list of attributes for search request
.TP
.B \fB\-a\fR file
list of attributes for search request in a file
.HP
.B \fB\-\-\fR (use '\-a \e?' to see the format ; \fB\-a\fR & \fB\-A\fR are mutually exclusive)
.PP
.TP
.B \fB\-n\fR number
(reserved for future use)
.TP
.B \fB\-o\fR number
Search time limit, in seconds; (default: 30; no time limit: 0)
.TP
.B \fB\-j\fR number
sample interval, in seconds (default: 10)
.TP
.B \fB\-t\fR number
threads (default: 1)
.TP
.B \fB\-T\fR number
Time limit, in seconds; cmd stops when exceeds <number>
.TP
.B \fB\-V\fR
show running average
.TP
.B \fB\-C\fR num
take num samples, then stop
.TP
.B \fB\-R\fR num
drop connection & reconnect every num searches
.TP
.B \fB\-x\fR
Use \fB\-B\fR file for binding; ignored if \fB\-B\fR is not given
.br
.SH AUTHOR
rsearch was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
15 years, 9 months
[Fedora-directory-commits] ldapserver/man/man8 migrate-ds.pl.8, NONE, 1.1 ns-slapd.8, NONE, 1.1 setup-ds.pl.8, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/man/man8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20958/ldapserver/man/man8
Added Files:
migrate-ds.pl.8 ns-slapd.8 setup-ds.pl.8
Log Message:
Resolves: bug 447614
Bug Description: Lack of manpages
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: This adds man pages for the command line utilities. The configure.ac diffs were a little bit tricky - apparently, mandir is not set to a correct default value, so we have to make sure we set a reasonable default value it if the user has not set it (e.g. rpmbuild will override it with --mandir=something).
Platforms tested: Fedora 8, Fedora 9
Flag Day: no
Doc impact: no
--- NEW FILE migrate-ds.pl.8 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH MIGRATE-DS.PL 8 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
migrate\-ds.pl \- Directory Server Migration script
.SH SYNOPSIS
.B migrate\-ds.pl
[\-\-options] \fB\-\-\fR [args]
.SH DESCRIPTION
Directory Server Migration script - migrates Directory Server from
older releases to the current release.
.PP
This script will copy instances (data and configuration) from the old
server root directory to their new FHS locations. This script does a
copy only \- the data in the old instances will be left untouched. The
old instances must be shutdown first to ensure that the databases are
copied safely. During migration your migrated instances will be started.
.PP
.SH OPTIONS
A summary of options is included below:
.TP
.B \fB\-\-help\fR
This message
.TP
.B \fB\-\-version\fR
Print the version and exit
.TP
.B \fB\-\-debug\fR
Turn on debugging
.TP
.B \fB\-\-oldsroot\fR
The old server root directory to migrate from
.TP
.B \fB\-\-actualsroot\fR This is the old location of the old server root.
.TP
.B \fB\-\-silent\fR
Use silent setup \- no user input
.TP
.B \fB\-\-file\fR=\fIname\fR
Use the file 'name' in .inf format to supply the
default answers
.TP
.B \fB\-\-keepcache\fR
Do not delete the temporary .inf file generated by
this program
.TP
.B \fB\-\-logfile\fR
Log migration messages to this file \- otherwise, a temp
file will be used
.TP
.B \fB\-\-instance\fR
By default, all directory server instances will be
migrated. You can use this argument to specify one
or more (e.g. \fB\-i\fR slapd\-foo \fB\-i\fR slapd\-bar) if you do
not want to migrate all of them.
.TP
.B \fB\-\-cross\fR
See below.
.PP
For all options, you can also use the short name e.g. \fB\-h\fR, \fB\-d\fR, etc.
For the \fB\-d\fR argument, specifying it more than once will increase the
debug level e.g. \fB\-ddddd\fR
.PP
args:
You can supply default .inf data in this format:
.IP
section.param=value
.PP
e.g.
.IP
General.FullMachineName=foo.example.com
.PP
or
.IP
"slapd.Suffix=dc=example, dc=com"
.PP
Values passed in this manner will override values in an .inf file
given with the \fB\-f\fR argument.
.PP
actualsroot:
This is used when you must migrate from one machine to another. The
usual case is that you have mounted the old server root on a different
root directory, either via a network mount, or by copying a tarball
made using a relative directory on the source machine to the
destination machine and untarring it.
.PP
For example: machineA is a 32bit machine, and you want to migrate your
servers to a new 64bit machine. Lets assume your old server root on
machineA was /opt/myds, and your new machine also wants to use a
server root of /opt/myds. There are a couple of different ways to
proceed. Either make a tarball of opt/myds from machineA using a
relative path (i.e. NOT /opt/myds) or use NFS to mount
machineA:/opt/myds on a different mount point
(e.g. machineB:/migration/opt/myds).
.PP
If you do this, you should give the old "real" server root (/opt/myds)
as the \fB\-\-actualsroot\fR argument, and use /migration/opt/myds for the
\fB\-\-oldsroot\fR argument. That is, the oldsroot is the physical location of
the files on disk. The actualsroot is the old value of the server root
on the source machine.
.PP
cross:
Also known as crossplatform, or 'c', or 'x'.
This is when the source machine is a different architecture than the
destination machine. In this case, only certain data will be available
for migration. Changelog information will not be migrated, and replicas
will need to be reinitialized (if migrating masters or hubs). This type
of migration requires that all of your old databases have been dumped
to LDIF format, and the LDIF file must be in the default database directory
(usually /opt/fedora\-ds/slapd\-instance/db), and the LDIF file must have
the same name as the database instance directory, with a ".ldif". For
example, if you have
.IP
/opt/fedora\-ds/slapd\-instance/db/userRoot/ and
/opt/fedora\-ds/slapd\-instance/db/NetscapeRoot/
.PP
you must first use db2ldif to export these databases to LDIF e.g.
.IP
cd /opt/fedora\-ds/slapd\-instance
\&./db2ldif \fB\-n\fR userRoot \fB\-a\fR /opt/fedora\-ds/slapd\-instance/db/userRoot.ldif and
\&./db2ldif \fB\-n\fR NetscapeRoot \fB\-a\fR /opt/fedora\-ds/slapd\-instance/db/NetscapeRoot.ldif
.PP
Then you must somehow make your old server root directory available on
the destination machine, either by creating a tar archive on the source
and copying it to the destination, or by network mounting the source
directory on the destination machine.
.br
.SH AUTHOR
migrate-ds.pl was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE ns-slapd.8 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH NS-SLAPD 8 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
ns-slapd \- The main Directory Server daemon
.SH SYNOPSIS
.B ns-slapd
-D configdir [\fI-d debuglevel\fR] [\fI-i pidlogfile\fR] [\fI-v\fR] [\fI-V\fR]
.SH DESCRIPTION
ns-slapd launches the LDAP Directory Server
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \-v
Show version of program.
.TP
.B \-D configdir
Specifies the configuration directory pointing at the instance
to be started (e.g. /etc/dirsrv/slapd-localhost)
.TP
.B \-d debuglevel
Specifies the debuglevel to be used
.TP
.B \-i pidlogfile
Specifies file where the pid of the process will be stored
.br
.SH AUTHOR
ns-slapd was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2001 Sun Microsystems, Inc. Used by permission.
.br
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
--- NEW FILE setup-ds.pl.8 ---
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH SETUP-DS.PL 8 "May 18, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
setup\-ds.pl \- Set up an instance of Directory Server
.SH SYNOPSIS
.B setup-ds.pl
[\fI--options\fR] \fI-- \fR[\fIargs\fR]
.SH DESCRIPTION
Set up a Directory Server instance. Creates the configuration
files for an instance of Directory Server based on a few parameters
like the hostname, port number, and directory manager information.
Can be run in interactive mode with different levels of verbosity, or
in silent mode with parameters supplied in a .inf format file or
on the command line.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH OPTIONS
A summary of options is included below:
.TP
.B \fB\-\-help\fR
This message
.TP
.B \fB\-\-version\fR
Print the version and exit
.TP
.B \fB\-\-debug\fR
Turn on debugging
.TP
.B \fB\-\-silent\fR
Use silent setup \- no user input
.TP
.B \fB\-\-file\fR=\fIname\fR
Use the file 'name' in .inf format to supply the default answers
.TP
.B \fB\-\-keepcache\fR
Do not delete the temporary .inf file generated by this program
.TP
.B \fB\-\-logfile\fR
Log setup messages to this file \- otherwise, a temp file will be used
.PP
For all options, you can also use the short name e.g. \fB\-h\fR, \fB\-d\fR, etc. For the \fB\-d\fR argument,
specifying it more than once will increase the debug level e.g. \fB\-ddddd\fR
.PP
args:
You can supply default .inf data in this format:
.IP
section.param=value
.PP
e.g.
.IP
General.FullMachineName=foo.example.com
.PP
or
.IP
"slapd.Suffix=dc=example, dc=com"
.PP
Values passed in this manner will override values in an .inf file given with the \fB\-f\fR argument.
.br
.SH AUTHOR
setup-ds.pl was written by the Fedora Directory Server Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
Copyright \(co 2008 Red Hat, Inc.
.br
This manual page was written by Michele Baldessari <michele(a)pupazzo.org>,
for the Debian project (but may be used by others).
.br
This is free software. You may redistribute copies of it under the terms of
the Directory Server license found in the LICENSE file of this
software distribution. This license is essentially the GNU General Public
License version 2 with an exception for plug-in distribution.
15 years, 9 months
[Fedora-directory-commits] ldapserver Makefile.am, 1.71, 1.72 configure.ac, 1.48, 1.49 aclocal.m4, 1.69, 1.70 configure, 1.86, 1.87 Makefile.in, 1.91, 1.92
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20958/ldapserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure Makefile.in
Log Message:
Resolves: bug 447614
Bug Description: Lack of manpages
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: This adds man pages for the command line utilities. The configure.ac diffs were a little bit tricky - apparently, mandir is not set to a correct default value, so we have to make sure we set a reasonable default value it if the user has not set it (e.g. rpmbuild will override it with --mandir=something).
Platforms tested: Fedora 8, Fedora 9
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Makefile.am 2 Jul 2008 16:14:38 -0000 1.71
+++ Makefile.am 15 Jul 2008 15:50:55 -0000 1.72
@@ -39,7 +39,7 @@
# Linker Flags
#------------------------
NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+NSS_LINK = @nss_lib@ -lssl3 -lnss3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
DB_LINK = @db_lib@ -ldb-@db_libver@
SASL_LINK = @sasl_lib@ -lsasl2
@@ -59,7 +59,32 @@
#------------------------
BUILT_SOURCES = dirver.h dberrstrs.h
-CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
+CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties \
+ ldap/admin/src/scripts/dscreate.map \
+ ldap/admin/src/scripts/DSCreate.pm ldap/admin/src/scripts/DSMigration.pm \
+ ldap/admin/src/scripts/dsorgentries.map ldap/admin/src/scripts/migrate-ds.pl \
+ ldap/admin/src/scripts/Migration.pm ldap/admin/src/scripts/SetupDialogs.pm \
+ ldap/admin/src/scripts/setup-ds.pl ldap/admin/src/scripts/setup-ds.res \
+ ldap/admin/src/scripts/Setup.pm ldap/admin/src/scripts/template-bak2db \
+ ldap/admin/src/scripts/template-bak2db.pl ldap/admin/src/scripts/template-db2bak \
+ ldap/admin/src/scripts/template-db2bak.pl ldap/admin/src/scripts/template-db2index \
+ ldap/admin/src/scripts/template-db2index.pl ldap/admin/src/scripts/template-db2ldif \
+ ldap/admin/src/scripts/template-db2ldif.pl ldap/admin/src/scripts/template-dbverify \
+ ldap/admin/src/scripts/template-ldif2db ldap/admin/src/scripts/template-ldif2db.pl \
+ ldap/admin/src/scripts/template-ldif2ldap ldap/admin/src/scripts/template-monitor \
+ ldap/admin/src/scripts/template-ns-accountstatus.pl ldap/admin/src/scripts/template-ns-activate.pl \
+ ldap/admin/src/scripts/template-ns-inactivate.pl ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
+ ldap/admin/src/scripts/template-restart-slapd ldap/admin/src/scripts/template-restoreconfig \
+ ldap/admin/src/scripts/template-saveconfig ldap/admin/src/scripts/template-start-slapd \
+ ldap/admin/src/scripts/template-stop-slapd ldap/admin/src/scripts/template-suffix2instance \
+ ldap/admin/src/scripts/template-upgradedb ldap/admin/src/scripts/template-verify-db.pl \
+ ldap/admin/src/scripts/template-vlvindex ldap/admin/src/scripts/Util.pm \
+ ldap/ldif/template-baseacis.ldif ldap/ldif/template-bitwise.ldif ldap/ldif/template-country.ldif \
+ ldap/ldif/template-dnaplugin.ldif ldap/ldif/template-domain.ldif ldap/ldif/template-dse.ldif \
+ ldap/ldif/template-ldapi-autobind.ldif ldap/ldif/template-ldapi-default.ldif \
+ ldap/ldif/template-ldapi.ldif ldap/ldif/template-locality.ldif ldap/ldif/template-org.ldif \
+ ldap/ldif/template-orgunit.ldif ldap/ldif/template-pampta.ldif ldap/ldif/template-sasl.ldif \
+ ldap/ldif/template-state.ldif ldap/ldif/template-suffix-db.ldif
dirver.h: Makefile
perl $(srcdir)/dirver.pl -v "$(VERSION)" -o dirver.h
@@ -262,6 +287,27 @@
ldap/servers/snmp/RFC1155-SMI.txt \
ldap/servers/snmp/SNMPv2-SMI.txt
+#------------------------
+# man pages
+#------------------------
+dist_man_MANS = man/man1/dbscan.1 \
+ man/man1/cl-dump.1 \
+ man/man1/dbgen.pl.1 \
+ man/man1/dsktune.1 \
+ man/man1/infadd.1 \
+ man/man1/ldap-agent.1 \
+ man/man1/ldclt.1 \
+ man/man1/ldif.1 \
+ man/man1/logconv.pl.1 \
+ man/man1/migratecred.1 \
+ man/man1/mmldif.1 \
+ man/man1/pwdhash.1 \
+ man/man1/repl-monitor.1 \
+ man/man1/rsearch.1 \
+ man/man8/migrate-ds.pl.8 \
+ man/man8/ns-slapd.8 \
+ man/man8/setup-ds.pl.8
+
#////////////////////////////////////////////////////////////////
#
# Server Strings
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- configure.ac 30 May 2008 15:38:59 -0000 1.48
+++ configure.ac 15 Jul 2008 15:50:55 -0000 1.49
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
# This version is the version returned by ns-slapd -v
-AC_INIT([dirsrv], [1.1.1], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv], [1.1.2], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
@@ -214,6 +214,12 @@
perldir=/$PACKAGE_NAME/perl
fi
+# if mandir is the default value, override it
+# otherwise, the user must have set it - just use it
+if test X"$mandir" = X'${prefix}/man' ; then
+ mandir='$(datadir)/man'
+fi
+
# Shared paths for all layouts
# relative to sysconfdir
configdir=/$PACKAGE_NAME/config
@@ -234,6 +240,7 @@
AC_SUBST(perldir)
AC_SUBST(infdir)
AC_SUBST(mibdir)
+AC_SUBST(mandir)
AC_SUBST(defaultuser)
AC_SUBST(defaultgroup)
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- aclocal.m4 2 Jul 2008 16:14:39 -0000 1.69
+++ aclocal.m4 15 Jul 2008 15:50:55 -0000 1.70
@@ -1578,10 +1578,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4288,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4421,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4437,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4517,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6353,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- configure 2 Jul 2008 16:14:39 -0000 1.86
+++ configure 15 Jul 2008 15:50:55 -0000 1.87
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv 1.1.1.
+# Generated by GNU Autoconf 2.59 for dirsrv 1.1.2.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv'
PACKAGE_TARNAME='dirsrv'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='dirsrv 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='dirsrv 1.1.2'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor 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 debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -954,7 +954,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 1.1.1 to adapt to many kinds of systems.
+\`configure' configures dirsrv 1.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv 1.1.1:";;
+ short | recursive ) echo "Configuration of dirsrv 1.1.2:";;
esac
cat <<\_ACEOF
@@ -1203,7 +1203,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv configure 1.1.1
+dirsrv configure 1.1.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1217,7 +1217,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 $as_me 1.1.1, which was
+It was created by dirsrv $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1863,7 +1863,7 @@
# Define the identity of the package.
PACKAGE='dirsrv'
- VERSION='1.1.1'
+ VERSION='1.1.2'
cat >>confdefs.h <<_ACEOF
@@ -3838,6 +3838,7 @@
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
@@ -3872,6 +3873,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4312,7 +4314,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4315 "configure"' > conftest.$ac_ext
+ echo '#line 4317 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5447,7 +5449,7 @@
# Provide some information about the compiler.
-echo "$as_me:5450:" \
+echo "$as_me:5452:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6510,11 +6512,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6513: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6515: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6517: \$? = $ac_status" >&5
+ echo "$as_me:6519: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6778,11 +6780,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6781: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6783: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6785: \$? = $ac_status" >&5
+ echo "$as_me:6787: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6882,11 +6884,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6885: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6887: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6889: \$? = $ac_status" >&5
+ echo "$as_me:6891: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8347,10 +8349,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 8356 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9227,7 +9250,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9230 "configure"
+#line 9253 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9327,7 +9350,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9330 "configure"
+#line 9353 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9658,6 +9681,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -9791,11 +9817,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects
+predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects
+postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -9807,7 +9833,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -9887,7 +9913,7 @@
link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -11667,11 +11693,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11670: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11696: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11674: \$? = $ac_status" >&5
+ echo "$as_me:11700: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11771,11 +11797,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11774: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11800: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11778: \$? = $ac_status" >&5
+ echo "$as_me:11804: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12303,10 +12329,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 12336 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12690,6 +12737,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12823,11 +12873,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12839,7 +12889,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12919,7 +12969,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13341,11 +13391,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13344: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13394: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13348: \$? = $ac_status" >&5
+ echo "$as_me:13398: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13445,11 +13495,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13448: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13498: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13452: \$? = $ac_status" >&5
+ echo "$as_me:13502: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14890,10 +14940,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 14947 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15277,6 +15348,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15410,11 +15484,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15426,7 +15500,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15506,7 +15580,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15648,11 +15722,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15651: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15725: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15655: \$? = $ac_status" >&5
+ echo "$as_me:15729: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15916,11 +15990,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15919: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15993: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15923: \$? = $ac_status" >&5
+ echo "$as_me:15997: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16020,11 +16094,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16023: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16097: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16027: \$? = $ac_status" >&5
+ echo "$as_me:16101: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17485,10 +17559,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 17566 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17872,6 +17967,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18005,11 +18103,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18021,7 +18119,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18101,7 +18199,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18353,6 +18451,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18486,11 +18587,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18502,7 +18603,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18582,7 +18683,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23126,6 +23227,12 @@
perldir=/$PACKAGE_NAME/perl
fi
+# if mandir is the default value, override it
+# otherwise, the user must have set it - just use it
+if test X"$mandir" = X'${prefix}/man' ; then
+ mandir='$(datadir)/man'
+fi
+
# Shared paths for all layouts
# relative to sysconfdir
configdir=/$PACKAGE_NAME/config
@@ -23150,6 +23257,7 @@
+
# check for --with-instconfigdir
echo "$as_me:$LINENO: checking for --with-instconfigdir" >&5
echo $ECHO_N "checking for --with-instconfigdir... $ECHO_C" >&6
@@ -25687,7 +25795,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv $as_me 1.1.1, which was
+This file was extended by dirsrv $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25750,7 +25858,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dirsrv config.status 1.1.1
+dirsrv config.status 1.1.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -26003,6 +26111,7 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Makefile.in 2 Jul 2008 16:14:38 -0000 1.91
+++ Makefile.in 15 Jul 2008 15:50:55 -0000 1.92
@@ -47,10 +47,10 @@
pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT)
noinst_PROGRAMS = makstrdb$(EXEEXT)
@SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure compile config.guess config.sub \
- depcomp install-sh ltmain.sh missing
+DIST_COMMON = $(am__configure_deps) $(dist_man_MANS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/configure compile \
+ config.guess config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \
@@ -95,7 +95,8 @@
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
"$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" \
- "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
+ "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" \
"$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" \
"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \
"$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
@@ -775,6 +776,10 @@
$(makstrdb_SOURCES) $(migratecred_bin_SOURCES) \
$(mmldif_bin_SOURCES) $(am__ns_slapd_SOURCES_DIST) \
$(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
+man1dir = $(mandir)/man1
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(dist_man_MANS)
configDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
mibDATA_INSTALL = $(INSTALL_DATA)
@@ -862,6 +867,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -1017,7 +1023,7 @@
# Linker Flags
#------------------------
NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+NSS_LINK = @nss_lib@ -lssl3 -lnss3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
DB_LINK = @db_lib@ -ldb-@db_libver@
SASL_LINK = @sasl_lib@ -lsasl2
@@ -1030,7 +1036,33 @@
# Generated Sources
#------------------------
BUILT_SOURCES = dirver.h dberrstrs.h
-CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
+CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties \
+ ldap/admin/src/scripts/dscreate.map \
+ ldap/admin/src/scripts/DSCreate.pm ldap/admin/src/scripts/DSMigration.pm \
+ ldap/admin/src/scripts/dsorgentries.map ldap/admin/src/scripts/migrate-ds.pl \
+ ldap/admin/src/scripts/Migration.pm ldap/admin/src/scripts/SetupDialogs.pm \
+ ldap/admin/src/scripts/setup-ds.pl ldap/admin/src/scripts/setup-ds.res \
+ ldap/admin/src/scripts/Setup.pm ldap/admin/src/scripts/template-bak2db \
+ ldap/admin/src/scripts/template-bak2db.pl ldap/admin/src/scripts/template-db2bak \
+ ldap/admin/src/scripts/template-db2bak.pl ldap/admin/src/scripts/template-db2index \
+ ldap/admin/src/scripts/template-db2index.pl ldap/admin/src/scripts/template-db2ldif \
+ ldap/admin/src/scripts/template-db2ldif.pl ldap/admin/src/scripts/template-dbverify \
+ ldap/admin/src/scripts/template-ldif2db ldap/admin/src/scripts/template-ldif2db.pl \
+ ldap/admin/src/scripts/template-ldif2ldap ldap/admin/src/scripts/template-monitor \
+ ldap/admin/src/scripts/template-ns-accountstatus.pl ldap/admin/src/scripts/template-ns-activate.pl \
+ ldap/admin/src/scripts/template-ns-inactivate.pl ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
+ ldap/admin/src/scripts/template-restart-slapd ldap/admin/src/scripts/template-restoreconfig \
+ ldap/admin/src/scripts/template-saveconfig ldap/admin/src/scripts/template-start-slapd \
+ ldap/admin/src/scripts/template-stop-slapd ldap/admin/src/scripts/template-suffix2instance \
+ ldap/admin/src/scripts/template-upgradedb ldap/admin/src/scripts/template-verify-db.pl \
+ ldap/admin/src/scripts/template-vlvindex ldap/admin/src/scripts/Util.pm \
+ ldap/ldif/template-baseacis.ldif ldap/ldif/template-bitwise.ldif ldap/ldif/template-country.ldif \
+ ldap/ldif/template-dnaplugin.ldif ldap/ldif/template-domain.ldif ldap/ldif/template-dse.ldif \
+ ldap/ldif/template-ldapi-autobind.ldif ldap/ldif/template-ldapi-default.ldif \
+ ldap/ldif/template-ldapi.ldif ldap/ldif/template-locality.ldif ldap/ldif/template-org.ldif \
+ ldap/ldif/template-orgunit.ldif ldap/ldif/template-pampta.ldif ldap/ldif/template-sasl.ldif \
+ ldap/ldif/template-state.ldif ldap/ldif/template-suffix-db.ldif
+
taskdir = $(datadir)@scripttemplatedir@
server_LTLIBRARIES = libslapd.la libns-dshttpd.la
@@ -1187,6 +1219,28 @@
ldap/servers/snmp/SNMPv2-SMI.txt
+#------------------------
+# man pages
+#------------------------
+dist_man_MANS = man/man1/dbscan.1 \
+ man/man1/cl-dump.1 \
+ man/man1/dbgen.pl.1 \
+ man/man1/dsktune.1 \
+ man/man1/infadd.1 \
+ man/man1/ldap-agent.1 \
+ man/man1/ldclt.1 \
+ man/man1/ldif.1 \
+ man/man1/logconv.pl.1 \
+ man/man1/migratecred.1 \
+ man/man1/mmldif.1 \
+ man/man1/pwdhash.1 \
+ man/man1/repl-monitor.1 \
+ man/man1/rsearch.1 \
+ man/man8/migrate-ds.pl.8 \
+ man/man8/ns-slapd.8 \
+ man/man8/setup-ds.pl.8
+
+
#////////////////////////////////////////////////////////////////
#
# Server Strings
@@ -8705,6 +8759,96 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.8*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+ *) ext='8' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+ done
+uninstall-man8:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.8*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+ *) ext='8' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+ done
install-configDATA: $(config_DATA)
@$(NORMAL_INSTALL)
test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
@@ -8876,7 +9020,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/m4
+ $(mkdir_p) $(distdir)/m4 $(distdir)/man/man1 $(distdir)/man/man8
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -9004,9 +9148,9 @@
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
- $(DATA) config.h
+ $(MANS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -9135,9 +9279,10 @@
info-am:
install-data-am: install-configDATA install-infDATA \
- install-initSCRIPTS install-initconfigSCRIPTS install-mibDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
- install-propertyDATA install-sampledataDATA install-schemaDATA \
+ install-initSCRIPTS install-initconfigSCRIPTS install-man \
+ install-mibDATA install-nodist_propertyDATA \
+ install-perlSCRIPTS install-propertyDATA \
+ install-sampledataDATA install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
install-taskSCRIPTS
@@ -9146,7 +9291,7 @@
install-info: install-info-am
-install-man:
+install-man: install-man1 install-man8
installcheck-am:
@@ -9173,13 +9318,15 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-infDATA uninstall-info-am \
uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \
- uninstall-mibDATA uninstall-nodist_propertyDATA \
+ uninstall-man uninstall-mibDATA uninstall-nodist_propertyDATA \
uninstall-perlSCRIPTS uninstall-propertyDATA \
uninstall-sampledataDATA uninstall-sbinPROGRAMS \
uninstall-sbinSCRIPTS uninstall-schemaDATA \
uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
uninstall-taskSCRIPTS
+uninstall-man: uninstall-man1 uninstall-man8
+
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool \
clean-noinstLIBRARIES clean-noinstPROGRAMS clean-sbinPROGRAMS \
@@ -9193,10 +9340,10 @@
install-data install-data-am install-exec install-exec-am \
install-infDATA install-info install-info-am \
install-initSCRIPTS install-initconfigSCRIPTS install-man \
- install-mibDATA install-nodist_propertyDATA \
- install-perlSCRIPTS install-propertyDATA \
- install-sampledataDATA install-sbinPROGRAMS \
- install-sbinSCRIPTS install-schemaDATA \
+ install-man1 install-man8 install-mibDATA \
+ install-nodist_propertyDATA install-perlSCRIPTS \
+ install-propertyDATA install-sampledataDATA \
+ install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
install-strip install-taskSCRIPTS installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
@@ -9205,12 +9352,12 @@
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-infDATA uninstall-info-am \
uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \
- uninstall-mibDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA \
- uninstall-sampledataDATA uninstall-sbinPROGRAMS \
- uninstall-sbinSCRIPTS uninstall-schemaDATA \
- uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
- uninstall-taskSCRIPTS
+ uninstall-man uninstall-man1 uninstall-man8 uninstall-mibDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA uninstall-sampledataDATA \
+ uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
+ uninstall-schemaDATA uninstall-serverLTLIBRARIES \
+ uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
dirver.h: Makefile
15 years, 9 months
[Fedora-directory-commits] adminserver Makefile.am, 1.40, 1.41 configure.ac, 1.26, 1.27 aclocal.m4, 1.40, 1.41 configure, 1.44, 1.45 missing, 1.30, 1.31 install-sh, 1.30, 1.31 Makefile.in, 1.47, 1.48 depcomp, 1.30, 1.31 config.sub, 1.30, 1.31 config.guess, 1.30, 1.31 compile, 1.29, 1.30
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18946/adminserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh Makefile.in depcomp config.sub config.guess compile
Log Message:
bump version to 1.1.6
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.am 9 Jun 2008 15:57:12 -0000 1.40
+++ Makefile.am 14 Jul 2008 23:51:43 -0000 1.41
@@ -48,19 +48,15 @@
install-data-hook:
@for file in $(RESOURCE_BUNDLES_ROOT) ; do \
- basefile=`basename $$file` ; \
- destdir=`dirname $$file` ; \
- progname=`basename $$destdir` ; \
- destfile=$$progname/$$basefile ; \
- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$(DESTDIR)$(propertydir)/$$destfile'"; \
- $(mkdir_p) "$(DESTDIR)$(propertydir)/$$progname" ; \
- cp "$$file" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
- cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en.res" || exit 1; \
- cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en_US.res" || exit 1; \
+ progdir=`dirname $$file` ; \
+ progname=`basename $$progdir` ; \
+ destdir="$(DESTDIR)$(propertydir)/$$progname" ; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \
+ test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir/en.res" || exit 1 ; \
+ cp "$$file" "$$destdir/en_US.res" || exit 1 ; \
done
-# the makefile creates this one, but there seems to be no way to tell it not
-# to, so we have to remove it before it causes problems
- rm -f $(DESTDIR)$(propertydir)/root.res
cgibindir = $(libdir)@cgibindir@
cmdbindir = $(sbindir)
@@ -97,8 +93,7 @@
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
-libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
- lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
+libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c
libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
@@ -371,14 +366,14 @@
# This bundle must be always distributed and there is no need to have
# *_en.properties resource bundle source files.
RESOURCE_BUNDLES_ROOT = \
- admserv/cgi-src40/admpw/root.res \
- admserv/cgi-src40/security/root.res admserv/cgi-src40/config/root.res \
- admserv/cgi-src40/stopsrv/root.res \
- admserv/cgi-src40/dsconfig/root.res admserv/cgi-src40/monreplication/root.res \
- admserv/cgi-src40/ugdsconfig/root.res admserv/cgi-src40/htmladmin/root.res \
- admserv/cgi-src40/restartsrv/root.res admserv/cgi-src40/viewdata/root.res \
- admserv/cgi-src40/sec-activate/root.res \
- admserv/cgi-src40/viewlog/root.res
+ properties/admpw/root.res \
+ properties/security/root.res properties/config/root.res \
+ properties/stopsrv/root.res \
+ properties/dsconfig/root.res properties/monreplication/root.res \
+ properties/ugdsconfig/root.res properties/htmladmin/root.res \
+ properties/restartsrv/root.res properties/viewdata/root.res \
+ properties/sec-activate/root.res properties/viewlog/root.res \
+ properties/cgicommon/root.res
MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT)
# ICU resource file installation is handled specially
@@ -396,6 +391,10 @@
# German resource bundles (for the German localization in the future)
#RESOURCE_BUNDLES_DE = foo_de.res
+properties/%/root.res : admserv/cgi-src40/%.properties
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
+
%/root.res : %.properties
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.ac 9 Jun 2008 15:57:12 -0000 1.26
+++ configure.ac 14 Jul 2008 23:51:43 -0000 1.27
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dirsrv-admin], [1.1.5], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-admin], [1.1.6], [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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- configure 9 Jun 2008 15:57:12 -0000 1.44
+++ configure 14 Jul 2008 23:51:43 -0000 1.45
@@ -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.5.
+# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.6.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv-admin'
PACKAGE_TARNAME='dirsrv-admin'
-PACKAGE_VERSION='1.1.5'
-PACKAGE_STRING='dirsrv-admin 1.1.5'
+PACKAGE_VERSION='1.1.6'
+PACKAGE_STRING='dirsrv-admin 1.1.6'
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.5 to adapt to many kinds of systems.
+\`configure' configures dirsrv-admin 1.1.6 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.5:";;
+ short | recursive ) echo "Configuration of dirsrv-admin 1.1.6:";;
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.5
+dirsrv-admin configure 1.1.6
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.5, which was
+It was created by dirsrv-admin $as_me 1.1.6, 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.5'
+ VERSION='1.1.6'
cat >>confdefs.h <<_ACEOF
@@ -25613,7 +25613,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv-admin $as_me 1.1.5, which was
+This file was extended by dirsrv-admin $as_me 1.1.6, 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.5
+dirsrv-admin config.status 1.1.6
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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.in 9 Jun 2008 15:57:12 -0000 1.47
+++ Makefile.in 14 Jul 2008 23:51:43 -0000 1.48
@@ -104,9 +104,7 @@
libds_admin_serv_la_LIBADD =
am__objects_1 = lib/base/file.lo lib/base/nscperror.lo \
lib/base/system.lo lib/base/nscputil.lo
-am__objects_2 = lib/libsi18n/coreres.lo lib/libsi18n/getlang.lo \
- lib/libsi18n/getstrprop.lo lib/libsi18n/propset.lo \
- lib/libsi18n/reshash.lo lib/libsi18n/txtfile.lo
+am__objects_2 = lib/libsi18n/getstrprop.lo
am__objects_3 = lib/libadmin/cluster.lo lib/libadmin/dllglue.lo \
lib/libadmin/error.lo lib/libadmin/form_get.lo \
lib/libadmin/httpcon.lo lib/libadmin/install.lo \
@@ -506,9 +504,7 @@
libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
lib/base/system.cpp lib/base/nscputil.cpp
-libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
- lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
-
+libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c
libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
@@ -741,14 +737,14 @@
# This bundle must be always distributed and there is no need to have
# *_en.properties resource bundle source files.
RESOURCE_BUNDLES_ROOT = \
- admserv/cgi-src40/admpw/root.res \
- admserv/cgi-src40/security/root.res admserv/cgi-src40/config/root.res \
- admserv/cgi-src40/stopsrv/root.res \
- admserv/cgi-src40/dsconfig/root.res admserv/cgi-src40/monreplication/root.res \
- admserv/cgi-src40/ugdsconfig/root.res admserv/cgi-src40/htmladmin/root.res \
- admserv/cgi-src40/restartsrv/root.res admserv/cgi-src40/viewdata/root.res \
- admserv/cgi-src40/sec-activate/root.res \
- admserv/cgi-src40/viewlog/root.res
+ properties/admpw/root.res \
+ properties/security/root.res properties/config/root.res \
+ properties/stopsrv/root.res \
+ properties/dsconfig/root.res properties/monreplication/root.res \
+ properties/ugdsconfig/root.res properties/htmladmin/root.res \
+ properties/restartsrv/root.res properties/viewdata/root.res \
+ properties/sec-activate/root.res properties/viewlog/root.res \
+ properties/cgicommon/root.res
# ICU resource file installation is handled specially
nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
@@ -1006,18 +1002,8 @@
lib/libsi18n/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) lib/libsi18n/$(DEPDIR)
@: > lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/coreres.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/getlang.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
lib/libsi18n/getstrprop.lo: lib/libsi18n/$(am__dirstamp) \
lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/propset.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/reshash.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/txtfile.lo: lib/libsi18n/$(am__dirstamp) \
- lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
lib/libadmin/$(am__dirstamp):
@$(mkdir_p) lib/libadmin
@: > lib/libadmin/$(am__dirstamp)
@@ -1375,18 +1361,8 @@
-rm -f lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_updown.$(OBJEXT)
-rm -f lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT)
- -rm -f lib/libsi18n/coreres.$(OBJEXT)
- -rm -f lib/libsi18n/coreres.lo
- -rm -f lib/libsi18n/getlang.$(OBJEXT)
- -rm -f lib/libsi18n/getlang.lo
-rm -f lib/libsi18n/getstrprop.$(OBJEXT)
-rm -f lib/libsi18n/getstrprop.lo
- -rm -f lib/libsi18n/propset.$(OBJEXT)
- -rm -f lib/libsi18n/propset.lo
- -rm -f lib/libsi18n/reshash.$(OBJEXT)
- -rm -f lib/libsi18n/reshash.lo
- -rm -f lib/libsi18n/txtfile.$(OBJEXT)
- -rm -f lib/libsi18n/txtfile.lo
distclean-compile:
-rm -f *.tab.c
@@ -1440,12 +1416,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_updown.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Po(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/coreres.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/getlang.Plo(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/getstrprop.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/propset.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/reshash.Plo(a)am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/txtfile.Plo(a)am__quote@
.c.o:
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -2359,19 +2330,15 @@
install-data-hook:
@for file in $(RESOURCE_BUNDLES_ROOT) ; do \
- basefile=`basename $$file` ; \
- destdir=`dirname $$file` ; \
- progname=`basename $$destdir` ; \
- destfile=$$progname/$$basefile ; \
- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$(DESTDIR)$(propertydir)/$$destfile'"; \
- $(mkdir_p) "$(DESTDIR)$(propertydir)/$$progname" ; \
- cp "$$file" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
- cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en.res" || exit 1; \
- cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en_US.res" || exit 1; \
- done
-# the makefile creates this one, but there seems to be no way to tell it not
-# to, so we have to remove it before it causes problems
- rm -f $(DESTDIR)$(propertydir)/root.res
+ progdir=`dirname $$file` ; \
+ progname=`basename $$progdir` ; \
+ destdir="$(DESTDIR)$(propertydir)/$$progname" ; \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \
+ test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir" || exit 1 ; \
+ cp "$$file" "$$destdir/en.res" || exit 1 ; \
+ cp "$$file" "$$destdir/en_US.res" || exit 1 ; \
+ done
# French resource bundles (for the French localization in the future)
#RESOURCE_BUNDLES_FR = foo_fr.res
@@ -2379,6 +2346,10 @@
# German resource bundles (for the German localization in the future)
#RESOURCE_BUNDLES_DE = foo_de.res
+properties/%/root.res : admserv/cgi-src40/%.properties
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
+
%/root.res : %.properties
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/bitwise bitwise.c, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/bitwise
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15672/ldapserver/ldap/servers/plugins/bitwise
Modified Files:
bitwise.c
Log Message:
Resolves: bug 428765
Bug Description: leak in bitwise plugin
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: The bitwise plugin should first check to make sure the requested OID is one that it can handle.
Platforms tested: RHEL5, Fedora 8, Fedora 9
Flag Day: no
Doc impact: no
Index: bitwise.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/bitwise/bitwise.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bitwise.c 18 Oct 2007 00:08:28 -0000 1.2
+++ bitwise.c 14 Jul 2008 23:31:33 -0000 1.3
@@ -167,14 +167,18 @@
!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_TYPE, &mrTYPE) && mrTYPE != NULL &&
!slapi_pblock_get (pb, SLAPI_PLUGIN_MR_VALUE, &mrVALUE) && mrVALUE != NULL) {
- struct bitwise_match_cb *bmc = new_bitwise_match_cb(mrTYPE, mrVALUE);
- slapi_pblock_set (pb, SLAPI_PLUGIN_OBJECT, bmc);
- slapi_pblock_set (pb, SLAPI_PLUGIN_DESTROY_FN, (void*)bitwise_filter_destroy);
+ struct bitwise_match_cb *bmc = NULL;
if (strcmp(mrOID, "1.2.840.113556.1.4.803") == 0) {
slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_MATCH_FN, (void*)bitwise_filter_match_and);
} else if (strcmp(mrOID, "1.2.840.113556.1.4.804") == 0) {
slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_MATCH_FN, (void*)bitwise_filter_match_or);
+ } else { /* this oid not handled by this plugin */
+ LDAPDebug (LDAP_DEBUG_FILTER, "=> bitwise_filter_create OID (%s) not handled\n", mrOID, 0, 0);
+ return rc;
}
+ bmc = new_bitwise_match_cb(mrTYPE, mrVALUE);
+ slapi_pblock_set (pb, SLAPI_PLUGIN_OBJECT, bmc);
+ slapi_pblock_set (pb, SLAPI_PLUGIN_DESTROY_FN, (void*)bitwise_filter_destroy);
rc = LDAP_SUCCESS;
} else {
LDAPDebug (LDAP_DEBUG_FILTER, "=> bitwise_filter_create missing parameter(s)\n", 0, 0, 0);
@@ -190,9 +194,6 @@
bitwise_init (Slapi_PBlock* pb)
{
int rc;
- int argc;
- char** argv;
- char* cfgpath;
rc = slapi_pblock_set (pb, SLAPI_PLUGIN_MR_FILTER_CREATE_FN, (void*)bitwise_filter_create);
if ( rc == 0 ) {
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Util.pm.in, 1.16, 1.17
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14358/ldapserver/ldap/admin/src/scripts
Modified Files:
Util.pm.in
Log Message:
Reviewed by: nkinder (Thanks!)
Branch: HEAD
Fix Description: Set SO_REUSEADDR to make sure the port is really available.
Platforms tested: RHEL5, Fedora 8, Fedora 9
Flag Day: no
Doc impact: no
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Util.pm.in 17 Dec 2007 23:49:50 -0000 1.16
+++ Util.pm.in 14 Jul 2008 23:25:41 -0000 1.17
@@ -78,6 +78,7 @@
my $proto = getprotobyname('tcp');
my $rc = socket(SOCK, PF_INET, SOCK_STREAM, $proto);
if ($rc == 1) {
+ setsockopt(SOCK, SOL_SOCKET, SO_REUSEADDR, 1);
$rc = bind(SOCK, sockaddr_in($port, INADDR_ANY));
}
close(SOCK);
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts setup-ds.res.in, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13757/ldapserver/ldap/admin/src/scripts
Modified Files:
setup-ds.res.in
Log Message:
Resolves: bug 440899
Bug Description: setup-ds.pl password prompt loops in Confirm prompt
Reviewed by: nkinder (Thanks!)
Branch: HEAD
Fix Description: Just make sure the prompt tells the user that they can hit Control-B Enter at any time to go back if they need to re-enter the password.
Platforms tested: RHEL5, Fedora 8, Fedora 9
Flag Day: no
Doc impact: no
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setup-ds.res.in 21 Nov 2007 20:27:38 -0000 1.12
+++ setup-ds.res.in 14 Jul 2008 23:20:23 -0000 1.13
@@ -68,7 +68,7 @@
dialog_dssuffix_error = The suffix '%s' is not a valid DN. Please choose another one.\n\n
# ----------- DS Root DN and password Dialog Resource ----------------
-dialog_dsrootdn_text = Certain directory server operations require an administrative user.\nThis user is referred to as the Directory Manager and typically has a\nbind Distinguished Name (DN) of cn=Directory Manager.\nYou will also be prompted for the password for this user. The password must\nbe at least 8 characters long, and contain no spaces.\n\n
+dialog_dsrootdn_text = Certain directory server operations require an administrative user.\nThis user is referred to as the Directory Manager and typically has a\nbind Distinguished Name (DN) of cn=Directory Manager.\nYou will also be prompted for the password for this user. The password must\nbe at least 8 characters long, and contain no spaces.\nPress Control-B then Enter to back up and start over.\n\n
dialog_dsrootdn_prompt = Directory Manager DN
dialog_dsrootdn_error = The input '%s' is not a valid DN. Please choose another one.\n\n
dialog_dsrootpw_prompt1 = Password
@@ -125,3 +125,5 @@
error_server_already_exists = Error: the server already exists at '%s'\
Please remove it first if you really want to recreate it,\
or use a different ServerIdentifier to create another instance.\n
+error_opening_init_ldif = Could not open the initial LDIF file '%s'.\
+The file was not found or could not be read.\n
\ No newline at end of file
15 years, 9 months