aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorTomas Edwardsson <tommi@ok.is>2013-07-30 15:18:29 +0000
committerTomas Edwardsson <tommi@ok.is>2013-07-30 15:24:52 +0000
commit10ebbb8955b617f43203eb3ac75c1f72f2b16f7b (patch)
treeb6a4b7c055500500ff78e2b9354f6562637fa34c /templates
parentd69032f73e0bf0d65072659c77a8fded1746c9db (diff)
downloadpuppet-samba-10ebbb8955b617f43203eb3ac75c1f72f2b16f7b.tar.gz
puppet-samba-10ebbb8955b617f43203eb3ac75c1f72f2b16f7b.tar.bz2
Allow for space and dollarsigns in password as well as empty ou
Diffstat (limited to 'templates')
-rw-r--r--templates/configure_active_directory.erb16
1 files changed, 11 insertions, 5 deletions
diff --git a/templates/configure_active_directory.erb b/templates/configure_active_directory.erb
index 35ba86f..c860c78 100644
--- a/templates/configure_active_directory.erb
+++ b/templates/configure_active_directory.erb
@@ -54,7 +54,7 @@ do
esac
done
-password="<%= scope.lookupvar('samba::server::ads::winbind_pass') -%>"
+password='<%= scope.lookupvar('samba::server::ads::winbind_pass') -%>'
# short hostname from facter
my_hostname="<%= hostname -%>"
@@ -80,7 +80,7 @@ echo "Please do not kill me; I may be slow" >&2
if [ "$action" = "leave" ]; then
logger -st $PROG "Leaving AD domain"
- $NET ads $action -U ${winbind_acct}%${password} | grep Deleted && success=true || success=false
+ $NET ads $action -U "${winbind_acct}%${password}" | grep Deleted && success=true || success=false
kdestroy
rm -f /etc/krb5.keytab
if [ $success = "true" ]; then
@@ -105,8 +105,14 @@ ad_settle() {
export KRB5CCNAME=$(umask 0077; mktemp -q winbind_cache.XXXXXXXX)
if [ "$action" = "join" ]; then
+ if [ "${target_ou}" != "" ]; then
+ ou_parameter="createcomputer=\"${target_ou}\""
+ else
+ ou_parameter=""
+ fi
+
logger -st $PROG "Joining AD domain" >&2
- $NET ads $action -U ${winbind_acct}%${password} createcomputer="${target_ou}"\
+ $NET ads $action -U "${winbind_acct}%${password}" ${ou_parameter} \
| grep Joined && success=true || success=false
if [ $success = "false" ]; then
@@ -119,10 +125,10 @@ for attempt in $(seq 1 $max_attempts); do
echo "$attempt of $max_attempts:"
ad_settle
echo "Getting TGT for ${winbind_acct}@${my_realm}" >&2
- $EXPECT -c "spawn -noecho kinit -c $KRB5CCNAME ${winbind_acct}@${my_realm};
+ $EXPECT -c spawn -noecho kinit -c $KRB5CCNAME '${winbind_acct}@${my_realm};
expect :;
send ${password}\n;
- expect eof"
+ expect eof'
klist -c $KRB5CCNAME &> /dev/null && break
done