Attachment 311731 Details for Bug 435778 – diffs

[patch] diffs

diffs.bug435778 (text/plain), 4.05 KB, created by Rich Megginson on 2008-07-14 16:47:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-07-14 16:47:41 UTC

Size: 4.05 KB

patch

obsolete

>Index: adminserver/admserv/cfgstuff/ds_removal.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/ds_removal.in,v
>retrieving revision 1.1
>diff -u -8 -r1.1 ds_removal.in
>--- adminserver/admserv/cfgstuff/ds_removal.in	27 Jul 2007 01:35:28 -0000	1.1
>+++ adminserver/admserv/cfgstuff/ds_removal.in	14 Jul 2008 16:46:46 -0000
>@@ -34,35 +34,39 @@
> # 
> # Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
> 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=""
> err1=""
> err2=""
> server_id=""
> admin_pw=""
>+forceflag=
> 
> while [ "$1" != "" ]
> do
>     if [ "$1" = "-s" ]; then
>         shift
>         server_id=$1
>     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
>     else
>         err0="Option $1 is not supported. "
>     fi
>     if [ "$1" != "" ]; then
>         shift
>@@ -78,17 +82,17 @@
> 
> if [ "$err0" != "" -o "$err1" != "" -o "$err2" != "" ];then
>     echo Error: ${err0}${err1}${err2}
>     Usage
>     exit 1
> 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
> 
> if [ -c /dev/null ]; then
>     NULL=/dev/null
> else
>     NULL=/tmp/ds_remove.out
> fi
>Index: adminserver/admserv/cgi-src40/ds_remove.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
>retrieving revision 1.6
>diff -u -8 -r1.6 ds_remove.in
>--- adminserver/admserv/cgi-src40/ds_remove.in	7 Aug 2007 23:30:01 -0000	1.6
>+++ adminserver/admserv/cgi-src40/ds_remove.in	14 Jul 2008 16:46:46 -0000
>@@ -131,16 +131,17 @@
> 
> # parse the input parameters
> my $query = new CGI;
> 
> # call ds_newinst as a GET (GET or POST works, GET is simpler)
> $ENV{REQUEST_METHOD} = "GET";
> $ENV{QUERY_STRING} = $query->query_string();
> 
>+my $force = $query->param('force');
> my $instname = $query->param('InstanceName');
> my ($slapd, $inst) = split(/-/, $instname, 2);
> my $configdir = "@instconfigdir@/slapd-$inst";
> if ( ! -d $configdir )
> {
>     print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: $configdir does not exist\n";
>     print "NMC_Status: 1\n";
>@@ -184,17 +185,17 @@
> }
> 
> # Unregister the server from the configuration ds
> # get config ds url from input or admconf
> # get admin id from input or admconf
> # must get admin password from input (PASSWORD_PIPE?)
> # get admin domain
> # config ds info
>-if (!unregisterDSWithConfigDS($inst, \@errs, $inf))
>+if (!unregisterDSWithConfigDS($inst, \@errs, $inf) && !$force)
> {
>     print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>     print STDERR "Error:", $res->getText(@errs), "\n";
>     exit 1;
> }
> 
>@@ -224,17 +225,17 @@
>             my $status = $?;
>             if ($status) {
>                 # Ignore the stop failure
>                 print "Content-type: text/plain\n\n";
>                 print "NMC_ErrInfo: Could not stop directory server: $output\n";
>                 print STDERR "Warning: Could not stop directory server: $output\n";
>             }
>             $instdir = $path;    # need to use it later...
>-        } else {
>+        } elsif (!$force) {
>             print "Content-type: text/plain\n\n";
>             print "NMC_ErrInfo: The program $prog does not exist\n";
>             print "NMC_Status: 1\n";
>             print STDERR "Error: The program $prog does not exist\n";
>             exit 1;
>         }
>     }
> }

Actions: View | Diff

Attachments on bug 435778: 311731 | 311772