[Fedora-directory-commits] adminserver/admserv/cfgstuff ds_removal.in, 1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5436/adminserver/admserv/cfgstuff

Modified Files:
	ds_removal.in 
Log Message:
Reviewed by: nkinder (Thanks!)
Branch: HEAD
Fix Description: Added -f (force) flag to ds_removal.  The -f (force) flag tells ds_removal to ignore errors and attempt to remove as much as possible.  This is only suggested to be used if ds_removal without the -f flag fails, and you really, really want to remove the ds.
Platforms tested: RHEL5, Fedora 8, Fedora 9
Flag Day: no
Doc impact: no 



Index: ds_removal.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/ds_removal.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_removal.in	27 Jul 2007 01:35:28 -0000	1.1
+++ ds_removal.in	14 Jul 2008 20:27:02 -0000	1.2
@@ -39,9 +39,10 @@
 
 Usage()
 {
-    echo "Usage: $0 -s server_id -w admin_password"
+    echo "Usage: $0 [-f] -s server_id -w admin_password"
     echo "       server_id: Directory server identifier; slapd-<server_id>"
     echo "       admin_password: Administration user password"
+    echo "       -f - force - optional - ignore errors and force removal of as much as possible"
 }
 
 err0=""
@@ -49,6 +50,7 @@
 err2=""
 server_id=""
 admin_pw=""
+forceflag=
 
 while [ "$1" != "" ]
 do
@@ -58,6 +60,8 @@
     elif [ "$1" = "-w" ]; then
         shift
         admin_pw=$1
+    elif [ "$1" = "-f" ]; then
+        forceflag=1
     elif [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--help" ]; then
         Usage
         exit 0
@@ -83,7 +87,7 @@
 fi
 
 PASSWORD_PIPE=STDIN; export PASSWORD_PIPE
-QUERY_STRING="InstanceName=slapd-${server_id}"; export QUERY_STRING
+QUERY_STRING="InstanceName=slapd-${server_id}&force=$forceflag"; export QUERY_STRING
 SERVER_NAMES=slapd-${server_id}; export SERVER_NAMES
 REQUEST_METHOD=GET; export REQUEST_METHOD