[Fedora-directory-commits] ldapserver/ldap/servers/snmp main.c, 1.13, 1.14
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/snmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9009/ldap/servers/snmp
Modified Files:
main.c
Log Message:
Resolves: 338611
Summary: Sleep longer when waiting for ldap-agent to start.
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- main.c 18 Oct 2007 01:22:29 -0000 1.13
+++ main.c 18 Oct 2007 19:20:16 -0000 1.14
@@ -172,15 +172,23 @@
/* run as a daemon */
if (netsnmp_daemonize(0, 0)) {
+ int i;
+
/* sleep to allow pidfile to be created by child */
- sleep(5);
- if((pid_fp = fopen(pidfile,"r")) == NULL) {
- printf("ldap-agent: Not started! Check log file for details.\n");
+ for (i=0; i < 3; i++) {
+ sleep(5);
+ if((pid_fp = fopen(pidfile,"r")) != NULL) {
+ break;
+ }
+ }
+
+ if(!pid_fp) {
+ printf("ldap-agent: Not started after 15 seconds! Check log file for details.\n");
exit(1);
- } else {
- fscanf(pid_fp, "%d", &child_pid);
- fclose(pid_fp);
}
+
+ fscanf(pid_fp, "%d", &child_pid);
+ fclose(pid_fp);
printf("ldap-agent: Started as pid %d\n", child_pid);
exit(1);
}
@@ -315,7 +323,7 @@
}
} else if ((p = strstr(line, "server")) != NULL) {
int got_port = 0;
- int got_tmpdir = 0;
+ int got_rundir = 0;
int lineno = 0;
char *entry = NULL;
char *instancename = NULL;
@@ -376,7 +384,7 @@
if ((strcmp(attr, "dn") == 0) &&
(strcmp(val, "cn=config") == 0)) {
char *dse_line = NULL;
- /* Look for port and tmpdir attributes */
+ /* Look for port and rundir attributes */
while ((dse_line = ldif_getline(&entryp)) != NULL) {
ldif_parse_line(dse_line, &attr, &val, &vlen);
if (strcmp(attr, "nsslapd-port") == 0) {
@@ -396,16 +404,16 @@
instancename = NULL;
goto close_and_exit;
}
- got_tmpdir = 1;
+ got_rundir = 1;
}
/* Stop processing this entry if we found the
- * port and tmpdir settings */
- if (got_port && got_tmpdir) {
+ * port and rundir settings */
+ if (got_port && got_rundir) {
break;
}
}
- /* The port and tmpdir settings must be in the
+ /* The port and rundir settings must be in the
* cn=config entry, so we can stop reading through
* the dse.ldif now. */
break;
@@ -425,8 +433,8 @@
"server config file: %s\n", serv_p->dse_ldif);
error = 1;
goto close_and_exit;
- } else if (!got_tmpdir) {
- printf("ldap-agent: Error reading nsslapd-tmpdir from "
+ } else if (!got_rundir) {
+ printf("ldap-agent: Error reading nsslapd-rundir from "
"server config file: %s\n", serv_p->dse_ldif);
error = 1;
goto close_and_exit;
16 years, 6 months
[Fedora-directory-commits] mod_nss mod_nss.c, 1.16, 1.17 mod_nss.h, 1.18, 1.19 nss_engine_vars.c, 1.9, 1.10
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30785
Modified Files:
mod_nss.c mod_nss.h nss_engine_vars.c
Log Message:
If mod_ssl isn't loaded then register the hooks to mod_proxy so we can
do at least secure proxy in front of an unsecure host.
Index: mod_nss.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_nss.c 31 May 2007 21:36:03 -0000 1.16
+++ mod_nss.c 18 Oct 2007 18:26:21 -0000 1.17
@@ -200,6 +200,10 @@
return 1;
}
+int ssl_proxy_enable(conn_rec *c) {
+ return nss_proxy_enable(c);
+}
+
int nss_engine_disable(conn_rec *c)
{
SSLSrvConfigRec *sc = mySrvConfig(c->base_server);
@@ -217,6 +221,10 @@
return 1;
}
+int ssl_engine_disable(conn_rec *c) {
+ return nss_engine_disable(c);
+}
+
/* Callback for an incoming certificate that is not valid */
SECStatus NSSBadCertHandler(void *arg, PRFileDesc * socket)
@@ -430,6 +438,12 @@
APR_REGISTER_OPTIONAL_FN(nss_proxy_enable);
APR_REGISTER_OPTIONAL_FN(nss_engine_disable);
+
+ /* If mod_ssl is not loaded then mod_nss can work with mod_proxy */
+ if (APR_RETRIEVE_OPTIONAL_FN(ssl_proxy_enable) == NULL)
+ APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
+ if (APR_RETRIEVE_OPTIONAL_FN(ssl_engine_disable) == NULL)
+ APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
}
module AP_MODULE_DECLARE_DATA nss_module = {
Index: mod_nss.h
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_nss.h 31 May 2007 21:36:03 -0000 1.18
+++ mod_nss.h 18 Oct 2007 18:26:21 -0000 1.19
@@ -419,24 +419,34 @@
/* Variables */
void nss_var_register(void);
char *nss_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
+char *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
void nss_var_log_config_register(apr_pool_t *p);
APR_DECLARE_OPTIONAL_FN(char *, nss_var_lookup,
(apr_pool_t *, server_rec *,
conn_rec *, request_rec *,
char *));
+APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
+ (apr_pool_t *, server_rec *,
+ conn_rec *, request_rec *,
+ char *));
/* An optional function which returns non-zero if the given connection
* is using SSL/TLS. */
APR_DECLARE_OPTIONAL_FN(int, nss_is_https, (conn_rec *));
+APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
/* Proxy Support */
int nss_proxy_enable(conn_rec *c);
int nss_engine_disable(conn_rec *c);
+int ssl_proxy_enable(conn_rec *c);
+int ssl_engine_disable(conn_rec *c);
APR_DECLARE_OPTIONAL_FN(int, nss_proxy_enable, (conn_rec *));
+APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
APR_DECLARE_OPTIONAL_FN(int, nss_engine_disable, (conn_rec *));
+APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
/* I/O */
PRFileDesc * nss_io_new_fd();
Index: nss_engine_vars.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_vars.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nss_engine_vars.c 31 May 2007 21:36:03 -0000 1.9
+++ nss_engine_vars.c 18 Oct 2007 18:26:21 -0000 1.10
@@ -46,10 +46,21 @@
return sslconn && sslconn->ssl;
}
+static int ssl_is_https(conn_rec *c) {
+ return nss_is_https(c);
+}
+
void nss_var_register(void)
{
APR_REGISTER_OPTIONAL_FN(nss_is_https);
APR_REGISTER_OPTIONAL_FN(nss_var_lookup);
+
+ /* These can only be registered if mod_ssl is not loaded */
+ if (APR_RETRIEVE_OPTIONAL_FN(ssl_is_https) == NULL)
+ APR_REGISTER_OPTIONAL_FN(ssl_is_https);
+ if (APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup) == NULL)
+ APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
+
return;
}
@@ -241,6 +252,10 @@
return result;
}
+char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, char *var) {
+ return nss_var_lookup(p, s, c, r, var);
+}
+
static char *nss_var_lookup_header(apr_pool_t *p, request_rec *r, const char *name)
{
char *hdr = NULL;
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd snmp_collator.c, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24642
Modified Files:
snmp_collator.c
Log Message:
Have to free instdir not instname
Index: snmp_collator.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/snmp_collator.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- snmp_collator.c 18 Oct 2007 01:22:29 -0000 1.12
+++ snmp_collator.c 18 Oct 2007 14:05:24 -0000 1.13
@@ -421,7 +421,7 @@
statspath, instname, AGT_STATS_EXTENSION);
tmpstatsfile = szStatsFile;
slapi_ch_free_string(&statspath);
- slapi_ch_free_string(&instname);
+ slapi_ch_free_string(&instdir);
/* open the memory map */
if ((err = agt_mopen_stats(tmpstatsfile, O_RDWR, &hdl) != 0))
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4506/ldapserver/ldap/admin/src/scripts
Modified Files:
DSCreate.pm.in
Log Message:
Resolves: bug 250179
Description: tmpwatch whacks stats
Fix Description: Move the default nsslapd-tmpdir to /tmp.
Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSCreate.pm.in 28 Sep 2007 23:34:55 -0000 1.7
+++ DSCreate.pm.in 18 Oct 2007 01:41:13 -0000 1.8
@@ -774,9 +774,9 @@
if (!defined($inf->{slapd}->{tmp_dir})) {
if ("@with_fhs_opt@") {
- $inf->{slapd}->{tmp_dir} = "$localstatedir/@PACKAGE_NAME@/slapd-$servid/tmp";
+ $inf->{slapd}->{tmp_dir} = "/tmp";
} else {
- $inf->{slapd}->{tmp_dir} = "$localstatedir/tmp/@PACKAGE_NAME@/slapd-$servid";
+ $inf->{slapd}->{tmp_dir} = "/tmp";
}
}
$ENV{DS_TMP_DIR} = $inf->{slapd}->{tmp_dir};
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/snmp main.c, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/snmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3959/ldapserver/ldap/servers/snmp
Modified Files:
main.c
Log Message:
Resolves: bug 250179
Description: tmpwatch whacks stats
Reviewed by: nkinder (Thanks!)
Fix Description: move the snmp slapd.stats file to run_dir (/var/run/dirsrv) and rename to slapd-instance.stats. Had to add nsslapd-rundir to cn=config in order for ldap-agent to be able to get it.
Doc: Yes, we need to document the new attribute nsslapd-rundir.
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- main.c 15 Oct 2007 19:19:32 -0000 1.12
+++ main.c 18 Oct 2007 01:22:29 -0000 1.13
@@ -318,6 +318,7 @@
int got_tmpdir = 0;
int lineno = 0;
char *entry = NULL;
+ char *instancename = NULL;
/* Allocate a server_instance */
if ((serv_p = malloc(sizeof(server_instance))) == NULL) {
@@ -330,6 +331,7 @@
p = p + 6;
if ((p = strtok(p, " \t\n")) != NULL) {
/* first token is the instance name */
+ instancename = strdup(p);
serv_p->dse_ldif = malloc(strlen(p) + strlen(SYSCONFDIR) +
strlen(PACKAGE_NAME) + 12);
if (serv_p->dse_ldif != NULL) {
@@ -341,6 +343,8 @@
} else {
printf("ldap-agent: malloc error processing config file\n");
error = 1;
+ free(instancename);
+ instancename = NULL;
goto close_and_exit;
}
}
@@ -350,6 +354,8 @@
printf("ldap-agent: Error opening server config file: %s\n",
serv_p->dse_ldif);
error = 1;
+ free(instancename);
+ instancename = NULL;
goto close_and_exit;
}
@@ -376,16 +382,18 @@
if (strcmp(attr, "nsslapd-port") == 0) {
serv_p->port = atol(val);
got_port = 1;
- } else if (strcmp(attr, "nsslapd-tmpdir") == 0) {
+ } else if (strcmp(attr, "nsslapd-rundir") == 0) {
serv_p->stats_file = malloc(vlen + 13);
if (serv_p->stats_file != NULL) {
snprintf(serv_p->stats_file, vlen + 13,
- "%s/slapd.stats", val);
+ "%s/%s.stats", instancename, val);
serv_p->stats_file[(vlen + 12)] = (char)0;
} else {
printf("ldap-agent: malloc error processing config file\n");
free(entry);
error = 1;
+ free(instancename);
+ instancename = NULL;
goto close_and_exit;
}
got_tmpdir = 1;
@@ -404,6 +412,8 @@
}
}
+ free(instancename);
+ instancename = NULL;
/* We're done reading entries from dse_ldif now, so
* we can free entry */
free(entry);
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd agtmmap.h, 1.10, 1.11 libglobs.c, 1.22, 1.23 proto-slap.h, 1.30, 1.31 slap.h, 1.29, 1.30 snmp_collator.c, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3959/ldapserver/ldap/servers/slapd
Modified Files:
agtmmap.h libglobs.c proto-slap.h slap.h snmp_collator.c
Log Message:
Resolves: bug 250179
Description: tmpwatch whacks stats
Reviewed by: nkinder (Thanks!)
Fix Description: move the snmp slapd.stats file to run_dir (/var/run/dirsrv) and rename to slapd-instance.stats. Had to add nsslapd-rundir to cn=config in order for ldap-agent to be able to get it.
Doc: Yes, we need to document the new attribute nsslapd-rundir.
Index: agtmmap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/agtmmap.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- agtmmap.h 10 Nov 2006 23:45:40 -0000 1.10
+++ agtmmap.h 18 Oct 2007 01:22:29 -0000 1.11
@@ -79,7 +79,8 @@
#if !defined(_MAX_PATH)
#define _MAX_PATH 256
#endif
-#define AGT_STATS_FILE "slapd.stats"
+#define AGT_STATS_EXTENSION ".stats"
+#define AGT_STATS_FILE "slapd" AGT_STATS_EXTENSION
#define AGT_MJR_VERSION 1
#define AGT_MNR_VERSION 0
Index: libglobs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libglobs.c 5 Oct 2007 17:00:04 -0000 1.22
+++ libglobs.c 18 Oct 2007 01:22:29 -0000 1.23
@@ -573,6 +573,10 @@
{CONFIG_SASLPATH_ATTRIBUTE, config_set_saslpath,
NULL, 0,
(void**)&global_slapdFrontendConfig.saslpath, CONFIG_STRING, (ConfigGetFunc)config_get_saslpath},
+ /* parameterizing run dir */
+ {CONFIG_RUNDIR_ATTRIBUTE, config_set_rundir,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.rundir, CONFIG_STRING, (ConfigGetFunc)config_get_rundir},
{CONFIG_REWRITE_RFC1274_ATTRIBUTE, config_set_rewrite_rfc1274,
NULL, 0,
(void**)&global_slapdFrontendConfig.rewrite_rfc1274, CONFIG_ON_OFF, NULL},
@@ -4728,6 +4732,43 @@
CFG_UNLOCK_WRITE(slapdFrontendConfig);
return retVal;
}
+
+char *
+config_get_rundir()
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ char *retVal;
+
+ CFG_LOCK_READ(slapdFrontendConfig);
+ retVal = config_copy_strval(slapdFrontendConfig->rundir);
+ CFG_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
+}
+
+int
+config_set_rundir(const char *attrname, char *value, char *errorbuf, int apply)
+{
+ int retVal = LDAP_SUCCESS;
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+ return LDAP_OPERATIONS_ERROR;
+ }
+
+ if (!apply) {
+ return retVal;
+ }
+
+ CFG_LOCK_WRITE(slapdFrontendConfig);
+ slapi_ch_free((void **)&slapdFrontendConfig->rundir);
+
+ slapdFrontendConfig->rundir = slapi_ch_strdup(value);
+
+ CFG_UNLOCK_WRITE(slapdFrontendConfig);
+ return retVal;
+}
+
char *
config_get_saslpath()
{
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- proto-slap.h 18 Oct 2007 00:08:34 -0000 1.30
+++ proto-slap.h 18 Oct 2007 01:22:29 -0000 1.31
@@ -326,6 +326,7 @@
int config_set_certdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_ldifdir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_bakdir( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_rundir( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_saslpath( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_attrname_exceptions( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_hash_filters( const char *attrname, char *value, char *errorbuf, int apply );
@@ -438,6 +439,7 @@
char *config_get_certdir();
char *config_get_ldifdir();
char *config_get_bakdir();
+char *config_get_rundir();
char *config_get_saslpath();
char **config_get_errorlog_list();
char **config_get_accesslog_list();
Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- slap.h 18 Oct 2007 00:08:34 -0000 1.29
+++ slap.h 18 Oct 2007 01:22:29 -0000 1.30
@@ -1727,6 +1727,7 @@
#define CONFIG_LDIFDIR_ATTRIBUTE "nsslapd-ldifdir"
#define CONFIG_BAKDIR_ATTRIBUTE "nsslapd-bakdir"
#define CONFIG_SASLPATH_ATTRIBUTE "nsslapd-saslpath"
+#define CONFIG_RUNDIR_ATTRIBUTE "nsslapd-rundir"
#define CONFIG_SSLCLIENTAUTH_ATTRIBUTE "nsslapd-SSLclientAuth"
#define CONFIG_SSL_CHECK_HOSTNAME_ATTRIBUTE "nsslapd-ssl-check-hostname"
#define CONFIG_HASH_FILTERS_ATTRIBUTE "nsslapd-hash-filters"
@@ -1906,6 +1907,7 @@
char *certdir; /* full path name of directory containing cert files */
char *ldifdir; /* full path name of directory containing ldif files */
char *bakdir; /* full path name of directory containing bakup files */
+ char *rundir; /* where pid, snmp stats, and ldapi files go */
char *saslpath; /* full path name of directory containing sasl plugins */
int attrname_exceptions; /* if true, allow questionable attribute names */
int rewrite_rfc1274; /* return attrs for both v2 and v3 names */
Index: snmp_collator.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/snmp_collator.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- snmp_collator.c 18 Oct 2007 00:08:34 -0000 1.11
+++ snmp_collator.c 18 Oct 2007 01:22:29 -0000 1.12
@@ -60,6 +60,7 @@
#include "prlock.h"
#include "prerror.h"
#include "prcvar.h"
+#include "plstr.h"
#include "snmp_collator.h"
#include "../snmp/ntagt/nslagtcom_nt.h"
@@ -397,8 +398,10 @@
{
int err;
- char *statspath = config_get_tmpdir();
+ char *statspath = config_get_rundir();
char *lp = NULL;
+ char *instdir = config_get_configdir();
+ char *instname = NULL;
/*
* Get directory for our stats file
@@ -407,10 +410,18 @@
statspath = slapi_ch_strdup("/tmp");
}
- PR_snprintf(szStatsFile, sizeof(szStatsFile), "%s/%s",
- statspath, AGT_STATS_FILE);
+ instname = PL_strrstr(instdir, "slapd-");
+ if (!instname) {
+ instname = PL_strrstr(instdir, "/");
+ if (instname) {
+ instname++;
+ }
+ }
+ PR_snprintf(szStatsFile, sizeof(szStatsFile), "%s/%s%s",
+ statspath, instname, AGT_STATS_EXTENSION);
tmpstatsfile = szStatsFile;
- slapi_ch_free((void **) &statspath);
+ slapi_ch_free_string(&statspath);
+ slapi_ch_free_string(&instname);
/* open the memory map */
if ((err = agt_mopen_stats(tmpstatsfile, O_RDWR, &hdl) != 0))
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/ldif template-dse.ldif.in, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3959/ldapserver/ldap/ldif
Modified Files:
template-dse.ldif.in
Log Message:
Resolves: bug 250179
Description: tmpwatch whacks stats
Reviewed by: nkinder (Thanks!)
Fix Description: move the snmp slapd.stats file to run_dir (/var/run/dirsrv) and rename to slapd-instance.stats. Had to add nsslapd-rundir to cn=config in order for ldap-agent to be able to get it.
Doc: Yes, we need to document the new attribute nsslapd-rundir.
Index: template-dse.ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/template-dse.ldif.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-dse.ldif.in 25 Jul 2007 15:20:01 -0000 1.4
+++ template-dse.ldif.in 18 Oct 2007 01:22:29 -0000 1.5
@@ -9,6 +9,7 @@
nsslapd-certdir: %cert_dir%
nsslapd-ldifdir: %ldif_dir%
nsslapd-bakdir: %bak_dir%
+nsslapd-rundir: %run_dir%
nsslapd-instancedir: %inst_dir%
nsslapd-accesslog-logging-enabled: on
nsslapd-accesslog-maxlogsperdir: 10
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts dscreate.map.in, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3959/ldapserver/ldap/admin/src/scripts
Modified Files:
dscreate.map.in
Log Message:
Resolves: bug 250179
Description: tmpwatch whacks stats
Reviewed by: nkinder (Thanks!)
Fix Description: move the snmp slapd.stats file to run_dir (/var/run/dirsrv) and rename to slapd-instance.stats. Had to add nsslapd-rundir to cn=config in order for ldap-agent to be able to get it.
Doc: Yes, we need to document the new attribute nsslapd-rundir.
Index: dscreate.map.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/dscreate.map.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dscreate.map.in 13 Jul 2007 18:35:32 -0000 1.1
+++ dscreate.map.in 18 Oct 2007 01:22:28 -0000 1.2
@@ -65,3 +65,4 @@
log_dir = log_dir
config_dir = config_dir
db_dir = db_dir
+run_dir = run_dir
16 years, 6 months
[Fedora-directory-commits] ldapserver/lib/libadmin authdb.c, 1.7, NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/libadmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/lib/libadmin
Removed Files:
authdb.c
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler
--- authdb.c DELETED ---
16 years, 6 months
[Fedora-directory-commits] ldapserver/lib/libaccess acltools.cpp, 1.7, 1.8 oneeval.cpp, 1.7, 1.8 symbols.cpp, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/libaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/lib/libaccess
Modified Files:
acltools.cpp oneeval.cpp symbols.cpp
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler
Index: acltools.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/acltools.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acltools.cpp 10 Nov 2006 23:46:02 -0000 1.7
+++ acltools.cpp 18 Oct 2007 00:08:36 -0000 1.8
@@ -2505,7 +2505,6 @@
int
rename_acl_in_file(char * filename, char * aclname, char * newname)
{
- ACLListHandle_t * racllist=NULL;
char * pattern=NULL;
char header[] = "version 3.0;\n";
int headerlen = strlen(header);
@@ -2565,7 +2564,7 @@
memcpy(&text[headerlen], aclhead, len);
text[headerlen + len] = 0;
- if ((racllist=ACL_ParseString(NULL, text))==NULL) {
+ if (ACL_ParseString(NULL, text)==NULL) {
rv = ACLERRPARSE;
goto rename_cleanup;
}
Index: oneeval.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/oneeval.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- oneeval.cpp 10 Nov 2006 23:46:02 -0000 1.7
+++ oneeval.cpp 18 Oct 2007 00:08:36 -0000 1.8
@@ -292,7 +292,6 @@
{
ACLAceEntry_t *cur_ace, *next_ace;
ACLAceNumEntry_t *cur_num_p, *next_num_p;
- ACLExprHandle_t *acep;
if (!cache)
return 0;
@@ -309,7 +308,6 @@
(cur_ace->acep->expr_type == ACL_EXPR_TYPE_AUTH))
PListDestroy(cur_ace->global_auth);
next_ace = cur_ace->next;
- acep = cur_ace->acep; /* The ACE structure itself */
PERM_FREE(cur_ace);
cur_ace = next_ace;
}
Index: symbols.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/symbols.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- symbols.cpp 10 Nov 2006 23:46:02 -0000 1.5
+++ symbols.cpp 18 Oct 2007 00:08:36 -0000 1.6
@@ -181,7 +181,6 @@
int symTableAddSym(void * table, Symbol_t * newsym, void * symref)
{
SymTable_t * st = (SymTable_t *)table;
- PLHashEntry * he;
PLHashEntry **hep;
PLHashNumber keyhash;
int rv = 0;
@@ -196,7 +195,7 @@
if (*hep == 0) {
/* Expand the hash table if necessary and allocate an entry */
- he = PL_HashTableRawAdd(st->stb_ht,
+ PL_HashTableRawAdd(st->stb_ht,
hep, keyhash, (void *)newsym, symref);
}
else {
16 years, 6 months