packages: MigrationTools/MigrationTools-options.patch, MigrationTools/Migra...

[baggins]

Author: baggins                      Date: Thu Jun 25 10:31:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated wrt min-uid-gid patch

---- Files affected:
packages/MigrationTools:
   MigrationTools-options.patch (1.1 -> 1.2) , MigrationTools-smbkrb5.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/MigrationTools/MigrationTools-options.patch
diff -u packages/MigrationTools/MigrationTools-options.patch:1.1 packages/MigrationTools/MigrationTools-options.patch:1.2
--- packages/MigrationTools/MigrationTools-options.patch:1.1	Wed Jun 24 16:29:18 2009
+++ packages/MigrationTools/MigrationTools-options.patch	Thu Jun 25 12:31:48 2009
@@ -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 @@
  }
  
  $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];

================================================================
Index: packages/MigrationTools/MigrationTools-smbkrb5.patch
diff -u packages/MigrationTools/MigrationTools-smbkrb5.patch:1.5 packages/MigrationTools/MigrationTools-smbkrb5.patch:1.6
--- packages/MigrationTools/MigrationTools-smbkrb5.patch:1.5	Thu Jun 25 12:02:44 2009
+++ packages/MigrationTools/MigrationTools-smbkrb5.patch	Thu Jun 25 12:31:48 2009
@@ -21,12 +21,12 @@
  }
  
 +$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 @@
  	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");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/MigrationTools/MigrationTools-options.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/MigrationTools/MigrationTools-smbkrb5.patch?r1=1.5&r2=1.6&f=u