socsvn commit: r294623 - soc2013/def/crashdump-head/sbin/dumpon

[def at FreeBSD.org]

Author: def
Date: Mon Nov 30 22:01:50 2015
New Revision: 294623
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294623

Log:
  Use new DIOCSKERNELDUMP I/O control.

Modified:
  soc2013/def/crashdump-head/sbin/dumpon/dumpon.c

Modified: soc2013/def/crashdump-head/sbin/dumpon/dumpon.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Mon Nov 30 21:58:51 2015	(r294622)
+++ soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Mon Nov 30 22:01:50 2015	(r294623)
@@ -144,8 +144,6 @@
 		errx(1, "Unable to encrypt the one-time key.");
 	}
 	RSA_free(pubkey);
-
-	kda->kda_encrypt = 1;
 }
 
 static void
@@ -218,12 +216,12 @@
 		check_size(fd, argv[0]);
 		bzero(&kda, sizeof(kda));
 		kda.kda_enable = 0;
-		i = ioctl(fd, DIOCSEKCD, &kda);
+		i = ioctl(fd, DIOCSKERNELDUMP, &kda);
 		bzero(&kda, sizeof(kda));
 		if (pubkeyfile != NULL)
 			genkey(pubkeyfile, &kda);
 		kda.kda_enable = 1;
-		i = ioctl(fd, DIOCSEKCD, &kda);
+		i = ioctl(fd, DIOCSKERNELDUMP, &kda);
 		bzero(kda.kda_encryptedkey, kda.kda_encryptedkeysize);
 		free(kda.kda_encryptedkey);
 		bzero(&kda, sizeof(kda));
@@ -234,12 +232,12 @@
 		if (fd < 0)
 			err(EX_OSFILE, "%s", _PATH_DEVNULL);
 		kda.kda_enable = 0;
-		i = ioctl(fd, DIOCSEKCD, &kda);
+		i = ioctl(fd, DIOCSKERNELDUMP, &kda);
 		if (i == 0 && verbose)
 			printf("kernel dumps disabled\n");
 	}
 	if (i < 0)
-		err(EX_OSERR, "ioctl(DIOCSEKCD)");
+		err(EX_OSERR, "ioctl(DIOCSKERNELDUMP)");
 
 	exit (0);
 }