diff -pru xdmchoose-1.1.1/CHANGELOG xdmchoose-1.1.2/CHANGELOG --- xdmchoose-1.1.1/CHANGELOG Sat Feb 3 16:39:46 2001 +++ xdmchoose-1.1.2/CHANGELOG Wed Apr 11 11:45:43 2001 @@ -8,3 +8,7 @@ xdmchoose / xdmping changelog: * changes to auto{conf,make} stuff to improve/fix (courtesy of Christian Weisgerber) +1.1.2: +* added some more error messages to aid debugging +* fixed potential bug in config handling stuff + diff -pru xdmchoose-1.1.1/README xdmchoose-1.1.2/README --- xdmchoose-1.1.1/README Sat Feb 3 16:21:36 2001 +++ xdmchoose-1.1.2/README Wed Apr 11 11:45:12 2001 @@ -1,5 +1,5 @@ -chooser and xdmping (version 1.1.1) +chooser and xdmping (version 1.1.2) ------------------------------------ diff -pru xdmchoose-1.1.1/cfg.c xdmchoose-1.1.2/cfg.c --- xdmchoose-1.1.1/cfg.c Sat Feb 3 16:13:55 2001 +++ xdmchoose-1.1.2/cfg.c Wed Apr 11 11:43:24 2001 @@ -32,6 +32,7 @@ #include #include #include +#include #include "support.h" #include "cfg.h" @@ -40,7 +41,7 @@ static FILE *config_stream; -#define NUM_CONFIG_FILES (9) +#define NUM_CONFIG_FILES (2) static char *config_files[] = { SYSCONFDIR "/xdmchoose.conf", "./xdmchoose.conf" @@ -124,22 +125,26 @@ int init_config_file (GlobalConfigData * } } if (i == NUM_CONFIG_FILES) { + APP_MSG ("unable to find valid configuration file"); return -1; } config_file = config_files[i]; if (stat (config_file, &st_buf)) { + APP_MSG ("unable to stat configuration file %s", config_file); return -1; } /* mmap the file and create line-array */ config_fd = open (config_file, O_RDONLY); if (config_fd < 0) { + APP_MSG ("unable to open configuration file %s: %s", config_file, strerror (errno)); return -1; } config_mmap_size = st_buf.st_size; config_mmap = (char *)mmap ((void *)0, config_mmap_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, config_fd, 0); if (config_mmap == (char *)-1) { close (config_fd); + APP_MSG ("unable to mmap() configuration file %s: %s", config_file, strerror (errno)); return -1; } diff -pru xdmchoose-1.1.1/configure xdmchoose-1.1.2/configure --- xdmchoose-1.1.1/configure Sat Feb 3 16:40:05 2001 +++ xdmchoose-1.1.2/configure Wed Apr 11 11:43:09 2001 @@ -872,7 +872,7 @@ fi # Define the identity of the package. PACKAGE=xdmchoose -VERSION=1.1.1 +VERSION=1.1.2 cat >> confdefs.h <