steffen: server/kolab/kolab kolab.schema, 1.14, 1.15 kolab_bootstrap, 1.45, 1.46

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv16088/kolab

Modified Files:
	kolab.schema kolab_bootstrap 
Log Message:
password support for resources/groups

Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab.schema	21 Jun 2004 01:46:39 -0000	1.14
+++ kolab.schema	13 Jul 2004 01:22:13 -0000	1.15
@@ -578,6 +578,11 @@
     	SUBSTR caseIgnoreIA5SubstringsMatch
     	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
+attributetype ( 1.3.6.1.4.1.19419.2.1.4 
+	NAME  'encryptedPassword'
+	DESC  'base64 encoded public key encrypted Password'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
 # global attributes
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.5
@@ -937,6 +942,7 @@
 	MAY (
                 homeServer $
 		unrestrictedMailSize $
-		delegate		
+		delegate $
+		encryptedPassword
 		)
 	)

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- kolab_bootstrap	12 Jul 2004 21:05:33 -0000	1.45
+++ kolab_bootstrap	13 Jul 2004 01:22:13 -0000	1.46
@@ -466,6 +466,26 @@
       system("killall -9 slapd >/dev/null 2>&1");
    }
   }
+
+  # Create key-pair for resource password encryption 
+  # if they dont exist already
+  my $pubreskey = "$kolab_prefix/etc/kolab/res_pub.pem";
+  my $privreskey = "$kolab_prefix/etc/kolab/res_priv.pem";
+  if( ! -e $pubreskey || ! -e $privreskey ) {
+    my $oldmask = umask 0077;
+    #print "Creating DSA keypair for resource password encryption\n";
+    #system("/kolab/bin/openssl dsaparam 1024 -out dsa-params");
+    #system("/kolab/bin/openssl gendsa -out $privreskey dsa-params");
+    #system("/kolab/bin/openssl dsa -in $privreskey -pubout -out $pubreskey");
+    print "Creating RSA keypair for resource password encryption\n";
+    system("/kolab/bin/openssl genrsa -out $privreskey 1024");
+    system("/kolab/bin/openssl rsa -in $privreskey -pubout -out $pubreskey");
+    system("chown kolab.kolab-n $pubreskey $privreskey");
+    chmod 0660, $privreskey, $pubreskey;
+    #unlink( "dsa-params" );
+    umask $oldmask;
+  }
+
   print <<'EOS';
 Kolab can create an manage a certificate authority that can be
 used to create SSL certificates for use within the Kolab environment.