Added vim configuration line (.. // vim:tabstop=2:ex...) and applied code aligment...

[gosa.git] / gosa-core / bin / gosa-encrypt-passwords

diff --git a/gosa-core/bin/gosa-encrypt-passwords b/gosa-core/bin/gosa-encrypt-passwords
index 0f8c5ada16888ed997033f71712d8c71ca30a136..7d5c69d1ba7712a11752fce1e3dc078745bbf47c 100755 (executable)
--- a/gosa-core/bin/gosa-encrypt-passwords
+++ b/gosa-core/bin/gosa-encrypt-passwords
@@ -64,12 +64,24 @@ $conf = new DOMDocument();
 $conf->load("/etc/gosa/gosa.conf") or die ("Cannot read /etc/gosa/gosa.conf - aborted\n");
 $conf->encoding = 'UTF-8';
 $referrals= $conf->getElementsByTagName("referral");
-echo "* encrypting existent passwords with master key\n";
 foreach($referrals as $referral){
-  $pw= $referral->attributes->getNamedItem("password");
+  $user = $referral->attributes->getNamedItem("adminDn");
+  echo "* encrypting GOsa password for: ".$user->nodeValue."\n";
+  $pw= $referral->attributes->getNamedItem("adminPassword");
   $pw->nodeValue= cred_encrypt($pw->nodeValue, $master_key);
 }
 
+# Encrypt the snapshot passwords 
+$locations= $conf->getElementsByTagName("location");
+foreach($locations as $location){
+  $name = $location->attributes->getNamedItem("name"); 
+  $node = $location->attributes->getNamedItem("snapshotAdminPassword"); 
+  if($node->nodeValue){
+    echo "* encrypting snapshot pasword for location: ".$name->nodeValue."\n";
+    $node->nodeValue = cred_encrypt($node->nodeValue, $master_key);;
+  }
+}
+
 # Move original gosa.conf out of the way and make it unreadable for the web user
 echo "* creating backup in /etc/gosa/gosa.conf.orig\n";
 rename("/etc/gosa/gosa.conf", "/etc/gosa/gosa.conf.orig");
@@ -94,7 +106,7 @@ Example:
 
 Alias /gosa /usr/share/gosa/html
 
-<Location /gosa-loc>
+<Location /gosa>
   php_admin_flag engine on
   php_admin_value open_basedir "/etc/gosa/:/usr/share/gosa/:/var/cache/gosa/:/var/spool/gosa/"
   php_admin_flag register_globals off