- updated wrt min-uid-gid patch

[packages/MigrationTools.git] / MigrationTools-smbkrb5.patch

diff --git a/MigrationTools-smbkrb5.patch b/MigrationTools-smbkrb5.patch
index 088d20813a1a9201df4596ca15e2e1ef323e9b08..6a645013f381f2ec785dcfd1e408aa6b97de0fd6 100644 (file)
--- a/MigrationTools-smbkrb5.patch
+++ b/MigrationTools-smbkrb5.patch
@@ -21,12 +21,12 @@ diff -ur MigrationTools-47/migrate_passwd.pl MigrationTools-47-krb5/migrate_pass
  }
  
 +$do_samba = 0;
- while ($ARGV[0] =~ /^--.*/) {
-       if ($ARGV[0] eq "--minuid") {
-               $minuid = $ARGV[1];
+ if ( defined($IGNORE_UID_BELOW) ) {
+       $minuid = $IGNORE_UID_BELOW;
+ }
 @@ -57,13 +60,22 @@
-       } elsif ($ARGV[0] eq "--maxuid") {
-               $maxuid = $ARGV[1];
+       } elsif ($ARGV[0] eq "--maxgid") {
+               $maxgid = $ARGV[1];
                shift ; shift;
 +      } elsif ($ARGV[0] eq "--samba") {
 +              $do_samba = 1;
@@ -85,10 +85,11 @@ diff -ur MigrationTools-47/migrate_passwd.pl MigrationTools-47-krb5/migrate_pass
        if ($shell) {
                print $HANDLE "loginShell: $shell\n";
        }
-@@ -226,3 +250,16 @@
+@@ -226,3 +250,17 @@
        }
+       $content =~ /^[\x20-\x7E\x{0080}-\x{FFFF}]*$/;
  }
- 
++
 +sub read_samba
 +{
 +      open(INPUT, "</etc/samba/smbpasswd");