Skip to content

Commit a56c69d

Browse files
committed
CA-77465 fix: xe pool-certificate-install now works with a filepath.
Also fixed the same bug in pool-crl-install. Signed-off-by: Thomas Sanders <[email protected]>
1 parent e1f7646 commit a56c69d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

ocaml/xapi/cli_operations.ml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,8 +1025,8 @@ let pool_certificate_install fd printer rpc session_id params =
10251025
let filename = List.assoc "filename" params in
10261026
match get_client_file fd filename with
10271027
| Some cert ->
1028-
Client.Pool.certificate_install ~rpc ~session_id ~name:filename
1029-
~cert
1028+
Client.Pool.certificate_install ~rpc ~session_id
1029+
~name:(Filename.basename filename) ~cert
10301030
| None ->
10311031
marshal fd (Command (PrintStderr "Failed to read certificate\n"));
10321032
raise (ExitWithError 1)
@@ -1043,7 +1043,8 @@ let pool_crl_install fd printer rpc session_id params =
10431043
let filename = List.assoc "filename" params in
10441044
match get_client_file fd filename with
10451045
| Some cert ->
1046-
Client.Pool.crl_install ~rpc ~session_id ~name:filename ~cert
1046+
Client.Pool.crl_install ~rpc ~session_id
1047+
~name:(Filename.basename filename) ~cert
10471048
| None ->
10481049
marshal fd (Command (PrintStderr "Failed to read CRL\n"));
10491050
raise (ExitWithError 1)

0 commit comments

Comments
 (0)