diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-04-10 20:18:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:11 -0500 |
| commit | af34710d4da1841653624fe304b1c8d812c0fdd9 (patch) | |
| tree | 0ea226e9cf9f08f8386f30e4db3278d75ef520bf /source/utils | |
| parent | 31c23f14d60a4aa41e0500e369f25ed6dc7ddae7 (diff) | |
| download | samba-af34710d4da1841653624fe304b1c8d812c0fdd9.tar.gz | |
r152: a quick airport commit ....
added ldbedit, a _really_ useful command
added ldbadd, ldbdel, ldbsearch and ldbmodify to build
solved lots of timezone issues, we now pass the torture tests with
client and server in different zones
fixed several build issues
I know this breaks the no-LDAP build. Wait till I arrive in San Jose for that
fix.
Diffstat (limited to 'source/utils')
| -rw-r--r-- | source/utils/ndrdump.c | 2 | ||||
| -rw-r--r-- | source/utils/net_ads.c | 2 | ||||
| -rw-r--r-- | source/utils/pdbedit.c | 12 | ||||
| -rw-r--r-- | source/utils/status.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/source/utils/ndrdump.c b/source/utils/ndrdump.c index 7916ccec344..d02d993604f 100644 --- a/source/utils/ndrdump.c +++ b/source/utils/ndrdump.c @@ -20,7 +20,7 @@ #include "includes.h" -static struct dcerpc_interface_table *find_pipe(const char *pipe_name) +static const struct dcerpc_interface_table *find_pipe(const char *pipe_name) { int i; for (i=0;dcerpc_pipes[i];i++) { diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c index 6fb6394764b..9febb694a9d 100644 --- a/source/utils/net_ads.c +++ b/source/utils/net_ads.c @@ -107,7 +107,7 @@ static int net_ads_info(int argc, const char **argv) d_printf("Realm: %s\n", ads->config.realm); d_printf("Bind Path: %s\n", ads->config.bind_path); d_printf("LDAP port: %d\n", ads->ldap_port); - d_printf("Server time: %s\n", http_timestring(ads->config.current_time)); + d_printf("Server time: %s\n", timestring(ads->config.current_time)); return 0; } diff --git a/source/utils/pdbedit.c b/source/utils/pdbedit.c index 15e0b50fa9a..8038900c28a 100644 --- a/source/utils/pdbedit.c +++ b/source/utils/pdbedit.c @@ -119,22 +119,22 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst printf ("Munged dial: %s\n", pdb_get_munged_dial(sam_pwent)); tmp = pdb_get_logon_time(sam_pwent); - printf ("Logon time: %s\n", tmp ? http_timestring(tmp) : "0"); + printf ("Logon time: %s\n", tmp ? timestring(tmp) : "0"); tmp = pdb_get_logoff_time(sam_pwent); - printf ("Logoff time: %s\n", tmp ? http_timestring(tmp) : "0"); + printf ("Logoff time: %s\n", tmp ? timestring(tmp) : "0"); tmp = pdb_get_kickoff_time(sam_pwent); - printf ("Kickoff time: %s\n", tmp ? http_timestring(tmp) : "0"); + printf ("Kickoff time: %s\n", tmp ? timestring(tmp) : "0"); tmp = pdb_get_pass_last_set_time(sam_pwent); - printf ("Password last set: %s\n", tmp ? http_timestring(tmp) : "0"); + printf ("Password last set: %s\n", tmp ? timestring(tmp) : "0"); tmp = pdb_get_pass_can_change_time(sam_pwent); - printf ("Password can change: %s\n", tmp ? http_timestring(tmp) : "0"); + printf ("Password can change: %s\n", tmp ? timestring(tmp) : "0"); tmp = pdb_get_pass_must_change_time(sam_pwent); - printf ("Password must change: %s\n", tmp ? http_timestring(tmp) : "0"); + printf ("Password must change: %s\n", tmp ? timestring(tmp) : "0"); } else if (smbpwdstyle) { if (IS_SAM_UNIX_USER(sam_pwent)) { diff --git a/source/utils/status.c b/source/utils/status.c index c28b0a41fd0..71a5f78db86 100644 --- a/source/utils/status.c +++ b/source/utils/status.c @@ -114,7 +114,7 @@ static void print_share_mode(share_mode_entry *e, char *fname) d_printf("NONE "); d_printf(" %s %s",fname, - asctime(LocalTime((time_t *)&e->time.tv_sec))); + asctime(localtime((time_t *)&e->time.tv_sec))); } } @@ -511,7 +511,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st d_printf("%-10.10s %5d %-12s %s", crec.name,(int)crec.pid, crec.machine, - asctime(LocalTime(&crec.start))); + asctime(localtime(&crec.start))); return 0; } |