mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

lutoff
24.50.2007 aefdd0172850482c9e2893180b0d985843c63a10
Fix for [Issue 1401]  revoke support for '/' as option prefix
10 files modified
32 ■■■■ changed files
opends/src/server/org/opends/server/util/args/ArgumentParser.java 4 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java 4 ●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java 3 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java 3 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java 2 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java 3 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java 4 ●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java 3 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java 3 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java 3 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -734,14 +734,14 @@
          }
        }
      }
      else if (arg.startsWith("-") || arg.startsWith("/"))
      else if (arg.startsWith("-"))
      {
        // This indicates that we are using the 1-character name to reference
        // the argument.  It may be in any of the following forms:
        // -n
        // -nvalue
        // -n value
        if (arg.equals("-") || arg.equals("/"))
        if (arg.equals("-"))
        {
          int    msgID   = MSGID_ARGPARSER_INVALID_DASH_AS_ARGUMENT;
          String message = getMessage(msgID);
opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -809,14 +809,14 @@
          }
        }
      }
      else if (arg.startsWith("-") || arg.startsWith("/"))
      else if (arg.startsWith("-"))
      {
        // This indicates that we are using the 1-character name to reference
        // the argument.  It may be in any of the following forms:
        // -n
        // -nvalue
        // -n value
        if (arg.equals("-") || arg.equals("/"))
        if (arg.equals("-"))
        {
          int    msgID   = MSGID_SUBCMDPARSER_INVALID_DASH_AS_ARGUMENT;
          String message = getMessage(msgID);
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
@@ -768,9 +768,6 @@
    args = new String[] { "-?" };
    assertEquals(EncodePassword.encodePassword(args, false, null, null), 0);
    args = new String[] { "/?" };
    assertEquals(EncodePassword.encodePassword(args, false, null, null), 0);
  }
}
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -1200,9 +1200,6 @@
    args = new String[] { "-?" };
    assertEquals(LDAPCompare.mainCompare(args, false, null, null), 0);
    args = new String[] { "/?" };
    assertEquals(LDAPCompare.mainCompare(args, false, null, null), 0);
  }
}
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -965,8 +965,6 @@
    args = new String[] { "-?" };
    assertEquals(LDAPDelete.mainDelete(args, false, null, null), 0);
    args = new String[] { "/?" };
    assertEquals(LDAPDelete.mainDelete(args, false, null, null), 0);
  }
}
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -1938,9 +1938,6 @@
    args = new String[] { "-?" };
    assertEquals(LDAPModify.mainModify(args, false, null, null), 0);
    args = new String[] { "/?" };
    assertEquals(LDAPModify.mainModify(args, false, null, null), 0);
  }
}
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -1112,10 +1112,6 @@
    args = new String[] { "-?" };
    assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
                 0);
    args = new String[] { "/?" };
    assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
                 0);
  }
}
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -1705,9 +1705,6 @@
    args = new String[] { "-?" };
    assertEquals(LDAPSearch.mainSearch(args, false, null, null), 0);
    args = new String[] { "/?" };
    assertEquals(LDAPSearch.mainSearch(args, false, null, null), 0);
  }
}
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
@@ -93,9 +93,6 @@
    args = new String[] { "-?" };
    assertEquals(LDIFDiff.mainDiff(args, true), 0);
    args = new String[] { "/?" };
    assertEquals(LDIFDiff.mainDiff(args, true), 0);
  }
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
@@ -395,9 +395,6 @@
    args = new String[] { "-?" };
    assertEquals(ListBackends.listBackends(args, false, null, null), 0);
    args = new String[] { "/?" };
    assertEquals(ListBackends.listBackends(args, false, null, null), 0);
  }
}