X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Finterfaces%2Ftimedated%2Ftimedated.c;h=c4f5033876abd4368383cb8e5f3b413efccce18d;hb=5b56a1e839b2572e0aa1d4b6143700a424ff509c;hp=8fb1ce5bd206396d62373225eecd77e4f45935c6;hpb=0b7afeee3bb89a0185de1cb3d9937434f24388d7;p=systembsd.git diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c index 8fb1ce5..c4f5033 100644 --- a/src/interfaces/timedated/timedated.c +++ b/src/interfaces/timedated/timedated.c @@ -271,7 +271,7 @@ on_handle_set_local_rtc(Timedate1 *td1_passed_interf, const gchar *greet, gpointer data) { - g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ENODEV", "OpenBSD does not support setting the realtime clock in local time, only UTC."); + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ENODEV", "Unix RTC must be in UTC."); return TRUE; } @@ -280,9 +280,82 @@ on_handle_set_ntp(Timedate1 *td1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { - return FALSE; -} + GVariant *params; + const gchar *bus_name; + gboolean policykit_auth; + check_auth_result is_authed; + + /* revert to rcctl when 5.7 rolls around */ + gint ntpd_notrunning, ntpd_notenabled; /* this logic flip is due to rcctl returning 0 on success, + * in this case an error means ntpd is not running or not enabled */ + gboolean proposed_ntpstate; + GError *sh_errors; + + extern int errno; + + params = g_dbus_method_invocation_get_parameters(invoc); + g_variant_get(params, "(bb)", &proposed_ntpstate, &policykit_auth); + bus_name = g_dbus_method_invocation_get_sender(invoc); + + is_authed = polkit_try_auth(bus_name, "org.freedesktop.timedate1.set-ntp", policykit_auth); + + switch(is_authed) { + + case AUTHORIZED_NATIVELY: + case AUTHORIZED_BY_PROMPT: + break; + + case UNAUTHORIZED_NATIVELY: + case UNAUTHORIZED_FAILED_PROMPT: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EACCES", "Insufficient permissions to toggle the NTP daemon."); + return FALSE; + + case ERROR_BADBUS: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EFAULT", "Provided bus name is invalid."); + return FALSE; + + case ERROR_BADACTION: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.EFAULT", "Provided action ID is invalid."); + return FALSE; + + case ERROR_GENERIC: + default: + g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.timedate1.Error.ECANCELED", "Failed to toggle the NTP daemon for unknown reasons."); + return FALSE; + } + + ntpd_notrunning = 0; /* GLib does not bother asserting the passed return value int to zero */ + ntpd_notenabled = 0; /* if the program's exit status is also zero, hence this decl. */ + + if((ntpd_notrunning = system("/etc/rc.d/ntpd check > /dev/null 2>&1")) == -1) + return FALSE; + + if((ntpd_notenabled = system("/etc/rc.d/ntpd status > /dev/null 2>&1")) == -1) + return FALSE; + + if(proposed_ntpstate) { + + if(ntpd_notrunning) + system("/etc/rc.d/ntpd -f start > /dev/null 2>&1"); + + if(ntpd_notenabled) + system("/etc/rc.d/ntpd enable > /dev/null 2>&1"); + + } else { + + if(!ntpd_notrunning) + system("/etc/rc.d/ntpd stop > /dev/null 2>&1"); + + if(!ntpd_notenabled) + system("/etc/rc.d/ntpd disable > /dev/null 2>&1"); + } + + timedate1_complete_set_ntp(td1_passed_interf, invoc); + + return TRUE; +} +/* NOTE: you should be using gobject->set_property() for these ! */ const gchar * our_get_timezone() { @@ -324,45 +397,49 @@ our_get_timezone() { if(hash_to_match) g_free(hash_to_match); } - - - + return ret; } -/* openbsd does not support setting the RTC to localtime, only UTC */ +/* Unix time is in UTC. */ gboolean our_get_local_rtc() { - gboolean ret = FALSE; - - return ret; + return FALSE; } gboolean our_get_can_ntp() { - const gboolean ret = FALSE; + /* ntpd is part of the default install */ - return ret; + return TRUE; } gboolean our_get_ntp() { - const gboolean ret = FALSE; + int system_ret; - return ret; + system_ret = system("/etc/rc.d/ntpd check > /dev/null 2>&1"); + + if(system_ret) + return FALSE; + + return TRUE; } +/* undocumented feature present in systemd */ gboolean our_get_ntpsynchronized() { - const gboolean ret = FALSE; + gboolean ntp; + ntp = our_get_ntp(); - return ret; + return ntp; } +/* undocumented feature present in systemd */ guint64 our_get_time_usec() { @@ -371,6 +448,7 @@ our_get_time_usec() { return ret; } +/* undocumented feature present in systemd */ guint64 our_get_rtc_time_usec() { @@ -396,6 +474,7 @@ static void timedated_on_bus_acquired(GDBusConnection *conn, g_signal_connect(timedated_interf, "handle-set-ntp", G_CALLBACK(on_handle_set_ntp), NULL); /* set our properties before export */ + timedate1_set_timezone(timedated_interf, our_get_timezone()); timedate1_set_local_rtc(timedated_interf, our_get_local_rtc()); timedate1_set_can_ntp(timedated_interf, our_get_can_ntp()); @@ -404,6 +483,16 @@ static void timedated_on_bus_acquired(GDBusConnection *conn, timedate1_set_time_usec(timedated_interf, our_get_time_usec()); timedate1_set_rtctime_usec(timedated_interf, our_get_rtc_time_usec()); + /* WIP + + timedated_interf->get_timezone = our_get_timezone(); + timedated_interf->get_local_rtc = our_get_local_rtc(); + timedated_interf->get_can_ntp = our_get_can_ntp(); + timedated_interf->get_ntp = our_get_ntp(); + timedated_interf->get_ntpsynchronized = our_get_ntpsynchronized(); + timedated_interf->get_time_usec = our_get_time_usec(); + timedated_interf->get_rtctime_usec = our_get_rtc_time_usec(); */ + if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(timedated_interf), conn, "/org/freedesktop/timedate1",