Merge branch 'master' of git.scc.kit.edu:tobias.dussa/ca-tools

Conflicts:
	ApproveRequest/ApproveRequest.jar
	ApproveRequest/src/main/ApproveRequest.jar

ApproveRequest/ApproveRequest.java

@@ -74,6 +74,11 @@ public class ApproveRequest {
         // get the actual request info now
         myExtendedRequestInfo = registration.getExtendedRequestInfo(requestID);
 
+        // if dry run selected, print notification
+        if (dryrun) {
+            System.out.println("\nDRYRUN.  NOT ACTUALLY APPROVING ANYTHING.");
+        }
+
         // print the information and, if necessary, request confirmation
         System.out.println("\n" +
                            "Request ID " + requestID + ": Submitted at " +
@@ -135,9 +140,7 @@ public class ApproveRequest {
         if (fingerprint.length() == 0) {
             System.out.println("SKIPPED!");
         } else {
-            if (dryrun) {
-                System.out.println("DRYRUN.  NOT ACTUALLY APPROVING ANYTHING.");
-            } else {
+            if (! dryrun) {
                byte rawRequest[] = registration.getRawRequest(requestID);
                registration.approveRequest(requestID,
                                            rawRequest,