From 63e2f30fd5c595de45a0f308b5bf1c4196a26816 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@samba.org>
Date: Mon, 9 Jun 2014 23:36:23 +0200
Subject: [PATCH] Move kadmin and ktutil to /usr/bin.

---
 admin/Makefile.am             | 4 ++--
 admin/{ktutil.8 => ktutil.1}  | 4 ++--
 kadmin/Makefile.am            | 4 ++--
 kadmin/{kadmin.8 => kadmin.1} | 2 +-
 kadmin/kadmind.8              | 2 +-
 lib/krb5/kerberos.8           | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename admin/{ktutil.8 => ktutil.1} (99%)
 rename kadmin/{kadmin.8 => kadmin.1} (99%)

diff --git a/admin/Makefile.am b/admin/Makefile.am
index 7bb5ef505..21d015780 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -4,9 +4,9 @@ include $(top_srcdir)/Makefile.am.common
 
 AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto)
 
-man_MANS = ktutil.8
+man_MANS = ktutil.1
 
-sbin_PROGRAMS = ktutil
+bin_PROGRAMS = ktutil
 
 dist_ktutil_SOURCES =				\
 	add.c					\
diff --git a/admin/ktutil.8 b/admin/ktutil.1
similarity index 99%
rename from admin/ktutil.8
rename to admin/ktutil.1
index 72a6c8172..a90541991 100644
--- a/admin/ktutil.8
+++ b/admin/ktutil.1
@@ -32,7 +32,7 @@
 .\" $Id$
 .\"
 .Dd April 14, 2005
-.Dt KTUTIL 8
+.Dt KTUTIL 1
 .Os HEIMDAL
 .Sh NAME
 .Nm ktutil
@@ -121,4 +121,4 @@ that is at least
 (default one week) old.
 .El
 .Sh SEE ALSO
-.Xr kadmin 8
+.Xr kadmin 1
diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 38f7ddecf..3ac6950a0 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -4,11 +4,11 @@ include $(top_srcdir)/Makefile.am.common
 
 AM_CPPFLAGS += $(INCLUDE_libintl) $(INCLUDE_readline) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 -I$(top_builddir)/include/gssapi
 
-sbin_PROGRAMS = kadmin
+bin_PROGRAMS = kadmin
 
 libexec_PROGRAMS = kadmind
 
-man_MANS = kadmin.8 kadmind.8
+man_MANS = kadmin.1 kadmind.8
 
 noinst_PROGRAMS = add_random_users
 
diff --git a/kadmin/kadmin.8 b/kadmin/kadmin.1
similarity index 99%
rename from kadmin/kadmin.8
rename to kadmin/kadmin.1
index eafead0a2..ca61f7147 100644
--- a/kadmin/kadmin.8
+++ b/kadmin/kadmin.1
@@ -32,7 +32,7 @@
 .\" $Id$
 .\"
 .Dd Feb  22, 2007
-.Dt KADMIN 8
+.Dt KADMIN 1
 .Os HEIMDAL
 .Sh NAME
 .Nm kadmin
diff --git a/kadmin/kadmind.8 b/kadmin/kadmind.8
index 453b8e7bd..f66615932 100644
--- a/kadmin/kadmind.8
+++ b/kadmin/kadmind.8
@@ -158,6 +158,6 @@ mallory/admin@EXAMPLE.COM  add,get-keys  host/*@EXAMPLE.COM
 .\".Sh DIAGNOSTICS
 .Sh SEE ALSO
 .Xr kpasswd 1 ,
-.Xr kadmin 8 ,
+.Xr kadmin 1 ,
 .Xr kdc 8 ,
 .Xr kpasswdd 8
diff --git a/lib/krb5/kerberos.8 b/lib/krb5/kerberos.8
index 1465a5bd1..d54ced53e 100644
--- a/lib/krb5/kerberos.8
+++ b/lib/krb5/kerberos.8
@@ -85,9 +85,9 @@ For setup instructions see the Heimdal Texinfo manual.
 .Xr telnet 1 ,
 .Xr krb5 3 ,
 .Xr krb5.conf 5 ,
-.Xr kadmin 8 ,
+.Xr kadmin 1 ,
 .Xr kdc 8 ,
-.Xr ktutil 8
+.Xr ktutil 1
 .Sh HISTORY
 The Kerberos authentication system was developed in the late 1980's as
 part of the Athena Project at the Massachusetts Institute of
-- 
2.11.4.GIT