Rev 5322: merge from upstream in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Tue Apr 3 07:53:03 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5322
revision-id: ma at sernet.de-20070403075257-2e642e2cd15e38e3
parent: ma at sernet.de-20070402142027-aac781ee0bfba5e9
parent: jra at samba.org-20070403050343-63g4g3ljd1xgbys5
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-04-03 09:52:57 +0200
message:
merge from upstream
modified:
REVISION REVISION-20060530022625-68239662668b41c3
source/auth/auth_sam.c auth_sam.c-20060530022627-a7a4ed7172cd076a
source/auth/auth_util.c auth_util.c-20060530022627-f9a3e5940d409fe9
source/configure.in configure.in-20060530022626-07e74bc1e326c82d
source/include/includes.h includes.h-20060530022627-d1a059a99c05e8be
source/lib/util.c util.c-20060530022627-d569af0e687a4dd3
source/lib/util_pw.c util_pw.c-20060530022627-912c52afc587540f
source/lib/util_str.c util_str.c-20060530022627-0ba87cda5eaacc2e
source/libsmb/clidgram.c clidgram.c-20060530022627-0d16d2ca1044bd3f
source/libsmb/cliprint.c cliprint.c-20060530022627-f75a028812ceec6b
source/libsmb/clirap.c clirap.c-20060530022627-ec81fdd89a06c9ea
source/libsmb/clirap2.c clirap2.c-20060530022627-58b43d466ff7e065
source/nmbd/nmbd_browsesync.c nmbd_browsesync.c-20060530022627-858b93d65834e163
source/nmbd/nmbd_elections.c nmbd_elections.c-20060530022627-12c160e0fac7246c
source/nmbd/nmbd_incomingdgrams.c nmbd_incomingdgrams.c-20060530022627-b6e2009d35303ad7
source/nmbd/nmbd_packets.c nmbd_packets.c-20060530022627-5b449aed1c5a87bf
source/nmbd/nmbd_processlogon.c nmbd_processlogon.c-20060530022627-ba032f504f8ff80c
source/nmbd/nmbd_sendannounce.c nmbd_sendannounce.c-20060530022627-9a58006dc0de4065
source/smbd/lanman.c lanman.c-20060530022627-4d3ad959fbca66cf
source/tdb/common/transaction.c transaction.c-20060823151029-6cd356e535b2baa2
source/tdb/tools/tdbtool.c tdbtool.c-20060823151056-3fc2ae66c2a66158
------------------------------------------------------------
merged: jra at samba.org-20070403050343-63g4g3ljd1xgbys5
parent: jra at samba.org-20070403050213-bblen6zv9zgg19tm
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-03 00:03:43 -0500
message:
jra at samba.org (r22050) 2007-04-02 23:52:09 -0500 (Mon, 02 Apr 2007)
Fix a couple of off-by-one errors in the rap
call patch. Jerry, this works now for displaying
shares on Win9x (and hopefully everything else
as well :-).
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070403050213-bblen6zv9zgg19tm
parent: jra at samba.org-20070402231139-kwy5rylxivjsy7ui
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-03 00:02:13 -0500
message:
jra at samba.org (r22049) 2007-04-02 18:07:06 -0500 (Mon, 02 Apr 2007)
HPUX build fixes from <don.mccall at hp.com>.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070402231139-kwy5rylxivjsy7ui
parent: vlendec at samba.org-20070402230923-0dk2frhipdn94y1j
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 18:11:39 -0500
message:
jra at samba.org (r22045) 2007-04-02 15:10:21 -0500 (Mon, 02 Apr 2007)
As Volker noticed, skip_string's last argument is
redundent. Remove it.
Jeremy.
------------------------------------------------------------
merged: vlendec at samba.org-20070402230923-0dk2frhipdn94y1j
parent: vlendec at samba.org-20070402230709-wlvosubre73wby90
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 18:09:23 -0500
message:
vlendec at samba.org (r22044) 2007-04-02 15:04:05 -0500 (Mon, 02 Apr 2007)
Remove the only skip_string(...,2) caller
------------------------------------------------------------
merged: vlendec at samba.org-20070402230709-wlvosubre73wby90
parent: jra at samba.org-20070402230519-4gcrh9p08oc9qpmc
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 18:07:09 -0500
message:
vlendec at samba.org (r22043) 2007-04-02 14:46:27 -0500 (Mon, 02 Apr 2007)
Comparing lanman.c with -r22013 is now MUCH easier, thanks! This looks much
easier to review! Damn close to what I had in my tree, just the fn names were
slightly different.
This removes one unnecessary dupe.
Next thing is to get rid of the parameter "n" of skip_string, there is only
one (!) caller that does not pass in 1....
Volker
------------------------------------------------------------
merged: jra at samba.org-20070402230519-4gcrh9p08oc9qpmc
parent: metze at samba.org-20070402230337-jzrikpohbk84dv0m
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 18:05:19 -0500
message:
jra at samba.org (r22042) 2007-04-02 14:04:57 -0500 (Mon, 02 Apr 2007)
Try and clean up my own mess using the API Volker
suggested. I now use :
BOOL is_offset_safe(const char *buf_base, size_t buf_len, char *ptr, size_t off)
char *get_safe_ptr(const char *buf_base, size_t buf_len, char *ptr, size_t off)
char *get_safe_str_ptr(const char *buf_base, size_t buf_len, char *ptr, size_t off)
int get_safe_SVAL(const char *buf_base, size_t buf_len, char *ptr, size_t off, int failval)
int get_safe_IVAL(const char *buf_base, size_t buf_len, char *ptr, size_t off, int failval)
Volker, please criticize and comment. Thanks,
Jeremy.
------------------------------------------------------------
merged: metze at samba.org-20070402230337-jzrikpohbk84dv0m
parent: metze at samba.org-20070402230206-3w733eaxnci1ovg2
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 18:03:37 -0500
message:
metze at samba.org (r22039) 2007-04-02 13:42:56 -0500 (Mon, 02 Apr 2007)
fix compiler warnings
metze
------------------------------------------------------------
merged: metze at samba.org-20070402230206-3w733eaxnci1ovg2
parent: abartlet at samba.org-20070402170200-qbvd879tjdyqszwm
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 18:02:06 -0500
message:
metze at samba.org (r22033) 2007-04-02 12:16:14 -0500 (Mon, 02 Apr 2007)
remove useless line
metze
------------------------------------------------------------
merged: abartlet at samba.org-20070402170200-qbvd879tjdyqszwm
parent: abartlet at samba.org-20070402110504-8u2bipgysshofw61
committer: abartlet at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 12:02:00 -0500
message:
abartlet at samba.org (r22026) 2007-04-02 07:52:08 -0500 (Mon, 02 Apr 2007)
Missed in my last commit, another case where we need to copy, not reference.
Andrew Bartlett
------------------------------------------------------------
merged: abartlet at samba.org-20070402110504-8u2bipgysshofw61
parent: abartlet at samba.org-20070402110323-4efpqpa4z21msmq4
committer: abartlet at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 06:05:04 -0500
message:
abartlet at samba.org (r22024) 2007-04-02 01:57:37 -0500 (Mon, 02 Apr 2007)
Don't leak, actually use the provided memory context...
------------------------------------------------------------
merged: abartlet at samba.org-20070402110323-4efpqpa4z21msmq4
parent: abartlet at samba.org-20070402110152-d0hwogzyrogn3xme
committer: abartlet at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 06:03:23 -0500
message:
abartlet at samba.org (r22023) 2007-04-02 01:26:16 -0500 (Mon, 02 Apr 2007)
I don't like this cache, but I think Jeremy is right, the consequences
of the talloc heirarchy created are too subtle, particularly with
callers picking out individual members.
This might fix the faults on the build farm.
Andrew Bartlett
------------------------------------------------------------
merged: abartlet at samba.org-20070402110152-d0hwogzyrogn3xme
parent: abartlet at samba.org-20070402050206-f4kg5lajjbejhnd1
committer: abartlet at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-02 06:01:52 -0500
message:
abartlet at samba.org (r22022) 2007-04-02 00:53:34 -0500 (Mon, 02 Apr 2007)
- Clarify the comments
- make sure never to free an uninitialised variable
- ensure to free result on getpwnam_alloc failure
Andrew Bartlett
Diff too large for email (1635 lines, the limit is 1000).
More information about the samba-cvs
mailing list