-/*
- Samba Unix/Linux SMB client library
+/*
+ Samba Unix/Linux SMB client library
net time command
Copyright (C) 2001 Andrew Tridgell (tridge@samba.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
#include "includes.h"
-#include "../utils/net.h"
-
+#include "utils/net.h"
/*
return the time on a server. This does not require any authentication
*/
-static time_t cli_servertime(const char *host, struct in_addr *ip, int *zone)
+static time_t cli_servertime(const char *host, struct sockaddr_storage *pss, int *zone)
{
struct nmb_name calling, called;
time_t ret = 0;
struct cli_state *cli = NULL;
+ NTSTATUS status;
- cli = cli_initialise(NULL);
- if (!cli) goto done;
+ cli = cli_initialise();
+ if (!cli) {
+ goto done;
+ }
- if (!cli_connect(cli, host, ip)) {
- fprintf(stderr,"Can't contact server\n");
+ status = cli_connect(cli, host, pss);
+ if (!NT_STATUS_IS_OK(status)) {
+ fprintf(stderr,"Can't contact server %s. Error %s\n", host, nt_errstr(status));
goto done;
}
fprintf(stderr,"Session request failed\n");
goto done;
}
- if (!cli_negprot(cli)) {
- fprintf(stderr,"Protocol negotiation failed\n");
+ status = cli_negprot(cli);
+ if (!NT_STATUS_IS_OK(status)) {
+ fprintf(stderr, "Protocol negotiation failed: %s\n",
+ nt_errstr(status));
goto done;
}
if (zone) *zone = cli->serverzone;
done:
- if (cli) cli_shutdown(cli);
+ if (cli) {
+ cli_shutdown(cli);
+ }
return ret;
}
/* find the servers time on the opt_host host */
-static time_t nettime(int *zone)
+static time_t nettime(struct net_context *c, int *zone)
{
- extern BOOL opt_have_ip;
- extern struct in_addr opt_dest_ip;
- extern char *opt_host;
- return cli_servertime(opt_host, opt_have_ip? &opt_dest_ip : NULL, zone);
+ return cli_servertime(c->opt_host,
+ c->opt_have_ip? &c->opt_dest_ip : NULL, zone);
}
/* return a time as a string ready to be passed to /bin/date */
-static char *systime(time_t t)
+static const char *systime(time_t t)
{
- static char s[100];
+ static fstring s;
struct tm *tm;
tm = localtime(&t);
-
- snprintf(s, sizeof(s), "%02d%02d%02d%02d%04d.%02d",
- tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
+ if (!tm) {
+ return "unknown";
+ }
+
+ fstr_sprintf(s, "%02d%02d%02d%02d%04d.%02d",
+ tm->tm_mon+1, tm->tm_mday, tm->tm_hour,
tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
return s;
}
-int net_time_usage(int argc, const char **argv)
+int net_time_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(
-"net time\n\tdisplays time on a server\n\n"\
-"net time system\n\tdisplays time on a server in a format ready for /bin/date\n\n"\
-"net time set\n\truns /bin/date with the time from the server\n\n"\
-"net time zone\n\tdisplays the timezone in hours from GMT on the remote computer\n\n"\
+"net time\n\tdisplays time on a server\n\n"
+"net time system\n\tdisplays time on a server in a format ready for /bin/date\n\n"
+"net time set\n\truns /bin/date with the time from the server\n\n"
+"net time zone\n\tdisplays the timezone in hours from GMT on the remote computer\n\n"
"\n");
- net_common_flags_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
/* try to set the system clock using /bin/date */
-static int net_time_set(int argc, const char **argv)
+static int net_time_set(struct net_context *c, int argc, const char **argv)
{
- time_t t = nettime(NULL);
+ time_t t = nettime(c, NULL);
char *cmd;
+ int result;
if (t == 0) return -1;
-
- /* yes, I know this is cheesy. Use "net time system" if you want to
+
+ /* yes, I know this is cheesy. Use "net time system" if you want to
roll your own. I'm putting this in as it works on a large number
of systems and the user has a choice in whether its used or not */
- asprintf(&cmd, "/bin/date %s", systime(t));
- system(cmd);
+ if (asprintf(&cmd, "/bin/date %s", systime(t)) == -1) {
+ return -1;
+ }
+ result = system(cmd);
+ if (result)
+ d_fprintf(stderr, "%s failed. Error was (%s)\n",
+ cmd, strerror(errno));
free(cmd);
- return 0;
+ return result;
}
/* display the time on a remote box in a format ready for /bin/date */
-static int net_time_system(int argc, const char **argv)
+static int net_time_system(struct net_context *c, int argc, const char **argv)
{
- time_t t = nettime(NULL);
+ time_t t;
+
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net time system\n"
+ " Output remote time server time in a format ready "
+ "for /bin/date\n");
+ return 0;
+ }
+ t = nettime(c, NULL);
if (t == 0) return -1;
printf("%s\n", systime(t));
return 0;
}
-/* display the time on a remote box in a format ready for /bin/date */
-static int net_time_zone(int argc, const char **argv)
+/* display the remote time server's offset to UTC */
+static int net_time_zone(struct net_context *c, int argc, const char **argv)
{
int zone = 0;
int hours, mins;
char zsign;
time_t t;
- t = nettime(&zone);
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net time zone\n"
+ " Display the remote time server's offset to UTC\n");
+ return 0;
+ }
+
+ t = nettime(c, &zone);
if (t == 0) return -1;
}
/* display or set the time on a host */
-int net_time(int argc, const char **argv)
+int net_time(struct net_context *c, int argc, const char **argv)
{
time_t t;
- extern BOOL opt_have_ip;
- extern struct in_addr opt_dest_ip;
- extern char *opt_host;
struct functable func[] = {
- {"SYSTEM", net_time_system},
- {"SET", net_time_set},
- {"ZONE", net_time_zone},
- {NULL, NULL}
+ {
+ "system",
+ net_time_system,
+ NET_TRANSPORT_LOCAL,
+ "Display time ready for /bin/date",
+ "net time system\n"
+ " Display time ready for /bin/date"
+ },
+ {
+ "set",
+ net_time_set,
+ NET_TRANSPORT_LOCAL,
+ "Set the system time from time server",
+ "net time set\n"
+ " Set the system time from time server"
+ },
+ {
+ "zone",
+ net_time_zone,
+ NET_TRANSPORT_LOCAL,
+ "Display timezone offset from UTC",
+ "net time zone\n"
+ " Display timezone offset from UTC"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if (!opt_host && !opt_have_ip &&
- !find_master_ip(opt_target_workgroup, &opt_dest_ip)) {
- d_printf("Could not locate a time server. Try "\
- "specifying a target host.\n");
- net_time_usage(argc,argv);
- return -1;
+ if (argc != 0) {
+ return net_run_function(c, argc, argv, "net time", func);
}
- if (argc != 0) {
- return net_run_function(argc, argv, func, net_time_usage);
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net time\n"
+ " Display the remote time server's time\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!c->opt_host && !c->opt_have_ip &&
+ !find_master_ip(c->opt_target_workgroup, &c->opt_dest_ip)) {
+ d_fprintf(stderr, "Could not locate a time server. Try "
+ "specifying a target host.\n");
+ net_time_usage(c, argc,argv);
+ return -1;
}
/* default - print the time */
- t = cli_servertime(opt_host, opt_have_ip? &opt_dest_ip : NULL, NULL);
+ t = cli_servertime(c->opt_host, c->opt_have_ip? &c->opt_dest_ip : NULL,
+ NULL);
if (t == 0) return -1;
d_printf("%s", ctime(&t));
git.samba.org / ira / wip.git / blobdiff