Skip to content

Commit aa02b52

Browse files
Andrii Sultanovlindig
authored andcommitted
CP-50079: Remove legacy sync_config_files interface
Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
1 parent f42840c commit aa02b52

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

ocaml/xapi/config_file_sync.ml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,6 @@ let write_to_fd s msg =
4848
let transmit_config_files s =
4949
read_config_file () |> rpc_of_config |> Jsonrpc.to_string |> write_to_fd s
5050

51-
(* We still need to respect older XenServer hosts which are expecting
52-
the entire /etc/password file. We need to make sure we send the
53-
"un-shadowed" passwd file, so that slaves don't overwrite root's
54-
password with an 'x'. *)
55-
56-
(* This was introduced in 8c4d3d93f8c0e069b8b0de9c2e2df02a391aa2ef xapi
57-
* version 1.9.41 and can be removed when during rolling pool
58-
* upgrade the config_sync_version is always passed from slave to
59-
* master. We believe that Dundee is the first version where this code
60-
* shipped. Hence, it can be removed once RPU from pre-Dundee is no
61-
* longer supported.
62-
*)
63-
64-
let legacy_transmit_passwd s =
65-
debug "Updating /etc/passwd (%s)" __LOC__ ;
66-
Unixpwd.unshadow () |> write_to_fd s
67-
6851
(** URL used by slaves to fetch dom0 config files (currently just root's password) *)
6952
let config_file_sync_handler (req : Http.Request.t) s _ =
7053
let current version =
@@ -86,9 +69,8 @@ let config_file_sync_handler (req : Http.Request.t) s _ =
8669
transmit_config_files s ;
8770
debug "finished writing dom0 config files"
8871
| _ ->
89-
debug "writing legacy dom0 config files" ;
90-
legacy_transmit_passwd s ;
91-
debug "finished writing legacy dom0 config files"
72+
write_to_fd s "Warning: legacy dom0 config files not supported" ;
73+
warn "legacy dom0 config files not supported"
9274
)
9375

9476
let fetch_config_files_internal ~master_address =

0 commit comments

Comments
 (0)