فهرست منبع

Ticket 48448 - dirsrv start-stop fail in certain shell environments.

Bug Description:  Dirsrv fails to start and stop with certain shell environments
. This is due to the usage of the pattern

  cd $SERVERBIN_DIR
  ./ns-slapd ...

Fix Description:  Change all invocations of commands to use explicit paths:

  $SERVERBIN_DIR/ns-slapd

https://fedorahosted.org/389/ticket/48448

Author: wibrown

Review by: nhosoi (Thanks!)
William Brown 9 سال پیش
والد
کامیت
1d4fcea86f

+ 1 - 1
ldap/admin/src/scripts/start-dirsrv.in

@@ -70,7 +70,7 @@ start_instance() {
             return 1
         fi
     else
-        cd $SERVERBIN_DIR; ./ns-slapd -D $CONFIG_DIR -i $PIDFILE -w $STARTPIDFILE "$@"
+        $SERVERBIN_DIR/ns-slapd -D $CONFIG_DIR -i $PIDFILE -w $STARTPIDFILE "$@"
         if [ $? -ne 0 ]; then
             return 1
         fi

+ 1 - 2
ldap/admin/src/scripts/template-bak2db.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./bak2db "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/bak2db "$@" -Z {{SERV-ID}}
 exit $?

+ 2 - 3
ldap/admin/src/scripts/template-db2bak.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./db2bak "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/db2bak "$@" -Z {{SERV-ID}}
+exit $?

+ 2 - 3
ldap/admin/src/scripts/template-db2index.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./db2index "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/db2index "$@" -Z {{SERV-ID}}
+exit $?

+ 1 - 2
ldap/admin/src/scripts/template-db2ldif.in

@@ -1,6 +1,5 @@
 #!/bin/sh
 
 cwd=`pwd`
-cd {{SERVERBIN-DIR}}
-./db2ldif "$@" -Z {{SERV-ID}} -c $cwd
+{{SERVERBIN-DIR}}/db2ldif "$@" -Z {{SERV-ID}} -c $cwd
 exit $?

+ 2 - 3
ldap/admin/src/scripts/template-dbverify.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./dbverify "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/dbverify "$@" -Z {{SERV-ID}}
+exit $?

+ 2 - 3
ldap/admin/src/scripts/template-dn2rdn.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./dn2rdn "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/dn2rdn "$@" -Z {{SERV-ID}}
+exit $?

+ 1 - 2
ldap/admin/src/scripts/template-ldif2db.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./ldif2db "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/ldif2db "$@" -Z {{SERV-ID}}
 exit $?

+ 2 - 3
ldap/admin/src/scripts/template-ldif2ldap.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./ldif2ldap "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/ldif2ldap "$@" -Z {{SERV-ID}}
+exit $?

+ 2 - 3
ldap/admin/src/scripts/template-monitor.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./monitor "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/monitor "$@" -Z {{SERV-ID}}
+exit $?

+ 2 - 3
ldap/admin/src/scripts/template-restoreconfig.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./restoreconfig "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/restoreconfig "$@" -Z {{SERV-ID}}
+exit $?

+ 2 - 3
ldap/admin/src/scripts/template-saveconfig.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./saveconfig "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/saveconfig "$@" -Z {{SERV-ID}}
+exit $?

+ 2 - 3
ldap/admin/src/scripts/template-suffix2instance.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./suffix2instance "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/suffix2instance "$@" -Z {{SERV-ID}}
+exit $?

+ 1 - 2
ldap/admin/src/scripts/template-upgradedb.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./upgradedb "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/upgradedb "$@" -Z {{SERV-ID}}
 exit $?

+ 2 - 3
ldap/admin/src/scripts/template-upgradednformat.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./upgradednformat "$@" -Z {{SERV-ID}}
-exit $?
+{{SERVERBIN-DIR}}/upgradednformat "$@" -Z {{SERV-ID}}
+exit $?

+ 1 - 2
ldap/admin/src/scripts/template-vlvindex.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd {{SERVERBIN-DIR}}
-./vlvindex "$@" -Z {{SERV-ID}}
+{{SERVERBIN-DIR}}/vlvindex "$@" -Z {{SERV-ID}}
 exit $?