Add utility to lock user accounts. Remove lock capability from ipa-deluser

Fix bootstrap.ldif to add new Class of Service entries properly
Include some man pages that weren't being installed

3 files changed, 45 insertions, 10 deletions

diff --git a/ipa-admintools/man/Makefile b/ipa-admintools/man/Makefile
index ef70cd7d..19648f53 100644
--- a/ipa-admintools/man/Makefile
+++ b/ipa-admintools/man/Makefile
@@ -1,13 +1,18 @@
 MANDIR = $(DESTDIR)/usr/share/man
 
 MANFILES=\
+	ipa-adddelegation.1 \
 	ipa-addgroup.1 \
 	ipa-adduser.1 \
+	ipa-deldelegation.1 \
 	ipa-delgroup.1 \
 	ipa-deluser.1 \
 	ipa-findgroup.1 \
 	ipa-finduser.1 \
 	ipa-groupmod.1 \
+	ipa-listdelegation.1 \
+	ipa-lockuser.1 \
+	ipa-moddelegation.1 \
 	ipa-passwd.1 \
 	ipa-usermod.1
 
diff --git a/ipa-admintools/man/ipa-deluser.1 b/ipa-admintools/man/ipa-deluser.1
index 8d82dceb..c9665a09 100644
--- a/ipa-admintools/man/ipa-deluser.1
+++ b/ipa-admintools/man/ipa-deluser.1
@@ -19,20 +19,14 @@
 .\" 
 .TH "ipa-deluser" "1" "Oct 10 2007" "freeipa" ""
 .SH "NAME"
-ipa\-deluser \- Delete or inactivate a user
+ipa\-deluser \- Delete a user
 
 .SH "SYNOPSIS"
-ipa\-deluser [\fIOPTION\fR]... \fIuser\fR
+ipa\-deluser \fIuser\fR
 
 .SH "DESCRIPTION"
-Inactivates a user with login name \fIname\fR.
+Deletes a user with login name \fIname\fR.
 
-By default users are not completely removed. They are marked as inactive. Use the [\-d|\-\-delete] option to completely remove them.
-
-Users are automatically removed from groups when they are deleted. The are not when inactivated.
-.SH "OPTIONS"
-.TP 
-\fB\-d\fR, \fB\-\-delete
-Completely remove the user from the database. The default is to mark the user inactive.
+Users are automatically removed from groups when they are deleted.
 .SH "EXIT STATUS"
 The exit status is 0 on success, nonzero on error.
diff --git a/ipa-admintools/man/ipa-lockuser.1 b/ipa-admintools/man/ipa-lockuser.1
new file mode 100644
index 00000000..2a634781
--- /dev/null
+++ b/ipa-admintools/man/ipa-lockuser.1
@@ -0,0 +1,36 @@
+.\" A man page for ipa-lockuser
+.\" Copyright (C) 2007 Red Hat, Inc.
+.\" 
+.\" This is free software; you can redistribute it and/or modify it under
+.\" the terms of the GNU Library General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\" 
+.\" This program is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+.\" General Public License for more details.
+.\" 
+.\" You should have received a copy of the GNU Library General Public
+.\" License along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" 
+.\" Author: Rob Crittenden <rcritten@redhat.com>
+.\" 
+.TH "ipa-lockuser" "1" "Oct 10 2007" "freeipa" ""
+.SH "NAME"
+ipa\-lockuser \- Lock or unlock a user account
+
+.SH "SYNOPSIS"
+ipa\-lockuser [\fIOPTION\fR]... \fIuser\fR
+
+.SH "DESCRIPTION"
+Locks a user account with login name \fIname\fR.
+
+Users are not removed from groups when their account is locked.
+.SH "OPTIONS"
+.TP 
+\fB\-u\fR, \fB\-\-unlock
+Unlock a user's account
+.SH "EXIT STATUS"
+The exit status is 0 on success, nonzero on error.