X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-mail.pl;h=3076a7e99a72f44feddc30baa8f482292020b51c;hb=656d2e182686fed6d5b84ee711f2c771df3b14a7;hp=0e3c2b5b46ba359eb778452339143e21543a160a;hpb=42bcfe2cae29f375af4cf2cd3ccfa196b77a3946;p=onak.git

diff --git a/onak-mail.pl b/onak-mail.pl
index 0e3c2b5..3076a7e 100755
--- a/onak-mail.pl
+++ b/onak-mail.pl
@@ -55,21 +55,21 @@ sub submitupdate {
 	my (@errors, @mergedata);
 
 	open3(\*MERGEIN, \*MERGEOUT, \*MERGEERR,
-		"/home/noodles/onak-0.0.3/onak", "add");
+		"/home/noodles/onak-0.0.3/onak", "-u", "add");
 
 	print MERGEIN @data;
 	close MERGEIN;
-	@errors = <MERGEERR>;
 	@mergedata = <MERGEOUT>;
+	@errors = <MERGEERR>;
 
 	open (LOG, ">>/home/noodles/onak-0.0.3/keyadd.log");
-	print LOG @errors;
+	print LOG "[".localtime(time)."] ", @errors;
 	close LOG;
 
 	return @mergedata;
 }
 
-my ($inheader, %syncsites, $subject, $from, $replyto, @body, @syncmail);
+my ($inheader, %seenby, $subject, $from, $replyto, @body, @syncmail);
 
 $inheader = 1;
 $subject = "";
@@ -80,7 +80,7 @@ while (<>) {
 		if (/^Subject:\s*(.*)\s*$/i) {
 			$subject = $1;
 		} elsif (/^X-KeyServer-Sent:\s*(.*)\s*$/i) {
-			$syncsites{$1} = 1;
+			$seenby{$1} = 1;
 		} elsif (/^From:\s*(.*)\s*$/i) {
 			$from = $1;
 		} elsif (/^Reply-To:\s*(.*)\s*$/i) {
@@ -98,5 +98,53 @@ while (<>) {
 # LAST <days>
 
 if ($subject =~ /^INCREMENTAL$/i) {
-	submitupdate(@body);
+	my $site;
+	my $count;
+	my $i;
+	my @newupdate = submitupdate(@body);
+
+	$count = 0;
+	foreach $i (@{$config{'syncsites'}}) {
+		if (! defined($seenby{$i})) {
+			$count++;
+		}
+	}
+
+	open (LOG, ">>/home/noodles/logs/keyadd.log");
+	print LOG "[".localtime(time)."] Syncing with $count sites.\n";
+	close LOG;
+
+	if ($newupdate[0] eq '') {
+		open (LOG, ">>/home/noodles/logs/keyadd.log");
+		print LOG "[".localtime(time)."] Nothing to sync.\n";
+		close LOG;
+		$count = 0;
+	}
+
+	if ($count > 0) {
+		open(MAIL, "|$config{mta}");
+		print MAIL "From: $config{adminemail}\n";
+		print MAIL "To: ";
+		foreach $i (@{$config{'syncsites'}}) {
+			if (! defined($seenby{$i})) {
+				print MAIL "$i";
+				$count--;
+				if ($count > 0) {
+					print MAIL ", ";
+				}
+			}
+		}
+		print MAIL "\n";
+		print MAIL "Subject: incremental\n";
+		foreach $site (keys %seenby) {
+			print MAIL "X-KeyServer-Sent: $site\n";
+		}
+		print MAIL "X-KeyServer-Sent: $config{thissite}\n";
+		print MAIL "Precedence: list\n";
+		print MAIL "MIME-Version: 1.0\n";
+		print MAIL "Content-Type: application/pgp-keys\n";
+		print MAIL "\n";
+		print @newupdate;
+		close MAIL;
+	}
 }