packages: MigrationTools/MigrationTools.spec, MigrationTools/MigrationTools...

[baggins]

Author: baggins                      Date: Mon Jun 22 14:16:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- properly handle generating stubs for samba and kerberos objectclasses

---- Files affected:
packages/MigrationTools:
   MigrationTools.spec (1.25 -> 1.26) , MigrationTools-smbkrb5.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/MigrationTools/MigrationTools.spec
diff -u packages/MigrationTools/MigrationTools.spec:1.25 packages/MigrationTools/MigrationTools.spec:1.26
--- packages/MigrationTools/MigrationTools.spec:1.25	Mon Jun 22 14:37:46 2009
+++ packages/MigrationTools/MigrationTools.spec	Mon Jun 22 16:16:14 2009
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Narzędzia do migracji do LDAP
 Name:		MigrationTools
 Version:	47
-Release:	4
+Release:	5
 License:	BSD
 Group:		Networking/Admin
 Source0:	http://www.padl.com/download/%{name}-%{version}.tar.gz
@@ -23,6 +23,7 @@
 Patch9:		%{name}-noproto.patch
 Patch10:	%{name}-minmax-ugid.patch
 Patch11:	%{name}-utf8.patch
+Patch12:	%{name}-smbkrb5.patch
 URL:		http://www.padl.com/OSS/MigrationTools.html
 BuildRequires:	rpm-perlprov
 BuildArch:	noarch
@@ -71,6 +72,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 install %{SOURCE1} .
 
 perl -pi -e 's|%%CONFDIR%%|%{_sysconfdir}/openldap/|g;\
@@ -100,6 +102,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2009/06/22 14:16:14  baggins
+- rel 5
+- properly handle generating stubs for samba and kerberos objectclasses
+
 Revision 1.25  2009/06/22 12:37:46  baggins
 - rel 4
 - handle UTF-8 GECOS properly

================================================================
Index: packages/MigrationTools/MigrationTools-smbkrb5.patch
diff -u /dev/null packages/MigrationTools/MigrationTools-smbkrb5.patch:1.1
--- /dev/null	Mon Jun 22 16:16:19 2009
+++ packages/MigrationTools/MigrationTools-smbkrb5.patch	Mon Jun 22 16:16:14 2009
@@ -0,0 +1,56 @@
+diff -ur MigrationTools-47/migrate_common.ph MigrationTools-47-krb5/migrate_common.ph
+--- MigrationTools-47/migrate_common.ph	2009-06-22 16:16:02.730586333 +0200
++++ MigrationTools-47-krb5/migrate_common.ph	2009-06-22 16:15:55.070581897 +0200
+@@ -120,10 +120,16 @@
+ }
+ 
+ # Default Kerberos realm
+-#if ($EXTENDED_SCHEMA) {
+-#	$DEFAULT_REALM = $DEFAULT_MAIL_DOMAIN;
+-#	$DEFAULT_REALM =~ tr/a-z/A-Z/;
+-#}
++if ($EXTENDED_SCHEMA) {
++	$DEFAULT_REALM = $DEFAULT_MAIL_DOMAIN;
++	$DEFAULT_REALM =~ tr/a-z/A-Z/;
++}
++
++# Default SMB Domain
++if ($EXTENDED_SCHEMA) {
++	$DEFAULT_SMB_DOMAIN = $DEFAULT_MAIL_DOMAIN;
++	$DEFAULT_SMB_DOMAIN =~ tr/a-z/A-Z/;
++}
+ 
+ if (-x "/usr/sbin/revnetgroup") {
+ 	$REVNETGROUP = "/usr/sbin/revnetgroup";
+Only in MigrationTools-47-krb5: migrate_common.ph~
+diff -ur MigrationTools-47/migrate_passwd.pl MigrationTools-47-krb5/migrate_passwd.pl
+--- MigrationTools-47/migrate_passwd.pl	2009-06-22 16:16:02.850581340 +0200
++++ MigrationTools-47-krb5/migrate_passwd.pl	2009-06-22 16:13:13.997264191 +0200
+@@ -138,7 +138,15 @@
+ 	print $HANDLE "objectClass: top\n";
+ 
+ 	if ($DEFAULT_REALM) {
+-		print $HANDLE "objectClass: kerberosSecurityObject\n";
++		print $HANDLE "objectClass: krb5Principal\n";
++		print $HANDLE "objectClass: krb5KDCEntry\n";
++		print $HANDLE "krb5PrincipalName: $user\@$DEFAULT_REALM\n";
++		print $HANDLE "krb5KeyVersionNumber: 0\n";
++	}
++
++	if ($DEFAULT_SMB_DOMAIN) {
++		print $HANDLE "objectClass: sambaSamAccount\n";
++		print $HANDLE "sambaSID: 0\n";
+ 	}
+ 
+ 	if ($shadowUsers{$user} ne "") {
+@@ -147,10 +155,6 @@
+ 		print $HANDLE "userPassword: {crypt}$pwd\n";
+ 	}
+ 
+-	if ($DEFAULT_REALM) {
+-		print $HANDLE "krbName: $user\@$DEFAULT_REALM\n";
+-	}
+-
+ 	if ($shell) {
+ 		print $HANDLE "loginShell: $shell\n";
+ 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/MigrationTools/MigrationTools.spec?r1=1.25&r2=1.26&f=u