diff options
| author | Adam Jahn <ajjahn@gmail.com> | 2014-01-10 15:28:07 -0800 |
|---|---|---|
| committer | Adam Jahn <ajjahn@gmail.com> | 2014-01-10 15:28:07 -0800 |
| commit | e1f6fd1859b69198fafd9a3abe7112e4717156fe (patch) | |
| tree | 61b4772b2462c0a29c8d94e9ed63d73dfbafa5cb | |
| parent | 2ca5eb3109c7d12c8252e4d228946267dc43c93a (diff) | |
| parent | 6d936df97546f8809b42ede32df1d460b06a50a3 (diff) | |
| download | puppet-samba-e1f6fd1859b69198fafd9a3abe7112e4717156fe.tar.gz puppet-samba-e1f6fd1859b69198fafd9a3abe7112e4717156fe.tar.bz2 | |
Merge pull request #16 from tomas-edwardsson/expect_quoting
Proper tcl quoting for password in expect
| -rw-r--r-- | templates/configure_active_directory.erb | 7 | ||||
| -rw-r--r-- | templates/verify_active_directory.erb | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/templates/configure_active_directory.erb b/templates/configure_active_directory.erb index c860c78..4f9b6e0 100644 --- a/templates/configure_active_directory.erb +++ b/templates/configure_active_directory.erb @@ -125,10 +125,11 @@ 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' + send {${password}}; + send \n; + expect eof" klist -c $KRB5CCNAME &> /dev/null && break done diff --git a/templates/verify_active_directory.erb b/templates/verify_active_directory.erb index 5a2a506..0917c49 100644 --- a/templates/verify_active_directory.erb +++ b/templates/verify_active_directory.erb @@ -21,7 +21,7 @@ fi # } >&2 #fi -password="<%= scope.lookupvar('samba::server::ads::winbind_pass') -%>" +password='<%= scope.lookupvar('samba::server::ads::winbind_pass') -%>' # short hostname from facter my_hostname="<%= hostname -%>" @@ -62,7 +62,8 @@ get_tgt() { ( $EXPECT -c "spawn -noecho kinit -c $KRB5CCNAME ${winbind_acct}@${default_realm}; expect :; - send ${password}\n; + send {${password}}; + send \n; expect eof" ) &> /dev/null klist -c $KRB5CCNAME &> /dev/null |