From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 538 invoked by alias); 1 Apr 2009 10:20:02 -0000 Received: (qmail 532 invoked by alias); 1 Apr 2009 10:20:01 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman: Fix LDAP environment variable names in init script To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: ad1bef3ca6c537d718c91c7b46ad5f7c021028f4 X-Git-Newrev: ce494f9aa266fc82c229572026f083345fcdc237 From: Christine Caulfield Message-Id: <20090401101941.478D9120346@lists.fedorahosted.org> Date: Wed, 01 Apr 2009 10:20:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00005.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ce494f9aa266fc82c229572026f083345fcdc237 Commit: ce494f9aa266fc82c229572026f083345fcdc237 Parent: ad1bef3ca6c537d718c91c7b46ad5f7c021028f4 Author: Christine Caulfield AuthorDate: Wed Apr 1 11:19:16 2009 +0100 Committer: Christine Caulfield CommitterDate: Wed Apr 1 11:19:16 2009 +0100 cman: Fix LDAP environment variable names in init script Signed-off-by: Christine Caulfield --- 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 ;;