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

(-)b/net/openldap24-server/files/slapd.in (-1 / +1 lines)
Lines 71-77 pidfile="%%LDAP_RUN_DIR%%/slapd.pid" Link Here
71
if checkyesno slapd_cn_config; then
71
if checkyesno slapd_cn_config; then
72
  required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
72
  required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
73
  required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
73
  required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
74
  DATABASEDIR=`grep olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
74
  DATABASEDIR=`grep -s olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
75
else
75
else
76
  required_files="%%PREFIX%%/etc/openldap/slapd.conf"
76
  required_files="%%PREFIX%%/etc/openldap/slapd.conf"
77
  DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`
77
  DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`
(-)b/net/openldap25-server/files/slapd.in (-1 / +1 lines)
Lines 71-77 pidfile="%%LDAP_RUN_DIR%%/slapd.pid" Link Here
71
if checkyesno slapd_cn_config; then
71
if checkyesno slapd_cn_config; then
72
  required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
72
  required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
73
  required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
73
  required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
74
  DATABASEDIR=`grep olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
74
  DATABASEDIR=`grep -s olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
75
else
75
else
76
  required_files="%%PREFIX%%/etc/openldap/slapd.conf"
76
  required_files="%%PREFIX%%/etc/openldap/slapd.conf"
77
  DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`
77
  DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`

Return to bug 258418