The branch, master has been updated
via ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3 (commit)
via ef80d1b794a209ee446c7a586530a5fdd51175f2 (commit)
from d0eeb9aa8db42ed1fc18024614560820354e6dfa (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3
Author: Jelmer Vernooij <[email protected]>
Date: Tue Dec 23 22:11:21 2008 +0100
Fix compiler warnings in libnet.
commit ef80d1b794a209ee446c7a586530a5fdd51175f2
Author: Jelmer Vernooij <[email protected]>
Date: Tue Dec 23 22:10:34 2008 +0100
Fix use of "time offset" parameter, and add test to make sure I don't break
it again :-)
-----------------------------------------------------------------------
Summary of changes:
lib/util/tests/time.c | 16 ++++++++++++++++
lib/util/time.c | 5 ++++-
lib/util/time.h | 3 +++
source3/lib/time.c | 2 --
source3/param/loadparm.c | 2 --
source4/libnet/groupinfo.c | 5 +----
source4/libnet/groupman.c | 4 +---
source4/libnet/libnet_become_dc.c | 4 ++--
source4/libnet/libnet_join.c | 2 ++
source4/libnet/userinfo.c | 5 +----
source4/libnet/userman.c | 7 ++-----
11 files changed, 32 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index 4a31566..e24c5fe 100644
--- a/lib/util/tests/time.c
+++ b/lib/util/tests/time.c
@@ -58,6 +58,21 @@ static bool test_timestring(struct torture_context *tctx)
return true;
}
+static bool test_get_time_zone(struct torture_context *tctx)
+{
+ time_t t = time(NULL);
+ int old_extra_time_offset = extra_time_offset;
+ int old_offset, new_offset;
+ /* test that extra_time_offset works */
+
+ old_offset = get_time_zone(t);
+ extra_time_offset = 42;
+ new_offset = get_time_zone(t);
+ extra_time_offset = old_extra_time_offset;
+ torture_assert_int_equal(tctx, old_offset+60*42, new_offset,
+ "time offset not used");
+ return true;
+}
struct torture_suite *torture_local_util_time(TALLOC_CTX *mem_ctx)
@@ -65,6 +80,7 @@ struct torture_suite *torture_local_util_time(TALLOC_CTX
*mem_ctx)
struct torture_suite *suite = torture_suite_create(mem_ctx, "TIME");
torture_suite_add_simple_test(suite, "null_time", test_null_time);
+ torture_suite_add_simple_test(suite, "get_time_zone",
test_get_time_zone);
torture_suite_add_simple_test(suite, "null_nttime", test_null_nttime);
torture_suite_add_simple_test(suite, "http_timestring",
test_http_timestring);
diff --git a/lib/util/time.c b/lib/util/time.c
index a001e5f..eadafe4 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -628,6 +628,9 @@ static int tm_diff(struct tm *a, struct tm *b)
return seconds;
}
+
+int extra_time_offset=0;
+
/**
return the UTC offset in seconds west of UTC, or 0 if it cannot be determined
*/
@@ -641,7 +644,7 @@ _PUBLIC_ int get_time_zone(time_t t)
tm = localtime(&t);
if (!tm)
return 0;
- return tm_diff(&tm_utc,tm);
+ return tm_diff(&tm_utc,tm)+60*extra_time_offset;
}
struct timespec nt_time_to_unix_timespec(NTTIME *nt)
diff --git a/lib/util/time.h b/lib/util/time.h
index 42644a3..e40de2d 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -239,4 +239,7 @@ struct timespec convert_time_t_to_timespec(time_t t);
bool null_timespec(struct timespec ts);
+/** Extra minutes to add to the normal GMT to local time conversion. */
+extern int extra_time_offset;
+
#endif /* _SAMBA_TIME_H_ */
diff --git a/source3/lib/time.c b/source3/lib/time.c
index db2266f..cae6b47 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -131,8 +131,6 @@ time_t convert_uint32_to_time_t(uint32_t u)
return (time_t)u;
}
-int extra_time_offset=0;
-
/****************************************************************************
Check if NTTIME is 0.
****************************************************************************/
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8f03ae8..274c799 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -94,8 +94,6 @@ static int config_backend = CONFIG_BACKEND_FILE;
#define USERSHARE_VALID 1
#define USERSHARE_PENDING_DELETE 2
-extern int extra_time_offset;
-
static bool defaults_saved = False;
struct param_opt_struct {
diff --git a/source4/libnet/groupinfo.c b/source4/libnet/groupinfo.c
index 5c94c34..1779c28 100644
--- a/source4/libnet/groupinfo.c
+++ b/source4/libnet/groupinfo.c
@@ -24,13 +24,10 @@
#include "includes.h"
#include "libcli/composite/composite.h"
-#include "libnet/composite.h"
#include "librpc/gen_ndr/security.h"
#include "libcli/security/security.h"
-#include "libnet/userman.h"
-#include "libnet/groupinfo.h"
+#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
struct groupinfo_state {
diff --git a/source4/libnet/groupman.c b/source4/libnet/groupman.c
index 4dfb2d8..0f54db9 100644
--- a/source4/libnet/groupman.c
+++ b/source4/libnet/groupman.c
@@ -23,10 +23,8 @@
#include "includes.h"
#include "libcli/composite/composite.h"
-#include "libnet/composite.h"
-#include "libnet/groupman.h"
+#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
struct groupadd_state {
diff --git a/source4/libnet/libnet_become_dc.c
b/source4/libnet/libnet_become_dc.c
index 6e79242..294ea4b 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1511,8 +1511,8 @@ static void becomeDC_drsuapi_connect_send(struct
libnet_BecomeDC_state *s,
drsuapi->s = s;
if (!drsuapi->binding) {
- char *krb5_str = "";
- char *print_str = "";
+ const char *krb5_str = "";
+ const char *print_str = "";
/*
* Note: Replication only works with Windows 2000 when 'krb5' is
* passed as auth_type here. If NTLMSSP is used, Windows
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 70fcb4a..0a4e357 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -1223,6 +1223,8 @@ NTSTATUS libnet_Join(struct libnet_context *ctx,
TALLOC_CTX *mem_ctx, struct lib
case SEC_CHAN_BDC:
return libnet_Join_primary_domain(ctx, mem_ctx, r);
case SEC_CHAN_DOMAIN:
+ case SEC_CHAN_DNS_DOMAIN:
+ case SEC_CHAN_NULL:
break;
}
diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 710154d..a718ab9 100644
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -23,13 +23,10 @@
#include "includes.h"
#include "libcli/composite/composite.h"
-#include "libnet/composite.h"
#include "librpc/gen_ndr/security.h"
#include "libcli/security/security.h"
-#include "libnet/userman.h"
-#include "libnet/userinfo.h"
+#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
struct userinfo_state {
diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index c638d8a..62d4e0e 100644
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -23,11 +23,8 @@
#include "includes.h"
#include "libcli/composite/composite.h"
-#include "libnet/composite.h"
-#include "libnet/userman.h"
-#include "libnet/userinfo.h"
+#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
/*
* Composite USER ADD functionality
@@ -684,7 +681,7 @@ static NTSTATUS usermod_change(struct composite_context *c,
s->queryuser.in.user_handle = &s->user_handle;
s->queryuser.in.level = level;
s->queryuser.out.info = talloc(s, union samr_UserInfo *);
- if (composite_nomem(s->queryuser.out.info, c)) return;
+ if (composite_nomem(s->queryuser.out.info, c)) return
NT_STATUS_NO_MEMORY;
/* send query user info request to retrieve complete data of
--
Samba Shared Repository
