X-Git-Url: https://git.svenne.dk/?p=public%2Fdnssec-swede-utility.git;a=blobdiff_plain;f=swede;h=8e329127dbce1e3a25356f1d7cd492ebd56d1ec1;hp=861211e85b9834b674f487bcd53c2e3d8efd27d5;hb=c72c29895d1bfdaeb16fc726c5d76d7944143a7f;hpb=6bc17355f735d67bd6453d5cc547cf049a5cb2af

diff --git a/swede b/swede
index 861211e..8e32912 100755
--- a/swede
+++ b/swede
@@ -295,7 +295,7 @@ class TLSARecord:
 
 	def isNameValid(self):
 		"""Check if the name if in the correct format"""
-		if not re.match('^(_\d{1,5}|\*)\._(tcp|udp|sctp)\.([a-z0-9]*\.){2,}$', self.name):
+		if not re.match('^(_\d{1,5}|\*)\._(tcp|udp|sctp)\.([-a-z0-9]*\.){2,}$', self.name):
 			return False
 		return True
 
@@ -423,8 +423,8 @@ if __name__ == '__main__':
 			try:
 				record.isValid(raiseException=True)
 			except RecordValidityException, e:
-				print sys.stderr, 'Error: %s' % str(e)
-				sys.exit(1)
+				print >> sys.stderr, 'Error: %s' % str(e)
+				continue
 			else:
 				if not args.quiet:
 					print 'This record is valid (well-formed).'
@@ -588,14 +588,14 @@ if __name__ == '__main__':
 							break
 
 				if cert: # Print the requested records based on the retrieved certificates
-					if args.output == 'b':
+					if args.output == 'both':
 						print genTLSA(args.host, args.protocol, args.port, cert, 'draft', args.usage, args.selector, args.mtype)
 						print genTLSA(args.host, args.protocol, args.port, cert, 'rfc', args.usage, args.selector, args.mtype)
 					else:
 						print genTLSA(args.host, args.protocol, args.port, cert, args.output, args.usage, args.selector, args.mtype)
 
 		else: # Pass the path to the certificate to the genTLSA function
-			if args.output == 'b':
+			if args.output == 'both':
 				print genTLSA(args.host, args.protocol, args.port, args.certificate, 'draft', args.usage, args.selector, args.mtype)
 				print genTLSA(args.host, args.protocol, args.port, args.certificate, 'rfc', args.usage, args.selector, args.mtype)
 			else: