Rename "secure-bits" service property to "securebits"

The relevant documentation calls it "securebits" so let's stick with
that pre-established term/spelling.

Author: davmac314

doc/manpages/dinit-service.5.m4

@@ -595,16 +595,16 @@ For example, to allow a process to bind to privileged TCP/IP ports, use \fB^CAP_
 .IP
 This setting is only available if \fBdinit\fR was built with capabilities support.
 .TP
-\fBsecure\-bits\fR = \fIsecurebits\fR
+\fBsecurebits\fR = \fIsecurebits-flags\fR
 .TQ
-\fBsecure\-bits\fR += \fIsecurebits-addendum\fR
+\fBsecure\-bits\fR += \fIsecurebits-flags-addendum\fR
 This is a companion option to \fBcapabilities\fR, specifying the `securebits' flags
 (see \fBcapabilities\fR(7)) for the service process(es).
-It is specified as a list of flags separated by white space.
+It is specified as a list of flag names separated by white space.
 The allowed flags are \fBkeep\-caps\fR,
 \fBno\-setuid\-fixup\fR, \fBnoroot\fR, and each of these with \fB\-locked\fR appended.
-The `+=' operator used with this setting can be used to add additional securebits on top of those
-specified previously.
+The `+=' operator used with this setting can be used to add additional securebits flags on top of
+those specified previously.
 .IP
 This setting is only available if \fBdinit\fR was built with capabilities support.
 .TP

src/includes/load-service.h

@@ -269,7 +269,7 @@ enum class setting_id_t {
 #endif
 #if SUPPORT_CAPABILITIES
     CAPABILITIES,
-    SECURE_BITS,
+    SECUREBITS,
 #endif
 #if SUPPORT_IOPRIO
     IOPRIO,
@@ -1521,7 +1521,7 @@ class service_settings_wrapper
                 report_lint("'capabilities' specified, but ignored for the specified (or default) service type.");
             }
             if (secbits.get()) {
-                report_lint("'secure-bits' specified, but ignored for the specified (or default) service type.");
+                report_lint("'securebits' specified, but ignored for the specified (or default) service type.");
             }
             #endif
             if (run_as_uid != (uid_t)-1) {
@@ -1746,7 +1746,7 @@ void process_service_line(settings_wrapper &settings, ::string_view name, const
             settings.capabilities = std::move(cap_iab);
             break;
         }
-        case setting_id_t::SECURE_BITS:
+        case setting_id_t::SECUREBITS:
         {
             std::list<std::pair<unsigned,unsigned>> indices;
             string onstart_cmds = read_setting_value(input_pos, i, end, &indices);
@@ -1777,7 +1777,7 @@ void process_service_line(settings_wrapper &settings, ::string_view name, const
                 }
                 else {
                     throw service_description_exc(name, "unknown securebits flag: " + secbit_txt,
-                            "secure-bits", input_pos);
+                            "securebits", input_pos);
                 }
             }
             break;

src/settings.cc

@@ -65,7 +65,7 @@ setting_details all_settings[] = {
 
 #if SUPPORT_CAPABILITIES
         {"capabilities",            setting_id_t::CAPABILITIES,             false,  true,    true},
-        {"secure-bits",             setting_id_t::SECURE_BITS,              false,  true,    true},
+        {"securebits",              setting_id_t::SECUREBITS,              false,  true,    true},
 #endif
 
 #if SUPPORT_IOPRIO