CP-37241: Avoid using List.hd

Signed-off-by: Lin Liu <[email protected]>

Author: liulinC

ocaml/tests/test_data/repository_pkg_of_fullname_all

@@ -253,7 +253,6 @@ intel-igb-5.3.5.20-2.xs8.x86_64
 nss-pem-1.0.3-4.el7.x86_64
 gssproxy-0.7.0-17.el7.x86_64
 nss-sysinit-3.36.0-7.el7_5.x86_64
-pbis-open-8.2.3-1.7.8.xs8.x86_64
 mailx-12.5-19.el7.x86_64
 system-config-firewall-base-1.2.29-10.el7.noarch
 libgomp-4.8.5-28.el7_5.1.x86_64
@@ -464,7 +463,6 @@ broadcom-bnxt-en-1.10.0_216.0.119.1-2.xs8.x86_64
 tar-1.26-34.el7.x86_64
 avago-megaraid-sas-07.713.01.00+rc1-2.xs8.x86_64
 nss-softokn-3.36.0-5.el7_5.x86_64
-pbis-open-upgrade-8.2.2-3.xs8.x86_64
 nss-tools-3.36.0-7.el7_5.x86_64
 forkexecd-1.22.0-7.xs8.x86_64
 libunistring-0.9.3-9.el7.x86_64

ocaml/xapi/extauth.ml

@@ -44,7 +44,7 @@ module Ext_auth = struct
     | "PAM" ->
         (*pam/nss unix services*)
         Authx.AuthX.methods
-    (* the PBIS authentication plugin *)
+    (* the external authentication plugin *)
     | "AD" ->
         (*windows active directory*)
         Extauth_ad.methods()

ocaml/xapi/extauth_plugin_ADwinbind.ml

@@ -380,15 +380,22 @@ let query_domain_workgroup ~domain ~db_workgroup =
       let err_msg =
         Printf.sprintf "Failed to look up domain %s workgroup" domain
       in
+      let hd msg = function
+        | [] ->
+            error "%s" msg ;
+            raise (Auth_service_error (E_LOOKUP, msg))
+        | h :: _ ->
+            h
+      in
       try
         let kdc =
           Helpers.call_script ~log_output:On_failure net_cmd
             ["lookup"; "kdc"; domain; "-d"; debug_level]
           (* Result like 10.71.212.25:88\n10.62.1.25:88\n*)
           |> String.split_on_char '\n'
-          |> List.hd
+          |> hd "lookup kdc return invalid result"
           |> String.split_on_char ':'
-          |> List.hd
+          |> hd "kdc has invalid address"
         in
 
         let lines =

ocaml/xapi/xapi.ml

@@ -1364,7 +1364,7 @@ let server_init () =
             , fun () ->
                 call_extauth_hook_script_before_xapi_initialize ~__context
             )
-          ; ( "Initializing lwsmd service"
+          ; ( "Initializing AD external auth service"
             , [Startup.NoExnRaising]
             , fun () -> Extauth_ad.init_service ~__context )
           ; ( "Calling on_xapi_initialize event hook in the external \

ocaml/xapi/xapi_host.ml

@@ -1217,7 +1217,7 @@ let set_hostname_live ~__context ~host ~hostname =
       let current_auth_type =
         Db.Host.get_external_auth_type ~__context ~self:host
       in
-      (* the AD/Likewise extauth plugin is incompatible with a hostname change *)
+      (* the AD extauth plugin is incompatible with a hostname change *)
       ( if current_auth_type = Xapi_globs.auth_type_AD then
           let current_service_name =
             Db.Host.get_external_auth_service_name ~__context ~self:host

quality-gate.sh

@@ -3,7 +3,7 @@
 set -e
 
 list-hd () {
-  N=297
+  N=295
   LIST_HD=$(git grep -r --count 'List.hd' -- **/*.ml | cut -d ':' -f 2 | paste -sd+ - | bc)
   if [ "$LIST_HD" -eq "$N" ]; then
     echo "OK counted $LIST_HD usages"