public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Christine Caulfield <chrissie@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - cman: Fix LDAP environment variable names in init script Date: Wed, 01 Apr 2009 10:20:00 -0000 [thread overview] Message-ID: <20090401101941.478D9120346@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ce494f9aa266fc82c229572026f083345fcdc237 Commit: ce494f9aa266fc82c229572026f083345fcdc237 Parent: ad1bef3ca6c537d718c91c7b46ad5f7c021028f4 Author: Christine Caulfield <ccaulfie@redhat.com> AuthorDate: Wed Apr 1 11:19:16 2009 +0100 Committer: Christine Caulfield <ccaulfie@redhat.com> CommitterDate: Wed Apr 1 11:19:16 2009 +0100 cman: Fix LDAP environment variable names in init script Signed-off-by: Christine Caulfield <ccaulfie@redhat.com> --- cman/init.d/cman.in | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index d46c98c..9206a92 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -131,7 +131,8 @@ fi # xmlconfig - read directly from cluster.conf and use ricci as default # config propagation method. (default) # ldapconfig - read configuration from an ldap server. -# Requires: LDAP_URL or/and LDAP_BASEDN envvar to be set. +# Requires: COROSYNC_LDAP_URL or/and COROSYNC_LDAP_BASEDN +# envvar to be set. # LDAP_BINDDN and LDAP_BINDPWD have to be either both set # or both unset. # corosync_parser - use internal corosync config file parser. @@ -241,24 +242,24 @@ cman_checkconfig() { case "$CONFIG_LOADER" in ldapconfig) - if [ -n "$LDAP_URL" ] || [ -n "$LDAP_BASEDN" ]; then - if [ -n "$LDAP_BINDDN" ]; then + if [ -n "$COROSYNC_LDAP_URL" ] || [ -n "$COROSYNC_LDAP_BASEDN" ]; then + if [ -n "$COROSYNC_LDAP_BINDDN" ]; then if [ -z "$LDAP_BINDPWD" ]; then - errmsg="ldadconfig has been selected \ + errmsg="ldapconfig has been selected \ but LDAP_BINDPWD is not set" return 1 fi fi if [ -n "$LDAP_BINDPWD" ]; then - if [ -z "$LDAP_BINDDN" ]; then - errmsg="ldadconfig has been selected \ + if [ -z "$COROSYNC_LDAP_BINDDN" ]; then + errmsg="ldapconfig has been selected \ but LDAP_BINDDN is not set" return 1 fi fi else - errmsg="ldadconfig has been selected but neither \ - LDAP_URL or LDAP_BASEDN have been set" + errmsg="ldapconfig has been selected but neither \ + COROSYNC_LDAP_URL or COROSYNC_LDAP_BASEDN have been set" return 1 fi ;;
reply other threads:[~2009-04-01 10:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090401101941.478D9120346@lists.fedorahosted.org \ --to=chrissie@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).