Attachment #8123 for bug #42573

View | Details | Raw Unified | Return to bug 42573
Collapse All | Expand All




	if (rv < 0 || rv >= PATH_MAX)
		return rv;
	if ((fp = fopen(tmpfile, "w")) == NULL)
		abort_io("open", tmpfile);
	fprintf(fp, "%ld", value);
	rv = fclose(fp);
	if (rv != 0)
		abort_io("close", tmpfile);

	rv = snprintf(file, PATH_MAX, "%s/%s", cache_dir, key);
	if (rv < 0 || rv >= PATH_MAX)


int cache_close(void)
{
	int rv = 0;

	if (dbp && (rv = dbp->close(dbp, 0)) != 0) {
		dbp->err(dbp, rv, "close");

(-)a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-listener/src/cache_lowlevel.c (-4 / +13 lines)

Lines 37-42	Link Here

#include <ctype.h>

#include <ctype.h>

#include <stdbool.h>

#include <stdbool.h>

#include <limits.h>

#include <limits.h>

#include <errno.h>

#include <sys/types.h>

#include <sys/types.h>

#include <univention/debug.h>

#include <univention/debug.h>

Lines 279-288 int parse_entry(void data, u_int32_t size, CacheEntry entry)	Link Here

279

			rv = snprintf(filename, PATH_MAX, "%s/bad_cache", cache_dir);

280

			rv = snprintf(filename, PATH_MAX, "%s/bad_cache", cache_dir);

280

			if (rv < 0 || rv >= PATH_MAX)

281

			if (rv < 0 || rv >= PATH_MAX)

281

				abort();

282

				abort();

282

			if ((file = fopen(filename, "w")) != NULL) {

283

			if ((file = fopen(filename, "w")) == NULL)

283

				fprintf(file, "Check log file");

284

				abort_io("open", filename);

284

				fclose(file);

285

			fprintf(file, "Check log file");

285

286

			rv = fclose(file);

287

			if (rv != 0)

288

				abort_io("close", filename);

286

289

287

			return -1;

290

			return -1;

288

291

Lines 290-292 int parse_entry(void data, u_int32_t size, CacheEntry entry)	Link Here

290

293

291

	return 0;

294

	return 0;

292

295

296

297

void abort_io(const char *func, const char *filename)

298

299

	univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "Fatal %s(%s): %s", func, filename, strerror(errno));

300

	abort();

301

(-)a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-listener/src/cache_lowlevel.h (+1 lines)

Lines 42-46 int parse_entry (void *data,	Link Here

			 u_int32_t	  size,

			 u_int32_t	  size,

			 CacheEntry	 *entry);

			 CacheEntry	 *entry);

void hex_dump(int level, void *data, u_int32_t start, u_int32_t size);

void hex_dump(int level, void *data, u_int32_t start, u_int32_t size);

void abort_io(const char *func, const char *filename) __attribute__((noreturn));

#endif /* _CACHE_LOWLEVEL_ */

#endif /* _CACHE_LOWLEVEL_ */

(-)a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-listener/src/handlers.c (-1 / +3 lines)

Lines 550-556 void handler_write_state(Handler *handler) {	Link Here

550

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "could not open %s", state_filename);

550

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "could not open %s", state_filename);

551

	} else {

551

	} else {

552

		fprintf(state_fp, "%d", handler->state);

552

		fprintf(state_fp, "%d", handler->state);

553

		fclose(state_fp);

553

		rv = fclose(state_fp);

554

		if (rv != 0)

555

			abort_io("close", state_filename);

554

556

555

557

556

558




/* Close file and lock file. */
static int fclose_lock(FILE **file, FILE **l_file)
{
	int rv = 0;

	if (*file != NULL) {
		rv |= fclose(*file);
		*file = NULL;
	}


		int rc = lockf(l_fd, F_ULOCK, 0);
		if (rc)
			univention_debug(UV_DEBUG_LDAP, UV_DEBUG_ALL, "unlockf(): %d", rc);
		rv |= fclose(*l_file);
		*l_file = NULL;
	}

	return rv;
}






#include <string.h>
#include <time.h>
#include <sys/time.h>
#include <sys/statvfs.h>

#include <univention/debug.h>
#include <univention/config.h>
#include <univention/ldap.h>
#ifdef WITH_KRB5
#include <univention/krb5.h>

	return LDAP_SUCCESS;
}

static void check_free_space()
{
	static int min_mib = -2;
	const char *dirnames[] = {
		cache_dir,
		ldap_dir,
		NULL
	}, **dirname;

	if (min_mib == -2)
		min_mib = univention_config_get_int("listener/freespace");

	if (min_mib <= 0)
		return;

	for (dirname=dirnames; *dirname; dirname++) {
		struct statvfs buf;
		int free_mib;

		if (statvfs(*dirname, &buf))
			continue;

		free_mib = ((long)buf.f_bavail * (long)buf.f_frsize) >> 20;
		if (free_mib >= min_mib)
			continue;

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "File system '%s' full: %d < %d", *dirname, free_mib, min_mib);
		abort();
	}
}

/* listen for ldap updates */
int notifier_listen(univention_ldap_parameters_t *lp,
		univention_krb5_parameters_t *kp,

		int		msgid;
		time_t		timeout = DELAY_LDAP_CLOSE;

		check_free_space();

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_INFO, "Last Notifier ID: %lu", id);
		if ((msgid = notifier_get_dn(NULL, id + 1)) < 1)
			break;

(-)a/branches/ucs-4.1/ucs-4.1-3/management/univention-directory-listener/debian/univention-directory-listener.univention-config-registry-variables (+6 lines)

Lines 45-47 Description[de]=Anzahl der Versuche zum Verbindungsaufbau zum LDAP-Server im Fal	Link Here

Description[en]=Number of retries to re-connect the LDAP server in case of errors. Default: 5

Description[en]=Number of retries to re-connect the LDAP server in case of errors. Default: 5

Type=int

Type=int

Categories=service-ln

Categories=service-ln

[listener/freespace]

Description[de]=Diese Variable legt die untere Grenze für den freien Speicherplatz in den Verzeichnissen '/var/lib/univention-ldap/' und '/var/lib/univention-directory-listener/', ab der der Listener gestoppt wird. Standard is 10 [MiB].

Description[en]=This variable configures the lower limit for free space in the directories '/var/lib/univention-ldap/' and '/var/lib/univention-directory-listener/', when the Listener will be stopped. Default is 10 [MiB].

Type=int

Categories=service-ln

Return to bug 42573