--- otvori_nove+db	2000/07/13 08:04:42	1.8
+++ otvori_nove+db	2001/01/26 07:44:36	1.9
@@ -14,13 +14,15 @@
 
 my $debug=0;
 
+my $res_uids=60000;	# uids larger than this are for system use
+
 if (defined($ARGV[0]) && $ARGV[0] eq "-d") {
 	$debug++;
 	shift @ARGV;
 }
 my $open_only_id=shift @ARGV if (defined($ARGV[0]));
 
-warn "DEBUG -- me kreira ništa!" if ($debug);
+warn "DEBUG -- ne kreira ništa!" if ($debug);
 
 $|++;
 
@@ -45,7 +47,7 @@
 $db_user=~s/\s.+$//g;
 close(WHO);
 
-xdebug "koristim korinika $db_user\n";
+xdebug "koristim korisnika $db_user\n";
 
 open(HOSTNAME,"hostname |") || die "hostname: $!";
 my $hostname=<HOSTNAME>;
@@ -72,18 +74,19 @@
 close(ALIAS);
 
 my %etc_passwd;
-my $uid;	# current (or max) uid
+my $max_uid = 0;	# maximum uid
 
 v "/etc/passwd\n";
 open(PASSWD,"/etc/passwd") || die "Can't open /etc/passwd !";
 open(NPASSWD,">passwd.new") || die "Can't open passwd.new !";
 while(<PASSWD>) {
 	chop;
-	my ($login,$gid,$full_name,$dir,$shell);
+	my ($login,$uid,$gid,$full_name,$dir,$shell);
 	($login,undef,$uid,$gid,$full_name,$dir,$shell) = split(/:/,$_,7);
 	$etc_passwd{$login}=$full_name;
 	print NPASSWD "$_\n";
 #	xdebug "$login:$full_name\n";
+	$max_uid = $uid if ($max_uid < $uid && $uid < $res_uids);
 }
 close(PASSWD);
 
@@ -208,7 +211,7 @@
 	my $salt = $saltch[int(rand($#saltch))].$saltch[int(rand($#saltch))];
 	my $crypt_passwd = crypt($passwd,$salt);
 
-	$uid++;
+	$max_uid++;
 	my $loc="";
 	$loc.=$objekt if (defined($objekt));
 	$loc.=" $kat" if (defined($kat));
@@ -226,9 +229,9 @@
 	my $dir="/usr/users/$login";
 
 	die "Nema grupe $group!" if (! defined($group_id{$group}));
-	xdebug "$login:$passwd:$uid:$group_id{$group}:$full_name:$dir:$shell\n";
+	xdebug "$login:$passwd:$max_uid:$group_id{$group}:$full_name:$dir:$shell\n";
 
-	print NPASSWD "$login:$crypt_passwd:$uid:$group_id{$group}:$full_name:$dir:$shell\n";
+	print NPASSWD "$login:$crypt_passwd:$max_uid:$group_id{$group}:$full_name:$dir:$shell\n";
 	$dbh->do("insert into racuni (osoba_id,login,passwd) values ($osoba_id,'$login','$passwd')") if (! $debug);
 	$etc_passwd{$login}=$full_name;
 
@@ -245,12 +248,12 @@
 #---- C2 security
 #	if (!$debug || 1) {
 #		open(AUTH,">> $0.auth");
-#		print AUTH "$login:u_name=$login:u_id#$uid:u_pwd=$crypt_passwd:u_succhg#",time,":u_lock\@:chkent:\n";
+#		print AUTH "$login:u_name=$login:u_id#$max_uid:u_pwd=$crypt_passwd:u_succhg#",time,":u_lock\@:chkent:\n";
 #		close(AUTH);
 #	}
 
 	system "mkdir -p $dir ; mkdir $dir/bin ; \
-		chown -R $uid:$group_id{$group} $dir ; chmod 755 $dir" if (! $debug);
+		chown -R $max_uid:$group_id{$group} $dir ; chmod 755 $dir" if (! $debug);
 
 	$dbh->do("insert into status (osoba_id,kontakt_osoba_id,datum,status_tip_id) values ($osoba_id,$ko_id,'now'::datetime,3)") if (! $debug);