projects / packages / MigrationTools.git / blame
| Commit | Line | Data |
|---|---|---|
| 68242fc0 JR |
1 | diff -ur MigrationTools-47/migrate_common.ph MigrationTools-47-krb5/migrate_common.ph |
| 2 | --- MigrationTools-47/migrate_common.ph 2009-06-22 16:16:02.730586333 +0200 | |
| 3 | +++ MigrationTools-47-krb5/migrate_common.ph 2009-06-22 16:15:55.070581897 +0200 | |
| 4 | @@ -120,10 +120,16 @@ | |
| 5 | } | |
| 6 | ||
| 7 | # Default Kerberos realm | |
| 8 | -#if ($EXTENDED_SCHEMA) { | |
| 9 | -# $DEFAULT_REALM = $DEFAULT_MAIL_DOMAIN; | |
| 10 | -# $DEFAULT_REALM =~ tr/a-z/A-Z/; | |
| 11 | -#} | |
| 12 | +if ($EXTENDED_SCHEMA) { | |
| 13 | + $DEFAULT_REALM = $DEFAULT_MAIL_DOMAIN; | |
| 14 | + $DEFAULT_REALM =~ tr/a-z/A-Z/; | |
| 15 | +} | |
| 16 | + | |
| 17 | +# Default SMB Domain | |
| 18 | +if ($EXTENDED_SCHEMA) { | |
| 19 | + $DEFAULT_SMB_DOMAIN = $DEFAULT_MAIL_DOMAIN; | |
| 20 | + $DEFAULT_SMB_DOMAIN =~ tr/a-z/A-Z/; | |
| 21 | +} | |
| 22 | ||
| 23 | if (-x "/usr/sbin/revnetgroup") { | |
| 24 | $REVNETGROUP = "/usr/sbin/revnetgroup"; | |
| 25 | Only in MigrationTools-47-krb5: migrate_common.ph~ | |
| 26 | diff -ur MigrationTools-47/migrate_passwd.pl MigrationTools-47-krb5/migrate_passwd.pl | |
| 27 | --- MigrationTools-47/migrate_passwd.pl 2009-06-22 16:16:02.850581340 +0200 | |
| 28 | +++ MigrationTools-47-krb5/migrate_passwd.pl 2009-06-22 16:13:13.997264191 +0200 | |
| 29 | @@ -138,7 +138,15 @@ | |
| 30 | print $HANDLE "objectClass: top\n"; | |
| 31 | ||
| 32 | if ($DEFAULT_REALM) { | |
| 33 | - print $HANDLE "objectClass: kerberosSecurityObject\n"; | |
| 34 | + print $HANDLE "objectClass: krb5Principal\n"; | |
| 35 | + print $HANDLE "objectClass: krb5KDCEntry\n"; | |
| 36 | + print $HANDLE "krb5PrincipalName: $user\@$DEFAULT_REALM\n"; | |
| 37 | + print $HANDLE "krb5KeyVersionNumber: 0\n"; | |
| 38 | + } | |
| 39 | + | |
| 40 | + if ($DEFAULT_SMB_DOMAIN) { | |
| 41 | + print $HANDLE "objectClass: sambaSamAccount\n"; | |
| 42 | + print $HANDLE "sambaSID: 0\n"; | |
| 43 | } | |
| 44 | ||
| 45 | if ($shadowUsers{$user} ne "") { | |
| 46 | @@ -147,10 +155,6 @@ | |
| 47 | print $HANDLE "userPassword: {crypt}$pwd\n"; | |
| 48 | } | |
| 49 | ||
| 50 | - if ($DEFAULT_REALM) { | |
| 51 | - print $HANDLE "krbName: $user\@$DEFAULT_REALM\n"; | |
| 52 | - } | |
| 53 | - | |
| 54 | if ($shell) { | |
| 55 | print $HANDLE "loginShell: $shell\n"; | |
| 56 | } |