- updated wrt min-uid-gid patch

Changed files:
    MigrationTools-options.patch -> 1.2
    MigrationTools-smbkrb5.patch -> 1.6

diff --git a/MigrationTools-options.patch b/MigrationTools-options.patch
index 16a5ceb5a143621d6d4fbac009c968e35fb6b399..d9bf9525832a6a0c46214e8775196dfa4eb16c3c 100644 (file)
--- a/MigrationTools-options.patch
+++ b/MigrationTools-options.patch
@@ -1,15 +1,17 @@
 diff -ur MigrationTools-47/migrate_passwd.pl x/migrate_passwd.pl
 --- MigrationTools-47/migrate_passwd.pl        2009-06-24 13:47:15.299291875 +0200
 +++ x/migrate_passwd.pl        2009-06-24 16:26:58.000000000 +0200
-@@ -46,12 +46,20 @@
+@@ -46,11 +46,21 @@
  $NAMINGCONTEXT = &getsuffix($PROGRAM);
  
  if ($#ARGV < 0) {
--      print STDERR "Usage: $PROGRAM [--minuid N] [--maxuid M] infile [outfile]\n";
+-      print STDERR "Usage: $PROGRAM [--minuid N] [--maxuid M] [--mingid N] [--maxgid M] infile [outfile]\n";
 +      print STDERR "Usage: $PROGRAM [options] infile [outfile]\n";
 +      print STDERR "  Options:\n";
 +      print STDERR "  --minuid N      Minimal UID number to migrate\n";
-+      print STDERR "  --maxuid M      Maximal UIF number to migrate\n";
++      print STDERR "  --maxuid M      Maximal UID number to migrate\n";
++      print STDERR "  --mingid N      Minimal GID number to migrate\n";
++      print STDERR "  --maxgid M      Maximal GID number to migrate\n";
 +      print STDERR "  --samba         Migrate smbpasswd\n";
 +      print STDERR "  -s FILE         Path to shadow file (default: /etc/shadow)\n";
 +      print STDERR "  -S FILE         Path to smbpasswd file (default: /etc/samba/smbpasswd)\n";
@@ -17,9 +19,16 @@ diff -ur MigrationTools-47/migrate_passwd.pl x/migrate_passwd.pl
  }
  
  $do_samba = 0;
--while ($ARGV[0] =~ /^--.*/) {
 +$shadowf = "/etc/shadow";
 +$smbpassf = "/etc/samba/smbpasswd";
+ if ( defined($IGNORE_UID_BELOW) ) {
+       $minuid = $IGNORE_UID_BELOW;
+ }
+@@ -55,7 +56,7 @@
+ if ( defined($IGNORE_GID_ABOVE) ) {
+       $maxgid = $IGNORE_GID_ABOVE;
+ }
+-while ($ARGV[0] =~ /^--.*/) {
 +while ($ARGV[0] =~ /^-.*/) {
        if ($ARGV[0] eq "--minuid") {
                $minuid = $ARGV[1];

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");