From e0665ad76f000b85e780afc7ed521299e424bc61 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 7 Jun 2007 22:26:40 +0000 Subject: [PATCH] Fixed problem which was keeping us from configuring search roots containing characters which are processed by the shell such as "&". --- CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp b/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp index f10dc0c9..4054efd0 100644 --- a/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp +++ b/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp @@ -621,14 +621,14 @@ global boolean Write() { // Update the iaRealms.xml file if (eDirType) - cmd = sformat("%1 -set %2 -type eDir ", iaRealmsEditor, realmId); + cmd = sformat("%1 -set \"%2\" -type eDir ", iaRealmsEditor, realmId); else - cmd = sformat("%1 -set %2 -type ActiveDirectory ", iaRealmsEditor, realmId); + cmd = sformat("%1 -set \"%2\" -type ActiveDirectory ", iaRealmsEditor, realmId); foreach (string url, ldapUrls, { - cmd = sformat("%1 -url %2", cmd, url); + cmd = sformat("%1 -url \"%2\"", cmd, url); }); foreach (string ctx, searchRoots, { - cmd = sformat("%1 -sr %2", cmd, ctx); + cmd = sformat("%1 -sr \"%2\"", cmd, ctx); }); cmd = sformat("%1 -file %2", cmd, iaRealmsFile); ret = (map) SCR::Execute(.target.bash_output, cmd); @@ -646,7 +646,7 @@ global boolean Write() { if (exit != 0) y2error("Failed to set Proxy Username in miCASA for realm " + realmId); - cmd = sformat("KEYVALUE=\"%1\" CASAcli -s -u %2 -n %3 -k Password", proxy_password, uid, realmId); + cmd = sformat("KEYVALUE=\"%1\" CASAcli -s -u %2 -n \"%3\" -k Password", proxy_password, uid, realmId); ret = (map) SCR::Execute(.target.bash_output, cmd); exit = ret["exit"]:-1; if (exit != 0)