From 037be9579eb4f60ed97eef7fe372aeedd6c91b43 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 24 Aug 2010 15:51:31 +0000
Subject: [PATCH] Fix bugs in joindomain postscript

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7205 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/joindomain | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xCAT/postscripts/joindomain b/xCAT/postscripts/joindomain
index 74cf05af9..151c9921c 100644
--- a/xCAT/postscripts/joindomain
+++ b/xCAT/postscripts/joindomain
@@ -26,11 +26,11 @@ if [ "$OSVER" = "rhels6" ]; then
     echo sasl_mech GSSAPI >> /etc/nslcd.conf
     echo sasl_secprops maxssf=0 >> /etc/nslcd.conf
     echo krb5_ccname /var/run/ldap_krb5cc >> /etc/nslcd.conf
-    sed -i '/# Mappings for Active Directory/,/^[^#]/ s/^#\([^ ]\)/\1/' /etc/nslcd.conf
+    sed -i '/# Mappings for Active Directory/,/^$/ s/^#\([^ ]\)/\1/' /etc/nslcd.conf
     authconfig --update --enableldap --ldapserver=$LDAPSRV --ldapbasedn=$LDAPBASEDN
-    echo 'kinit '$HOSTPRINC'-c /var/run/ldap_krb5cc < /etc/krb5.hostpass >& /dev/null;chown nslcd /var/run/ldap_krb5cc' >> /etc/rc.local
-    echo 'kinit '$HOSTPRINC'-c /var/run/ldap_krb5cc < /etc/krb5.hostpass >& /dev/null;chown nslcd /var/run/ldap_krb5cc' >> /etc/cron.hourly/nslcdkrb.cron
-    chmod +x /etc/cron.hourly/nslcdkrb.cron
+    echo 'kinit '$HOSTPRINC' -c /var/run/ldap_krb5cc < /etc/krb5.hostpass >& /dev/null;chown nslcd /var/run/ldap_krb5cc' >> /etc/rc.local
+    echo 'kinit '$HOSTPRINC' -c /var/run/ldap_krb5cc < /etc/krb5.hostpass >& /dev/null;chown nslcd /var/run/ldap_krb5cc' >> /etc/cron.hourly/nslcdkrb5cc.cron
+    chmod +x /etc/cron.hourly/nslcdkrb5cc.cron
 fi
 #TODO: SLES/maybe RHEL5.  Uncomfortable with libnss_ldap without root_krb5_ccname, ldap needs diff credentials per user
 # or else the host private key must be wide open...