| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
| |
Karolin
(cherry picked from commit b876e1336bed52e0823e0e88381d223bd6aa95e4)
(cherry picked from commit 611ac35a694930693d2f773d15e59be138261a8e)
(cherry picked from commit d54a1e49d5fe567bcda7c4c02f6ace2d03e189e9)
(cherry picked from commit 2550b433e8764df83197ffb9f3a7088bbceeb215)
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes bug #5950.
Thanks to the Debian Samba package maintainers for reporting!
Karolin
(cherry picked from commit 19beef0dd9354296ae79d32077c58fbacf570c85)
(cherry picked from commit 0d035d36bd3707ccb9f77f0b2730869dc78719d4)
(cherry picked from commit 6be19f94802d545cc43286aa242b0ca2e5b79721)
(cherry picked from commit 879a4fbe99739b67d877caac2d7a2f763c69d41f)
(cherry picked from commit 51a9b237d401151eed43ab917d2dd10d8693a764)
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes bug #5883.
Karolin
(cherry picked from commit b4a4e635246b88277b235fa343eda48bd4bb4ce3)
(cherry picked from commit 5744177740120524740db884564142df19358ae7)
(cherry picked from commit 7584fe4e8bcbaf73f509d6981a70ff9dde92db1c)
(cherry picked from commit fda3f00246c3ecb664d2bf387ecd0e28dec16e34)
(cherry picked from commit 90c5d04c5161bd2acb1c16d737b68893f11f3d18)
|
|
|
|
|
| |
Jeremy.
(cherry picked from commit 7917038db0277d16e5284ee261a4913e278e5ac7)
|
|
|
|
|
|
| |
(mtab.c, fix build).
Jeremy.
(cherry picked from commit 680e4c398c79867f8a7ad40e9c2cd9c401922edd)
|
|
|
|
|
|
|
|
| |
Karolin
(cherry picked from commit c09e04ac83365333605b7b1db3d07ccfd451a667)
(cherry picked from commit 70c581586ea02fbff4c5dde0ec002b22d472dfc5)
(cherry picked from commit 1ba197a3054c6d997ceca6f124039d3cabf00289)
(cherry picked from commit 09ccdf6aee15169b0fe9c532ee9143bd0cff9d78)
|
|
|
|
|
| |
Signed-off-by: Andreas Schneider <anschneider@suse.de>
(cherry picked from commit 26e82e3e006a80c9d4d1cb437eb39b02efa7c3ad)
|
|
|
|
|
| |
Jeremy.
(cherry picked from commit d326dc7dc08acbb7bf511ca9579cefe591b0ba94)
|
|
|
|
|
|
|
|
| |
that will have to
be fixed another way.
Jeremy.
(cherry picked from commit 649572c454328b81714b86d3f99f730bf61625e0)
|
|
|
|
|
|
|
|
|
|
| |
The bug was triggered by "net ads info -S 127.8.7.6" (where 127.8.7.6 doesn't ex
and "disable netbios = yes".
metze
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 114b94f86e15d482f3b39912f28eb72b66b36bc8)
|
|
|
|
|
|
|
|
| |
Now that the methods are no longer needed in winbindd_ads,
we can make them static again.
Michael
(cherry picked from commit a2329ec0eea66108f44dae3853e578dbbf835f96)
|
|
|
|
|
|
|
|
|
|
|
| |
Some of the ads methods just point to the rpc methods.
This makes winbindd_ads use the reconnect methods instead of
calling the rpc methods directly in order to prevent
negative cache entries for e.g. name_to_sid, when the dc
has closed the connection without sending a reset.
Michael
(cherry picked from commit 06f19e52489b3253ea4292795e4c73fa94cfd392)
|
|
|
|
|
|
| |
multibyte character.
(cherry picked from commit 92f3ba8e20bd4a5a2afdd13feb5519d723784274)
|
|
|
|
| |
(cherry picked from commit cc97e2a0d51f52a79982ac265f073d3829c1357a)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The man-page (see net(8)) and the usage-info (call "net help rap printq") of
'net rap printq' do contain an option "list" but in net_rap.c
the option is named "info".
Rename the option "list" in the documentation (man-pages + usage) to "info" to
match the code.
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 67692e9b8f5ae09702c73c081f3a6937bd6de518)
|
|
|
|
|
| |
Jeremy.
(cherry picked from commit ba12ab479b3764e0d251d74401dc5fa31a48f83d)
|
|
|
|
|
| |
This fixes bug #5865
(cherry picked from commit 1941f42b04dd20763449ba57e4543aca41ca2155)
|
|
|
|
| |
(cherry picked from commit 1f3eba80c8df79f31757bc2075f5730cd261806c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The util-linux-ng sources have a good, but rather complex scheme for
locking the mtab before updating it. Mount helpers need to follow the
same scheme. Advisory locking only works if everyone is using the same
locking scheme.
Copy the routines we need from util-linux-ng into a separate source file
and then have mount.cifs and umount.cifs link in this object.
The long term goal is to have these routines in a separate helper
library (libmount). Mount helpers can then dynamically link in that lib.
Until that happens, this should serve as a suitable stopgap solution.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 66ec780d878979a9fa33ff868f1849e9d2166dcf)
|
|
|
|
|
| |
Jeremy.
(cherry picked from commit 0de73eeb1a17b6af217babd626b203eca975541f)
|
|
|
|
| |
(cherry picked from commit af33c8b3521564c229091f197341ba33a7d6f162)
|
|
|
|
|
|
|
| |
Guenther
(cherry picked from commit 4661ef625a6522d6f859b83e3e3702f01d0b952f)
(cherry picked from commit 60649a74cdf2594bc89c301025f86d23caba91c2)
(cherry picked from commit d0c0fc92cd6c7549e190669aeaa605a0d436cf31)
|
|
|
|
|
|
|
|
| |
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit feef594d275881466e2c3f59c0ff54609a9cc53b)
|
|
|
|
|
|
|
|
| |
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 543fa85a711337e979c7b631bda5db95d109ef59)
|
|
|
|
|
|
|
|
| |
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit f86ef9b53a903485deba94febf90dd4e657cc02b)
|
|
|
|
|
|
|
|
| |
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit c2d4a84abe1b6cbf68d6e9f1bb1f8974d0b628fc)
|
|
|
|
|
|
|
|
|
|
|
|
| |
saf_join_store() should be called after a successful
domain join, the affinity to the dc used at join time
has a larger ttl, to avoid problems with delayed replication.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 80e74a27c55c01221091e3eec930c2ac4433c22c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
the requested site
It could happen that all dcs in a site are unavailable
(some sites have only one dc) and then we need to fallback
to get all dcs.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit c127367b1dd622eeceb1f47de0a047c297dda222)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We use get_dc_name() for LDAP because it generates the selfwritten
krb5.conf with the correct kdc addresses and sets KRB5_CONFIG.
For CLDAP we need to use get_sorted_dc_list() to avoid recursion.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit d2f7f81f4d61bae9c4be65cbc1bf962b6c24a31f)
|
|
|
|
|
|
|
|
|
|
| |
ads->config.tried_closest_dc was never set.
metze
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit dfe5b00db35e1e7c7bb3ba36729fc3f97eb48db3)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On some versions of Solaris, we observed a strange effect of close(2)
on a socket: After the server (here winbindd) called close, the client fd
was not marked as readable for select. And a write call to the fd did
not produce an error EPIPE but just returned as if successful.
So while winbindd had called remove_client(), the corresponding smbd
still thought that it was connected, but failed to retrieve answers
for its queries.
This patch works around the problem by forcing the client fd to
the readable state: Just write one byte into the socket before
closing.
Michael
(cherry picked from commit 559ba0215cada4093efd22f165b608c41913d935)
|
|
|
|
| |
(cherry picked from commit 90651d77f1f7fc6d29629d3a0dd566d07c090609)
|
|
|
|
|
|
| |
If winbind sets the KRB5CCNAME variable it should unset it when
the cache gets destroyed.
(cherry picked from commit 98f3369e08f4d5bc759e93d36f3d67a3c057f40d)
|
|
|
|
|
|
|
|
|
| |
If total_data == 4 Windows doesn't care what values
are placed in that field, it just ignores them.
The System i QNTC IBM SMB client puts bad values here,
so ignore them.
Jeremy.
(cherry picked from commit cfdbe8a1f2057ad1a8886ca7445a812219648d19)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The manpage for /bin/mount specifies that the return code should be a
positive integer (actually, it's a bitfield). Clean up the return
codes from mount.cifs to make them match the expected return values
from /bin/mount. This necessary for proper integration with autofs.
This is the third attempt at this patch. The changes here are minor,
just changing some return's from main() into exit() calls for
consistency's sake.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 4558c09c921793dd358de3ad4b9b4dd091e43662)
|
|
|
|
|
|
|
|
|
| |
We currently don't attempt to uppercase the device portion of the mount
string if there isn't a prefixpath. Fix that by making uppercase_string
return success without doing anything on a NULL pointer.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 41849ee120297b845ef288c76b45d039ad04112d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
"rescan_trusted_domain".
From analysis by hargagan <shargagan@novell.com> :
"The winbindd_child_died() is also getting called from process_loop() in case of
SIGCHLD signal. In this case it doesn't make the timeout_handler to NULL for
the first request. It then initiate a new request using
schedule_async_request() which installs a new timeout handler for the same
request. In such a case, for a badly unresponsive system both the timeout
handler can be called. For the first call the "private_data" will be cleared
and for another call the timeout handler will be detecting the double free. So,
for such a case as well, the winbindd_child_died() should make the
timeout_handler to NULL."
Jeremy.
(cherry picked from commit cfa9d20db78875969ea8065161f8efdf5281d003)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the main
one is in conn_free_internal() and would not free all the private data entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
(cherry picked from commit 45514fc5d85221339a4ee55b9f9f78c917b2fd19)
|
|
|
|
|
| |
Jeremy.
(cherry picked from commit ffa704347a9cf10de20105e3dd07963f975cbd77)
|
|
|
|
|
|
|
|
|
|
|
|
| |
disposition call.
This was my fault. I use a singleton cache (positive and negative) to speed up pathname based
qfileinfo/setfileinfo lookups for alternate fsp's open on the same path. I only invalidated the
negative cache on adding a new file fsp, as I incorrectly imagined the new fsp was put at the *end* of
the open files list. DLIST_ADD puts it at the start, meaning any subsequent open wasn't seen once the
cache was set. Doh !
Jeremy.
(cherry picked from commit 3d10c237a9b71d269d7936d58c2f8c0172165cbe)
|
|
|
|
|
|
|
| |
patch from shargagan@novell.com
Jeremy.
(cherry picked from commit 2f230176a19788e659522c7ccccb19b289412166)
|
|
|
|
|
|
|
| |
yes, we all love hand-marshalled rpc...
Guenther
(cherry picked from commit 72b4ca3ec5714d6056654ecb0fdcbd7d954e6984)
|
|
|
|
|
|
|
| |
...to silence -Wmissing-prototypes
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit a605c5352485cf1b50090301b909b5258de8be8c)
|
|
|
|
|
|
|
|
| |
...to silence -Wmissing-prototypes and some uninit'ed variable
warnings. Thanks to GD for the extra-paranoid compiler flags.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 99e75f00710be8369d844c58bd208938b902a49e)
|
|
|
|
|
|
|
|
|
|
| |
krb5 mounts require that the user already have a valid krb5 ticket.
Since we can't currently use the password entered, don't prompt for it.
Also, switch to using strncmp instead of strcmp here.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit d2bea898942e213fb1e33f46c76274527928473d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch is the second patch to attempt to fix up some of the problems
with mounting subdirectories of shares. The earlier patch didn't handle
this correctly when POSIX extensions were enabled. This one does.
This is a bit of a confusing area since the different components of
a service string have different rules:
1) hostname: no '/' (slash) or '\' (backslash) is allowed to be
embedded within the string
2) sharename: same rules as hostname
3) prefixpath: '\' *is* allowed to be embedded in a path component,
iff POSIX extensions are enabled. Otherwise, neither
character is allowed.
The idea here is to allow either character to act as a delimiter when we
know that the character can't be anything but a delimiter (namely
everywhere up to the start of the prefixpath). The patch will convert
any '\' unconditionally to '/' in the UNC portion of the string.
However, inside the prefixpath, we can't make assumptions about what
constitutes a delimiter because POSIX allows for embedded '\'
characters. So there we don't attempt to do any conversion, and pass the
prefixpath to the kernel as is. Once the kernel determines whether POSIX
extensions are enabled, it can then convert the path if needed and it's
able to do so. A patch to handle this has already been committed to the
cifs-2.6 git tree.
This patch also fixes an annoyance. When you mount a subdir of a share,
mount.cifs munges the device string so that you can't tell what the
prefixpath is. So if I mount:
//server/share/p1/p2/p3
..then /proc/mounts and mtab will show only:
//server/share
Finally, it also tries to apply some consistent rules to the uppercasing
of strings.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 59d7d3ae58432a07a858fc7e9161e27bb9478c9e)
|
|
|
|
|
|
|
| |
Cherry picked from commit 3d3d61687ef00181f4f04e001d42181d93ac931e
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit be4adc6938b06fc6df79c6c129528fdbb8b0c041)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When we added the ability for the kernel to send sec=mskrb5 to the
upcall, we subtly broke old cifs.upcall versions that don't understand
it. Bump the spnego message version to 2 to make this clear. Also,
change cifs.upcall to not reject requests with a version that's lower
than the current one, and to send the reply with the same version that
the request sent. The idea is to try and keep cifs.upcall backward
compatible with old kernels.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit ce937b28a75b8c72e36bd3853d52a9ac1a7606b9)
|
|
|
|
|
| |
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit b5cf5a34d227dd436b12a2d50ba8ddb728799089)
|
|
|
|
|
|
|
|
|
|
|
| |
When the kernel sends the upcall a sec=mskrb5 parameter, that means
the the MSKRB5 OID is preferred by the server. This patch fixes the
upcall to use that OID in place of the "normal" krb5 OID when it
gets a sec=mskrb5 parameter.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Steve French <smfrench@gmail.com>
(cherry picked from commit 340fdd5fed64ec4a8d7fc937956c722d59a73ba8)
|