[SCM] Samba Shared Repository - branch v3-4-stable updated
Karolin Seeger
kseeger at samba.org
Thu May 6 06:46:50 MDT 2010
The branch, v3-4-stable has been updated
via 5d75869... s3:winbind: Fix bug 5626
via 2e4da80... s3:winbindd: make sure we don't try rpc requests against unaccessable domains
via 9e54c38... s3:winbindd: never mark external domains as internal!
via 0839da5... Fix one of the valgrind warnings from bug #6814 - Fixes for problems reported by valgrind
via 5fa627c... s3-spoolss: fix fstrings in convert_devicemode() function.
via a9ecdb4... s3: Fix bug 5198 -- parse chfn(1)-change gecos field (cherry picked from commit 2ea2d2a81e0666f478c5daf1469c8447a3096e8e) (cherry picked from commit 52a3ebc3a4ec54a427e54fa331251fd495c3c6aa) (cherry picked from commit 4178dc4ed4b160a8f9ec08b1c729deae47b8368a)
via 8efb860... mount.cifs: directly include sys/stat.h in mtab.c
via 42f5c0a... mount.cifs: check for invalid characters in device name and mountpoint
via d650c63... mount.cifs: take extra care that mountpoint isn't changed during mount
via 565f8e1... mount.cifs: don't allow it to be run as setuid root program
via e1ce92a... mount.cifs: properly check for mount being in fstab when running setuid root (try#3)
via 39f83e0... s3-spoolss: fix rpcclient after setprinter IDL fixes.
via 5a8e6be... spoolss: more mork on SetPrinterInfo() levels.
via 66f67b9... s3-rpcclient: Fix Bug #7277. rpcclient was sending invalid data, causing cupsaddsmb to fail.
via a901405... s3-net_conf: Display an error on net conf import failures.
via a922114... s3-libsmbclient: Fix incomplete description of function return values in libsmbclient.h.
via 966dc70... s3-docs: Improve "winbind nss info" section in man smb.conf.
via 807b1a4... Fix bug #7288 - SMB job IDs in CUPS job names wrong.
via 9e1cfde... libwbclient: Re-Fix a bug that was fixed with e5741e27c4c
via c25bf5c... s3:winbindd: make "smbcontrol winbindd validate-cache" reliable again
via 15107a4... s3:winbindd: remove unused variables
via f2a20e1... s3:winbindd: fix problems with SIGCHLD handling (bug #7317)
via e38e222... s3:winbindd: correctly retry if the netlogon pipe gets disconnected during a logon call
via 57ad736... s3:winbindd_reconnect: don't only reconnect on NT_STATUS_UNSUCCESSFUL
via 4701e4a... s3:winbindd_cm: invalidate connection if cm_connect_netlogon() fails
via 1598876... s3:winbindd: consistently use TALLOC_FREE(conn->foo_pipe) is we create a new connection
via 72d1c1e... s3:winbindd_cm: use rpccli_is_connected() helper function
via 7884f28... s3:winbindd_cm: use cli_state_is_connected() helper function
via 48ab7d0... s3:rpc_client: return at least 10 sec as old timeout in rpccli_set_timeout() instead of 0
via 50f8ed9... s3:rpc_client: add set_timeout hook to rpc_cli_transport
via 8ff5433... s3:rpc_client: add rpccli_is_connected()
via fc37e81... s3:rpc_client: don't mix layers and keep a reference to cli_state in the caller
via 11fb429... s3:rpc_transport_np: use cli_state_is_connected() helper
via 4a884a3... s3:libsmb: add cli_state_is_connected() function
via 82b69cf... s3:libsmb: don't let cli_shutdown() segfault with a NULL cli_state
via 97b84c8... s3:rpc_transport_np: handle trans rdata like the output of a normal read
via 9d874a8... s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response.
via db29ba6... Fix broken pipe handling
via 9c056c0... s3:rpc_client: close the socket when pipe is broken
via 5069a57... s3: fix crash in winbindd (similar to commit f8cc0e88fbbb082ead023e0cb437b1e12cf35459)
via 07b4b57... s3-docs: Fix typo in man idmap_ad.
via 5645440... s3:lib/time: remove TIME_T_MIN/MAX defines
via 9b81137... lib/util: move TIME_T_MIN/MAX defines into header file (cherry picked from commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8) (cherry picked from commit 32b0c2c2c1d0e8f69de264f2c3c3b1d473f9ec4f)
via 8afeb14... WHATSNEW: Start release notes for Samba 3.4.8.
via 79e6540... Second part of fix for bug #7159 - client rpc_transport doesn't cope with bad server data returns.
via b3c3330... First part of fix for bug #7159 - client rpc_transport doesn't cope with bad server data returns.
via fae0564... s3: Fix bug 7326 -- can't write with vfs_full_audit active (cherry picked from commit d232dd9df261ff251fd624b2b984355d247bb301)
via 2b12db6... s3: signals are processed twice in child.
via 50e8383... Fix bug 7310 - DOS attribute inconsistency with MS Office
via 375f7d7... Fix bug 7307 - man net usershare mistake
via afb7eed... Fix bug 7297 - smbd crashes with CUPS printers and no [printers] share defined.
via 76019d6... s3 ntlm_auth: Don't malloc data that will be talloc_free()d
via deaa996... Fix bug #7269 - Job management commands don't work for CUPS queues.
via 0e5b0c8... s3-printing: Fix "printer admin" functionality.
via ca4cec0... s3-spoolss: Fix value-needed calculation in_spoolss_EnumPrinterData().
via c5aeb7c... s3: Fix an uninitialized variable read
via 6801e3b... s3:release-scripts: fix create-tarball to treat vendor patch level correctly (cherry picked from commit b845025daf2da85eb1af6cbfa7878cf59a32f2a6) (cherry picked from commit 95c6a5a782caa77bc8bbe75de6ca249bc255507e) (cherry picked from commit 64fbfee4d322381b8b877feaf1f71b778a88b7f4)
via c3f1a78... s3: re-run make samba3-idl.
via e59bf44... s3-spoolss: let _spoolss_DeletePrinterData call into _spoolss_DeletePrinterDataEx.
via 6b2eae5... s3-libads: fix get_remote_printer_publishing_data after spoolss_EnumPrinterDataEx IDL change.
via eab0e37... s3-rpcclient: fix rpcclient after spoolss_EnumPrinterDataEx IDL change.
via cb9e5c5... s3-net: fix net after spoolss_EnumPrinterDataEx IDL change.
via 13fc0a5... s3-spoolss: fix _spoolss_EnumPrinterDataEx after idl
via 5eb2f05... spoolss: fix spoolss_EnumPrinterDataEx IDL.
via e6a23fb... s3-rpcclient: fix rpcclient after spoolss_GetPrinterData{Ex} IDL change.
via 2fe7fe2... s3-spoolss: fix _spoolss_GetPrinterDataEx after IDL change.
via 914ac75... s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx.
via a78789a... spoolss: rollback GetPrinterData{Ex} IDL.
via d8278d1... s3-net: fix net after spoolss_SetPrinterData{Ex} IDL change.
via 6ccf4c7... s3-rpcclient: fix rpcclient after spoolss_SetPrinterData{Ex} IDL change.
via 63835c2... s3-spoolss: fix _spoolss_SetPrinterData{Ex} after IDL change.
via 8041e8a... s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx.
via ac05dad... spoolss: rollback SetPrinterData{Ex} IDL.
via 0e640cf... s3:build: Fix automatic building of vfs_tsmsm if gpfs and dmapi are present.
via 6f3f795... s3: Fix a NULL pointer dereference
via d426e8d... vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"
from 8a08b80... WHATSNEW: Start release notes for Samba 3.4.8.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit 5d75869a7c1eb796a910536a3055d1bf4b4e6d88
Author: Volker Lendecke <vl at samba.org>
Date: Sun Aug 30 11:06:14 2009 +0200
s3:winbind: Fix bug 5626
Apparently the AIX compiler can't deal with sizeless array declarations
(cherry picked from commit 5444adaf59bc6b9bd8f339de21ab66da9e684073)
commit 2e4da80e4e70a0f09a63a8c1e228b17a35de4707
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 1 09:29:38 2010 +0200
s3:winbindd: make sure we don't try rpc requests against unaccessable domains
This makes sure we don't crash while trying to dereference domain->conn.cli->foo
while trying to establish a rpc connection to the server.
This fixes bug #7316.
metze
(cherry picked from commit d930904b997d310aeff781bde1e7e3ce47dde8a1)
(cherry picked from commit 01b60b113869f526dcf3bb478d70df21dbb207c8)
(cherry picked from commit edb02e57a3ef83a16bdbd158da4c1290d4ab8240)
commit 9e54c38b785c37ed7d6376382bd75076cb431a15
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 23 08:42:41 2010 +0100
s3:winbindd: never mark external domains as internal!
This way we can endup with silently using builtin_passdb_methods
for an ad domain without an inbound trust.
This fixes bug #7170.
metze
(cherry picked from commit f924b7749280b31ece19885de1c3ad1bd71942ac)
(cherry picked from commit 1ea768baa9bb38533d4bd273d6c4e7b1f5fd12bd)
commit 0839da5e76a13012efbcca0ef5fab7717cb3fc2d
Author: Roel van Meer <rolek at alt001.com>
Date: Fri Feb 26 15:09:33 2010 -0800
Fix one of the valgrind warnings from bug #6814 - Fixes for problems reported by valgrind
The timeval passed to event_add_to_select_args() must be initialized
as event_add_to_select_args() uses a timeval_min() on this and next_event.
(cherry picked from commit a0254fa053cbaa8689de4f13893c50014085f7c8)
commit 5fa627c4629e28921a042de31948ba36a1336b27
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 30 18:10:59 2009 +0100
s3-spoolss: fix fstrings in convert_devicemode() function.
Guenther
(cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)
Fix bug #7176 (incorrect format of device mode strings).
(cherry picked from commit 19623b2cd90cb2e5b028e2154bc3abea49ddcbe9)
commit a9ecdb439137d22d778e4ee53093c09880953079
Author: Volker Lendecke <vl at samba.org>
Date: Sat Feb 6 13:26:06 2010 +0100
s3: Fix bug 5198 -- parse chfn(1)-change gecos field
(cherry picked from commit 2ea2d2a81e0666f478c5daf1469c8447a3096e8e)
(cherry picked from commit 52a3ebc3a4ec54a427e54fa331251fd495c3c6aa)
(cherry picked from commit 4178dc4ed4b160a8f9ec08b1c729deae47b8368a)
commit 8efb860f07bd8e52896c01fb6613ff9eb56bf7d1
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Jan 26 08:45:53 2010 -0500
mount.cifs: directly include sys/stat.h in mtab.c
This file is mysteriously getting included when built via the makefile,
but when you try to build mtab.o by hand it fails to build. Directly
include it to remove any ambiguity.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit fa722e20c9f5712571f9009afed8c4e44ac11cdc)
commit 42f5c0ad79c1122e1fef2875f2e0a277bf86e97b
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Jan 26 08:45:58 2010 -0500
mount.cifs: check for invalid characters in device name and mountpoint
It's apparently possible to corrupt the mtab if you pass embedded
newlines to addmntent. Apparently tabs are also a problem with certain
earlier glibc versions. Backslashes are also a minor issue apparently,
but we can't reasonably filter those.
Make sure that neither the devname or mountpoint contain any problematic
characters before allowing the mount to proceed.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 5532a5d5cf7cec0bb758a80e9ee74b5807088661)
commit d650c6369212851fc9c780c8f800184f48abc348
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Jan 26 08:45:58 2010 -0500
mount.cifs: take extra care that mountpoint isn't changed during mount
It's possible to trick mount.cifs into mounting onto the wrong directory
by replacing the mountpoint with a symlink to a directory. mount.cifs
attempts to check the validity of the mountpoint, but there's still a
possible race between those checks and the mount(2) syscall.
To guard against this, chdir to the mountpoint very early, and only deal
with it as "." from then on out.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit c4a342cec1ced80128f82758c7a2192b23f4017a)
commit 565f8e10c9828c4d998f494d6c1a280e9a8927d5
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Jan 26 08:45:58 2010 -0500
mount.cifs: don't allow it to be run as setuid root program
mount.cifs has been the subject of several "security" fire drills due to
distributions installing it as a setuid root program. This program has
not been properly audited for security and the Samba team highly
recommends that it not be installed as a setuid root program at this
time.
To make that abundantly clear, this patch forcibly disables the ability
for mount.cifs to run as a setuid root program. People are welcome to
trivially patch this out, but they do so at their own peril.
A security audit and redesign of this program is in progress and we hope
that we'll be able to remove this in the near future.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
The last 5 patches address bug #6853 (mount.cifs race that allows user to
replace mountpoint with a symlink).
(cherry picked from commit f94a377fb58f7b104aa633236f3391c9af6a7b12)
commit e1ce92a0927c89bfc5aa06a1bc616ca187745a90
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Jan 26 08:45:57 2010 -0500
mount.cifs: properly check for mount being in fstab when running setuid root (try#3)
This is the third attempt to clean up the checks when a setuid
mount.cifs is run by an unprivileged user. The main difference in this
patch from the last one is that it fixes a bug where the mount might
have failed if unnecessarily if CIFS_LEGACY_SETUID_CHECK was set.
When mount.cifs is installed setuid root and run as an unprivileged
user, it does some checks to limit how the mount is used. It checks that
the mountpoint is owned by the user doing the mount.
These checks however do not match those that /bin/mount does when it is
called by an unprivileged user. When /bin/mount is called by an
unprivileged user to do a mount, it checks that the mount in question is
in /etc/fstab, that it has the "user" option set, etc.
This means that it's currently not possible to set up user mounts the
standard way (by the admin, in /etc/fstab) and simultaneously protect
from an unprivileged user calling mount.cifs directly to mount a share
on any directory that that user owns.
Fix this by making the checks in mount.cifs match those of /bin/mount
itself. This is a necessary step to make mount.cifs safe to be installed
as a setuid binary, but not sufficient. For that, we'd need to give
mount.cifs a proper security audit.
Since some users may be depending on the legacy behavior, this patch
also adds the ability to build mount.cifs with the older behavior.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 396eb03109400fe603c57a0a0d4bdc37c7131cf5)
commit 39f83e0764908edce1bfa270becfa7256c171d5d
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 10:33:13 2009 +0100
s3-spoolss: fix rpcclient after setprinter IDL fixes.
Guenther
(cherry picked from commit 31cf2b086a9275955b0480b4b9035dc12671761d)
(cherry picked from commit 99b9698c5e3be282f4300143032deacc493b93e0)
commit 5a8e6befa31c542d430db256860182bca699c564
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 16 10:32:35 2009 +0100
spoolss: more mork on SetPrinterInfo() levels.
Guenther
(cherry picked from commit be95cb6f8357334af08d1502910a429328b85bc5)
(cherry picked from commit f9da274b53197968417843340d586931728cf3a9)
commit 66f67b9eda55d6721bc08719d9aedaceb8d5d608
Author: Günther Deschner <gd at samba.org>
Date: Mon May 3 15:54:14 2010 +0200
s3-rpcclient: Fix Bug #7277. rpcclient was sending invalid data, causing cupsaddsmb to fail.
Guenther
(cherry picked from commit 9cc10e6a5742f09261f01a2c0b3a94b7b772e573)
(cherry picked from commit 068df077bfccf1899772e1f65f3c0ede1a9a09d2)
commit a901405b93a08c299569d0247bf76829d3258fad
Author: Jim McDonough <jmcd at samba.org>
Date: Wed Apr 21 20:53:51 2010 +0200
s3-net_conf: Display an error on net conf import failures.
When something goes wrong, such as a typo in a parameter
name, we'll now display the failure instead of just returning
with -1 and no message.
Fix bug #7378 ("net conf import" fails silently on parameter typo).
(cherry picked from commit d983085cee01fcf6e6176d395400075e6d5df937)
commit a9221148fc9b4c390cbf7b9a115a843ada4db189
Author: Derrell Lipman <derrell at dworkin.(none)>
Date: Tue Apr 13 20:32:14 2010 +0200
s3-libsmbclient: Fix incomplete description of function return values in libsmbclient.h.
Fix bug #7345.
(cherry picked from commit ce565b0498608714e2c4f7c9f9373dddcbfba568)
(cherry picked from commit 8dd1f920fb74d62a8f841a81f38feb0b0d689cc8)
commit 966dc709f29c93561605e77e0df10d3331971e21
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Apr 16 09:23:30 2010 +0200
s3-docs: Improve "winbind nss info" section in man smb.conf.
Karolin
(cherry picked from commit 20fc769179377bf037f4d5efe1afbaf77d4c9292)
(cherry picked from commit fb1b0901ec93afe998145bb7a7549bbdb13c712c)
(cherry picked from commit d73fa06540ba1b08815a7b15ce7ef3b14cf668cf)
commit 807b1a463198ea94e09e17f25cafa2de1ef8af10
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 25 18:22:16 2010 -0700
Fix bug #7288 - SMB job IDs in CUPS job names wrong.
Based on a patch from Michael Karcher <samba at mkarcher.dialup.fu-berlin.de>.
I think this is the correct fix. It causes cups_job_submit to use
print_parse_jobid(), which I've moved into printing/lpq_parse.c (to allow the
link to work).
It turns out the old print_parse_jobid() was *broken*, in that the pjob
filename was set as an absolute path - not relative to the sharename (due to it
not going through the VFS calls).
This meant that the original code doing a strncmp on the first part of the
filename would always fail - it starts with a "/", not the relative pathname of
PRINT_SPOOL_PREFIX ("smbprn.").
This fix could fix some other mysterious printing bugs - probably the ones
Guenther noticed where job control fails on non-cups backends.
Contains c79ca41baf15b4ef7eb287d343b17a53ba41e852 and
92332fb2368c641db1552d1f2a2f7b3deaa11519 from master.
Jeremy.
(cherry picked from commit 12936bfeb36ae867b52fe48d0f6d3d17d5c8b110)
(cherry picked from commit 302e9b1c027ff3bddbdeb16f97aa6159311e439d)
commit 9e1cfde589a79fb72cc96e62e494fd80485d758d
Author: Volker Lendecke <vl at samba.org>
Date: Tue Apr 13 12:09:21 2010 +0200
libwbclient: Re-Fix a bug that was fixed with e5741e27c4c
> r21878: Fix a bug with smbd serving a windows terminal server: If winbind
> decides smbd to be idle it might happen that smbd needs to do a winbind
> operation (for example sid2name) as non-root. This then fails to get the
> privileged pipe. When later on on the same connection another authentication
> request comes in, we try to do the CRAP auth via the non-privileged pipe.
>
> This adds a winbindd_priv_request_response() request that kills the existing
> winbind pipe connection if it's not privileged.
The fix for this was lost during the conversion to libwbclient.
Thanks to Ira Cooper <samba at ira.wakeful.net> for pointing this out!
Volker
(cherry picked from commit 3dab33103f4eddabdb908498200d888dfa6ae5a9)
commit c25bf5ca4a54dd1d7df67d7dbf6ee982faec810e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 8 12:45:54 2010 +0200
s3:winbindd: make "smbcontrol winbindd validate-cache" reliable again
commit 73577205cf81644e7fe853eaf3e6459f7f443096
(s3:winbindd: fix problems with SIGCHLD handling (bug #7317))
broke this.
metze
(cherry picked from commit eb9b7d0363669574de8ec380089407890f15eac2)
(cherry picked from commit 7f8741da4e713f657e876f66c3f31455aea8a729)
commit 15107a432a67f3829cb8af58d8f3109b0f1a2420
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 1 18:10:47 2010 +0200
s3:winbindd: remove unused variables
metze
(cherry picked from commit e18ddb6036f5e0a2211e89a7c9b5514c30a653cf)
(cherry picked from commit c64c867c307d32b8ec17d6e079395e0e9b604f00)
(cherry picked from commit 18f8b48a1143f7b39572de63362b6c30b81709cb)
commit f2a20e1523440a35bb6fab00325b7c993f524b54
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 1 16:23:06 2010 +0200
s3:winbindd: fix problems with SIGCHLD handling (bug #7317)
The main problem is that we call CatchChild() within the
parent winbindd, which overwrites the signal handler
that was registered by winbindd_setup_sig_chld_handler().
That means winbindd_sig_chld_handler() and winbind_child_died()
are never triggered when a winbindd domain child dies.
As a result will get "broken pipe" for all requests to that domain.
To reduce the risk of similar bugs in future we call
CatchChild() in winbindd_reinit_after_fork() now.
We also use a full winbindd_reinit_after_fork() in the
cache validation child now instead instead of just resetting
the SIGCHLD handler by hand. This will also fix possible
tdb problems on systems without pread/pwrite and disabled mmap
as we now correctly reopen the tdb handle for the child.
metze
(cherry picked from commit 73577205cf81644e7fe853eaf3e6459f7f443096)
(cherry picked from commit e0ece652956292cc67383535a0fa174b5015d91e)
(cherry picked from commit 26bdc249310b71dc45e087347e456c9f5b0f4f9b)
commit e38e22253f3525d070b63a9236e1c84d859440c8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 29 22:03:55 2010 +0200
s3:winbindd: correctly retry if the netlogon pipe gets disconnected during a logon call
This fixes hopefully the last part of bug #7295.
metze
(cherry picked from commit 4c6cde99c0751a073120d8bc36d40922d8027344)
(cherry picked from commit 482518fcafb18bda1f084ebf1906a2ad02436b80)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 6d24f28f52fb0e21943a1639c426cf7f825d15e7)
commit 57ad736c45fd5f310cef86060640d142ccfbda68
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:45:19 2010 +0200
s3:winbindd_reconnect: don't only reconnect on NT_STATUS_UNSUCCESSFUL
metze
(cherry picked from commit 6bd5a2a3739938f95fce23ab2da652c9b5a48111)
(cherry picked from commit 169628fcb656ba5987a99bd50c7f588b731eae51)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 30c048c124ece9648e0ec00991780b57af90201e)
commit 4701e4a4065513416819d3091cf25bb2ba814622
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Mar 25 15:25:47 2010 +0100
s3:winbindd_cm: invalidate connection if cm_connect_netlogon() fails
metze
(cherry picked from commit 94a4bcd2f0c0464e192556679c6636639cb307ea)
(cherry picked from commit c046ae8428fb62ff2749689e7c738f1a2e8f8251)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 61a353807ccefef98fa83e5abcebfe879cdf4337)
commit 1598876fb7003601380ecf3e0e3468ec37be5c85
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Mar 25 15:17:07 2010 +0100
s3:winbindd: consistently use TALLOC_FREE(conn->foo_pipe) is we create a new connection
metze
(cherry picked from commit 4f391fedac7111683d13f2d79fee7c0dbc27f86e)
(cherry picked from commit c462e54142c00fdd81c2847d16a75119b1cc89fc)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 4ef6370eaaa307ccfd74012a4b9397312ff747eb)
commit 72d1c1e0d3cf5b0e2486c1eb0309b7e61f3277ea
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:42:04 2010 +0200
s3:winbindd_cm: use rpccli_is_connected() helper function
metze
(cherry picked from commit d980c06a994d032a833adc8d56d2f2c037f8fdaf)
(cherry picked from commit aa7d54ed04585a183a88363406ed7f3244b24d85)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ff9277fb804e7d99a7e80d67c70b962b6199a4e3)
commit 7884f2879d94dffb279a8b0bcae508afcc7e66dc
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Mar 25 15:14:02 2010 +0100
s3:winbindd_cm: use cli_state_is_connected() helper function
metze
(cherry picked from commit 408a3eb35a0e61b5d66a3b48ebbd1a6796672d0f)
(cherry picked from commit 00a93190d2cae31cd2213b810ea348c055670399)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 21afa222ab9502ecb33decd16fe540d6d855ff13)
commit 48ab7d0bd7b606620111ea31aa062edc8ae26f7f
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Mar 28 19:34:34 2010 +0200
s3:rpc_client: return at least 10 sec as old timeout in rpccli_set_timeout() instead of 0
metze
(cherry picked from commit 3e70da3f470eeb122f95477fb48d89939f501b3e)
(cherry picked from commit 60861fba533027b6c9a0ff704b95dcf631ea3ca3)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5ae76f3beac43e7064b0304df24be84642882372)
commit 50f8ed9c85a3caeac466e87175e084fc00e47209
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:31:17 2010 +0200
s3:rpc_client: add set_timeout hook to rpc_cli_transport
metze
(cherry picked from commit 99664ad15460530b6fb44957b6c57823f09884bf)
(cherry picked from commit 89164eb8363ffc0b951256578be48d37ddba46b1)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit b462bc1724b3bdf9052566e683f9748ea6730169)
commit 8ff54339230d4cf6862e5c3dac59adff7178a869
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:26:29 2010 +0200
s3:rpc_client: add rpccli_is_connected()
metze
(cherry picked from commit 4f41b53487ac9bc96c7960e8edab464558656373)
(similar to commit 958b49323968740e2cbf69dc2a0a5dd57d5bcf87)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit a8a1a6c77a2148a729f6b285f3f945ffd5501256)
commit fc37e8163e89975e01c623c19107a6f3caf9573f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 29 14:58:19 2010 +0200
s3:rpc_client: don't mix layers and keep a reference to cli_state in the caller
We should not rely on the backend to have a reference to the cli_state.
This will make it possible for the backend to set its cli_state reference
to NULL, when the transport is dead.
metze
(cherry picked from commit dc09b12681ea0e6d4c2b0f1c99dfeb1f23019c65)
(cherry picked from commit 1e2e47da82aeb249dce431541738a62cb139aebb)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 582b1cdeb6c0b2145b55930421e8d48ad4754d04)
commit 11fb429cb8314e06b6cdd2c789e102c31e82315f
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 12:23:39 2010 +0200
s3:rpc_transport_np: use cli_state_is_connected() helper
metze
(cherry picked from commit b862351da8624df893ec77e020a456c1d23c58ed)
(cherry picked from commit 8c2f4426ce178ac33748cfba01532ec2fd205710)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 3ea35cd6bb61806ed502e4cd3f386c35a6f58156)
commit 4a884a31e41fc3544e12aab2f5fa48aa18617b21
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Mar 25 13:20:56 2010 +0100
s3:libsmb: add cli_state_is_connected() function
metze
(cherry picked from commit d7bf30ef92031ffddcde3680b38e602510bcae24)
(cherry picked from commit 589f73924273e8a9b54669f42a92381661dcb33f)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5a4bdb706b97857da67c791b81039b4bc4031c76)
commit 82b69cf7907132b4b4064aa734a8e8b15a3c0449
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 29 18:23:40 2010 +0200
s3:libsmb: don't let cli_shutdown() segfault with a NULL cli_state
metze
(similar to commit 47e10ab9a85960c78af807b66b99bcd139713644)
(cherry picked from commit 957c0d4a5ee67ac70e576155a0f2f6f84cdb1596)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit e6d5238c8403e848a43e6c7a2d3ca6422e8becd4)
commit 97b84c82201ffc0689f64622125698eabc419c54
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 12:22:54 2010 +0200
s3:rpc_transport_np: handle trans rdata like the output of a normal read
Inspired by bug #7159.
metze
(cherry picked from commit 911287285cc4c8485b75edfad3c1ece901a69b0b)
(cherry picked from commit e2739a2bf37e654c37cbea6e510f63a7ce4adfea)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 2ce1bcd4e4430f311decb73b659c9b615d5bb4e9)
commit 9d874a827227a1327bb7695648e140229ad20522
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:14:53 2010 +0200
s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response.
Signed-off-by: Bo Yang <boyang at samba.org>
(cherry picked from commit 36493bf2f6634b84c57107bcb86bcbf3e82e80fc)
(similar to commit b58b359881c91ec382cfa1d6ba3007b8354b29cb)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 6166e1809516e6ab5911b56b20a4128b088828cf)
commit db29ba6c5e6ede7bd94368f2cc66ac0647b86d6a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:06:39 2010 +0200
Fix broken pipe handling
Metze is right: If we have *any* error at the socket level, we just can
not continue.
Also, apply some defensive programming: With this async stuff someone else
might already have closed the socket.
(cherry picked from commit f140bf2e6578e45b8603d4a6c5feef9a3b735804)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 67b51cc9e773fcbbc2b942a1de256e2c5b695008)
commit 9c056c0afbc824f179fdb3dbbac6babed9130e63
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 14:04:33 2010 +0200
s3:rpc_client: close the socket when pipe is broken
Signed-off-by: Bo Yang <boyang at samba.org>
(similar to commit aa70e44cd0576e5280e24cf35000369a47dd958f)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 407b9577febff6dfbe29106d783d64c41d6fe4e4)
commit 5069a5792e56bb845b4bcacae7c68075a72cdf57
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 11:53:33 2010 +0200
s3: fix crash in winbindd (similar to commit f8cc0e88fbbb082ead023e0cb437b1e12cf35459)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit be9a46c9cae2d05a7eb54e871e05480bd8caa609)
commit 07b4b577d49afcac9794187588e32189429e04ed
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 13 20:06:14 2010 +0200
s3-docs: Fix typo in man idmap_ad.
Karolin
(cherry picked from commit 6389fac6db2f54d148222009b5e209cef5c6bdd7)
(cherry picked from commit 39dbf73a6fb4ad45eac259124b70042994d4f215)
(cherry picked from commit 1038d91f3c6d2be0a594226059c5379d3e2ffe58)
commit 56454403033a8d5ae97ab9a19567dd380759750a
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jan 7 00:41:50 2010 +0100
s3:lib/time: remove TIME_T_MIN/MAX defines
we already get them from lib/util/time.h
(cherry picked from commit f5729dbb6e720cb6076ea053f1ad0680259e6b39)
The last two patches address bug #7352 (TIME_T_MAX defines inconsistent).
(cherry picked from commit be86206167acb55bee2722c48a5ea09535cf2b99)
commit 9b81137e4302c82a4a7d31e3076ccc280348c569
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jan 7 00:40:09 2010 +0100
lib/util: move TIME_T_MIN/MAX defines into header file (cherry picked from commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8)
(cherry picked from commit 32b0c2c2c1d0e8f69de264f2c3c3b1d473f9ec4f)
commit 8afeb145bb107577411c709b5e937f1693fab70e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Apr 12 09:10:21 2010 +0200
WHATSNEW: Start release notes for Samba 3.4.8.
Karolin
(cherry picked from commit 6af316b30898cc2933d8a5925a62f4c8187fd6aa)
commit 79e65404f028ebf82b3202856861bb5310d37f4f
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 19 14:24:17 2010 -0800
Second part of fix for bug #7159 - client rpc_transport doesn't cope with bad server data returns.
If server returns zero on a NP read. Report pipe broken.
Prevents client from looping if it thinks there should be
more data.
Jeremy.
(cherry picked from commit 0055e33dbed0e81548464d01bcf864255bab3159)
(cherry picked from commit f5ca9f84e9b511c2ba7a4280b1997daa441f9877)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit c150cf25f1aa5f034baa08360d5be9b8b532b7cb)
commit b3c33308ac15e996770ad2c4a3762b1ee031f2a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 6 12:20:02 2010 +0200
First part of fix for bug #7159 - client rpc_transport doesn't cope with bad server data returns.
Ensure that subreq is *always* talloc_free'd in the _done
function, as it has an event timeout attached. If the
read requests look longer than the cli->timeout, then
the timeout fn is called with already freed data.
Jeremy.
(cherry picked from commit ad77ae1d5870e06f8587ecf634e0b6bdcbb950d7)
(similar to commit 6e5b6b5acb30869eb63b25ed1406014101a5e89d)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 0223d59ea950c8180047fd5de6c85f92c4e37ad2)
commit fae056483f76ffca3c93a79c7e7a5a1684a5f670
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 5 15:16:22 2010 -0700
s3: Fix bug 7326 -- can't write with vfs_full_audit active
(cherry picked from commit d232dd9df261ff251fd624b2b984355d247bb301)
commit 2b12db6d7d4e88a014af145d68aff7721188d677
Author: Bo Yang <boyang at samba.org>
Date: Tue Feb 9 17:02:20 2010 +0800
s3: signals are processed twice in child.
Signed-off-by: Bo Yang <boyang at samba.org>
(cherry picked from commit 8c8bb51de1ac2baa46ac0736fae12c034288e5d4)
Fix bug #7206 (duplicate signal handler, signals are processed twice in child
process).
(cherry picked from commit e41d9e75084170fa41a9e313fa79bf351f879840)
commit 50e838357dcbc160573e13ca3a61716caa129328
Author: Jeremy Allison <jra at samba.org>
Date: Tue Mar 30 22:24:19 2010 -0700
Fix bug 7310 - DOS attribute inconsistency with MS Office
On rename we need to set the archive bit on the renamed file.
Jeremy
(cherry picked from commit d5029023e1a44e1bfcbd4e5822d937fa03ba5a1b)
commit 375f7d78b5f8cd53c05a4e4658d1856b156e8472
Author: Jeremy Allison <jra at samba.org>
Date: Mon Mar 29 14:24:18 2010 -0700
Fix bug 7307 - man net usershare mistake
Fix bad usage message, reported by headset001 at yahoo.com.
Jeremy.
(cherry picked from commit e14a6fbf8c9e4d16b2727e48c708ceccfd157e59)
(cherry picked from commit 9620f5fbe64910d86cae51345156a1a4dd71e231)
(cherry picked from commit 41c5ab50749b36557af7e2a16076d330d1c0063b)
commit afb7eed1da24cbe5ac6faccda9ae3fe5ad29b9f7
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 25 17:09:23 2010 -0700
Fix bug 7297 - smbd crashes with CUPS printers and no [printers] share defined.
Ensure we don't dereference an array with an index of -1.
Jeremy.
(cherry picked from commit e4127ab299e654777c43d983b2e0a158baa7d79a)
(cherry picked from commit fcb4c51e79f648ae02f77784d46bcc9c7331d3cb)
commit 76019d6506a7f2b677ef1dd49e22dda2f73c3f52
Author: Kai Blin <kai at samba.org>
Date: Fri Mar 26 14:28:43 2010 -0700
s3 ntlm_auth: Don't malloc data that will be talloc_free()d
This fixes bug #7290
Thanks to Mohan <mohann at silver-peak.com> for the bug report.
(cherry picked from commit 36ecc6bed9bbf7ed6437433d89ec9d49da43e5ee)
commit deaa996e2fbc2bbd2640a53ca9a424b1421a980e
Author: Michael Karcher <samba at mkarcher.dialup.fu-berlin.de>
Date: Wed Mar 24 17:33:21 2010 -0700
Fix bug #7269 - Job management commands don't work for CUPS queues.
Samba needs to retrieve pjob->sysjob from the CUPS response (as
is done in the iprint backend).
(cherry picked from commit 1790e88f0f9c4fae90dcb53101f70c97ba6a6a5d)
(cherry picked from commit dc83d031398819c1b2c57aacf4f34c304cf09682)
commit 0e5b0c842232514317c1e48ac83d6066a475106c
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 18 11:21:15 2010 +0100
s3-printing: Fix "printer admin" functionality.
Fix bug #7255 ("printer admin" parameter does not work as expected).
(cherry picked from commit 0d6d068bc4f76c2816f969fcce6013e1945794d4)
(cherry picked from commit e74ced9f90ade37fa7bd179a91803f775c77e25b)
(cherry picked from commit a99d9e7678de17486bf34320ef0fda071b24197a)
commit ca4cec09b3d23c9f987f27d37a7b84fa3477e769
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 16 10:30:04 2010 +0100
s3-spoolss: Fix value-needed calculation in_spoolss_EnumPrinterData().
Guenther
Fix bug #7256 (incorrect value-needed calculation in
_spoolss_EnumPrinterData()).
(cherry picked from commit 400801c2314c5effd5165e77cdefc833dee1b6b2)
(cherry picked from commit 78ef22a6f297dcc8045e2479a3af6c1cba34ad16)
commit c5aeb7c6154db6a86526e3c4461dcf9ad44a93f6
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 14 21:18:34 2010 +0100
s3: Fix an uninitialized variable read
Found by Laurent Gaffie <laurent.gaffie at gmail.com>
Thanks for that,
Volker
Fix bug #7254 (An uninitialized variable read could cause an smbd crash).
(cherry picked from commit 9280051bfba337458722fb157f3082f93cbd9f2b)
(cherry picked from commit 3373b973ef892f013dbf6a1df805de158c0ff4e2)
commit 6801e3be85ae5043cc5da50bdd7d204c7d84d551
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 8 23:37:21 2010 +0100
s3:release-scripts: fix create-tarball to treat vendor patch level correctly
(cherry picked from commit b845025daf2da85eb1af6cbfa7878cf59a32f2a6)
(cherry picked from commit 95c6a5a782caa77bc8bbe75de6ca249bc255507e)
(cherry picked from commit 64fbfee4d322381b8b877feaf1f71b778a88b7f4)
commit c3f1a78630a52b4d291608ec97a6decbf14be166
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 9 14:08:57 2010 +0100
s3: re-run make samba3-idl.
Guenther
The last 16 patches address bug #6727 (Printer issues on 3.4.x).
(cherry picked from commit 7586069115f9b385bba40c7c022a5b516463736f)
commit e59bf4441990dab1061dcbe6f7e1604ceeeadfbb
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 7 11:28:56 2009 +0100
s3-spoolss: let _spoolss_DeletePrinterData call into _spoolss_DeletePrinterDataEx.
Guenther
(cherry picked from commit ef9d6580efc55ee040458b7cd76ebdc2e1276e98)
(cherry picked from commit beeb98c693cba71573b1ff7fc6b0349ea4eda8ca)
commit 6b2eae53d2d411b8cc504ac34280f77f5acf57d4
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 17:58:49 2010 +0100
s3-libads: fix get_remote_printer_publishing_data after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit 9d5aa986357983fb6a422c0990a3f134e44874d5)
commit eab0e37fe0a3df20fcc258b64beed842fa294602
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:47:10 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit becbb624eb90b84ff20b128de1aee5f5acfc3dbc)
(cherry picked from commit e6168075943bf01af1bcf8c0b0ff50b4dc1de82d)
commit cb9e5c5eddf6a5ed3acd0c4131325254cf670292
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:46:53 2010 +0100
s3-net: fix net after spoolss_EnumPrinterDataEx IDL change.
Guenther
(cherry picked from commit a99ac4f236d9a93d4ca8bd874cbab89b155c644a)
(cherry picked from commit 9c752851bc7291edf05e364ef2f8f387a9984bfa)
commit 13fc0a5c9388c6bbc5ba80ac3ee00668f3574768
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:47:33 2010 +0100
s3-spoolss: fix _spoolss_EnumPrinterDataEx after idl
Guenther
(cherry picked from commit 55326549852a3ab1114a8cb1536578ae02183eb8)
(cherry picked from commit 6e677a1242115f57b84eff254ed55af2651df771)
commit 5eb2f05b84b17d92bbc86bf0e4af802124cc4131
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 16:40:31 2010 +0100
spoolss: fix spoolss_EnumPrinterDataEx IDL.
Guenther
(cherry picked from commit 4df1047e8398a9af4df94c7e245d993d1f60ef5f)
(cherry picked from commit a947b5f827884c18f0f4535f7be7e7cd5b42ee9c)
commit e6a23fb6536e6fe1cdc49929c1d524a26f84bd50
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:46:28 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_GetPrinterData{Ex} IDL change.
Guenther
(cherry picked from commit 345eba78f7fc72f067cd3d95a7698081e09be85f)
commit 2fe7fe26208e95efd40f9b2e8c2068f19bebce88
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:39:59 2010 +0100
s3-spoolss: fix _spoolss_GetPrinterDataEx after IDL change.
Guenther
(cherry picked from commit fbb6d00eed6bca960aa53a5967a2dea426cacfe2)
(cherry picked from commit 017c4ac6c1c2a19345d1f79acf8179a995f38cb5)
commit 914ac7563a859cd4e305f2acc44cef3c4e22aaee
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 5 00:52:28 2009 +0100
s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx.
Guenther
(cherry picked from commit 697e615843e83d097c5479858a324195450f6c87)
commit a78789aebe526987602ae8b7b8de9cdabf47d92d
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 9 13:20:10 2010 +0100
spoolss: rollback GetPrinterData{Ex} IDL.
Guenther
(cherry picked from commit 45195a2689f59be434037274f616083fd8930ffa)
commit d8278d172a1e0f4709811eb87fdae9feb33bc897
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:34:22 2010 +0100
s3-net: fix net after spoolss_SetPrinterData{Ex} IDL change.
Guenther
(cherry picked from commit b2adbea53007d560f95c09af407c1c51a8e78d14)
commit 6ccf4c7deef22f7eaa597e5b641569c3d3afa247
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 15:34:49 2010 +0100
s3-rpcclient: fix rpcclient after spoolss_SetPrinterData{Ex} IDL change.
Guenther
(cherry picked from commit 4956650369156dfff96ccc827e55697ec642240d)
(cherry picked from commit 7711fe5ca643b32a3873a94d21dc5ec9155ef940)
commit 63835c2a7f9d4c0957d4f0eee553c76f6999e482
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 4 17:00:34 2010 +0100
s3-spoolss: fix _spoolss_SetPrinterData{Ex} after IDL change.
Guenther
(cherry picked from commit 9a934832797c3e72859770719e05d19a5eefa14d)
(cherry picked from commit 20cc464b000beab223aea4b58ff974da9a943806)
commit 8041e8af8e59e4e9021fc8ad940f91c10324e76b
Author: Günther Deschner <gd at samba.org>
Date: Sat Dec 5 00:56:55 2009 +0100
s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx.
Guenther
(cherry picked from commit 167dca0cbf18baf40dd923f6f92421123d34b5a3)
(cherry picked from commit 6f9d646f8071543287466a4a616246b32c80e2ca)
commit ac05dad71365b66a9050802b43ec070867051971
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 9 13:01:13 2010 +0100
spoolss: rollback SetPrinterData{Ex} IDL.
Guenther
(cherry picked from commit 8c00f95c8d86f2c3c73ce84d3cc0f038d8e0ceb2)
commit 0e640cf9deaed68aa7aba88ce7481b0013afd701
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 8 22:32:41 2010 +0100
s3:build: Fix automatic building of vfs_tsmsm if gpfs and dmapi are present.
Michael
(cherry picked from commit 9113e14b291c10c824d2d8ea5cb28ffc0adcb63b)
Fix bug #7231 (vfs_tsmsm not built automatically).
(cherry picked from commit 8087ceb42d72f2a07f70e8ab5462775a08303546)
(cherry picked from commit de89fcc1f60d7f287f87507d2187d4ca8966791c)
commit 6f3f7957bed94c43f80327176db14e52d1e3bc1c
Author: Volker Lendecke <vl at samba.org>
Date: Tue Mar 9 11:14:14 2010 +0100
s3: Fix a NULL pointer dereference
Found by Laurent Gaffie <laurent.gaffie at gmail.com>.
Thanks!
Volker
(cherry picked from commit 25452a2268ac7013da28125f3df22085139af12d)
Fix bug #7229 (NULL pointer dereference).
(cherry picked from commit bf40d130a1761daa14ce6a2cf3d02dbd9095c2b5)
(cherry picked from commit 6e8c643688a323c9a68baa9f015cffec65d75115)
commit d426e8da1f5a38e3fb1a1ac6aebd821dbf408875
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Wed Mar 10 12:15:44 2010 +0900
vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"
Fix bug #1206 (netatalk vfs causes segfaults in samba).
(cherry picked from commit 531a9ebd52fe65196bb01632a296b40a92a43b4c)
(cherry picked from commit 12dc7210fdba44d4df87102d44ee1bb7fc51f9f3)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 8 +-
docs-xml/manpages-3/idmap_ad.8.xml | 2 +-
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/smbdotconf/winbind/winbindnssinfo.xml | 18 +-
lib/tevent/tevent.c | 7 +
lib/tevent/tevent_internal.h | 1 +
lib/tevent/tevent_signal.c | 33 ++-
lib/util/time.c | 14 -
lib/util/time.h | 14 +
librpc/gen_ndr/cli_spoolss.c | 20 +-
librpc/gen_ndr/cli_spoolss.h | 12 +-
librpc/gen_ndr/ndr_spoolss.c | 381 +++++++++++-------------
librpc/gen_ndr/ndr_spoolss.h | 17 +-
librpc/gen_ndr/spoolss.h | 87 ++-----
librpc/gen_ndr/srv_spoolss.c | 12 +-
librpc/idl/spoolss.idl | 61 ++---
librpc/ndr/ndr_spoolss_buf.c | 140 ---------
librpc/ndr/ndr_spoolss_buf.h | 3 -
nsswitch/libwbclient/wbc_idmap.c | 32 +-
nsswitch/libwbclient/wbc_pam.c | 13 +-
nsswitch/libwbclient/wbclient.c | 31 ++-
nsswitch/libwbclient/wbclient_internal.h | 3 +
release-scripts/create-tarball | 2 +-
source3/client/mount.cifs.c | 293 ++++++++++++++++---
source3/client/mtab.c | 1 +
source3/configure.in | 2 +-
source3/include/client.h | 4 +
source3/include/libsmbclient.h | 22 +-
source3/include/proto.h | 6 +-
source3/lib/time.c | 8 -
source3/libads/ldap_printer.c | 40 +--
source3/libsmb/async_smb.c | 11 +-
source3/libsmb/clientgen.c | 4 +
source3/libsmb/clierror.c | 18 ++
source3/modules/vfs_full_audit.c | 8 +-
source3/modules/vfs_netatalk.c | 2 +-
source3/passdb/passdb.c | 35 ++-
source3/printing/lpq_parse.c | 21 ++
source3/printing/nt_printing.c | 2 +-
source3/printing/print_cups.c | 21 ++-
source3/printing/printing.c | 21 --
source3/rpc_client/cli_pipe.c | 58 +++-
source3/rpc_client/cli_spoolss.c | 16 +-
source3/rpc_client/rpc_transport_np.c | 128 ++++++++
source3/rpc_client/rpc_transport_smbd.c | 101 ++++++-
source3/rpc_client/rpc_transport_sock.c | 87 ++++++-
source3/rpc_server/srv_spoolss_nt.c | 327 ++++++--------------
source3/rpcclient/cmd_spoolss.c | 95 ++++--
source3/smbd/process.c | 11 +-
source3/smbd/reply.c | 17 +
source3/smbd/service.c | 2 +-
source3/smbd/sesssetup.c | 2 +-
source3/utils/net_conf.c | 3 +
source3/utils/net_rpc_printer.c | 29 +--
source3/utils/ntlm_auth.c | 24 +-
source3/winbindd/winbindd.c | 26 +-
source3/winbindd/winbindd_cm.c | 73 +++--
source3/winbindd/winbindd_domain.c | 20 +-
source3/winbindd/winbindd_dual.c | 14 +-
source3/winbindd/winbindd_idmap.c | 16 +-
source3/winbindd/winbindd_locator.c | 16 +-
source3/winbindd/winbindd_pam.c | 4 +-
source3/winbindd/winbindd_reconnect.c | 73 ++++-
63 files changed, 1496 insertions(+), 1078 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9a61578..0599a09 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,12 +1,12 @@
=============================
Release Notes for Samba 3.4.8
- , 2010
+ May 11, 2010
=============================
This is the latest stable release of Samba 3.4.
-Major enhancements in Samba 3.4.6 include:
+Major enhancements in Samba 3.4.8 include:
o
@@ -15,7 +15,9 @@ Changes since 3.4.7
-------------------
-o
+o Volker Lendecke <vl at samba.org>
+ * BUG 7254: Fix an uninitialized variable read in smbd found by Laurent
+ Gaffié from Stratsec.
######################################################################
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index 0fd0ed6..58f6878 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -58,7 +58,7 @@
<title>EXAMPLES</title>
<para>
The following example shows how to retrieve idmappings from our principal and
- and trusted AD domains. If trusted domains are present id conflicts must be
+ trusted AD domains. If trusted domains are present id conflicts must be
resolved beforehand, there is no
guarantee on the order conflicting mappings would be resolved at this point.
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index de3ed4d..e53e46d 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1304,7 +1304,7 @@ can create user defined shares on demand using the commands below.
<para>The usershare commands are:
<simplelist>
-<member>net usershare add sharename path [comment] [acl] [guest_ok=[y|n]] - to add or change a user defined share.</member>
+<member>net usershare add sharename path [comment [acl] [guest_ok=[y|n]]] - to add or change a user defined share.</member>
<member>net usershare delete sharename - to delete a user defined share.</member>
<member>net usershare info [-l|--long] [wildcard sharename] - to print info about a user defined share.</member>
<member>net usershare list [-l|--long] [wildcard sharename] - to list user defined shares.</member>
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index d6e40c6..318727c 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -6,35 +6,33 @@
<description>
<para>This parameter is designed to control how Winbind retrieves Name
- Service Information to construct a user's home directory and login shell.
- Currently the following settings are available:
+ Service Information to construct a user's home directory and login shell.
+ Currently the following settings are available:
<itemizedlist>
<listitem>
- <para><parameter moreinfo="none">template</parameter>
- - The default, using the parameters of <parameter moreinfo="none">template
+ <para><parameter moreinfo="none">template</parameter>
+ - The default, using the parameters of <parameter moreinfo="none">template
shell</parameter> and <parameter moreinfo="none">template homedir</parameter>)
</para>
</listitem>
-
+
<listitem>
<para><parameter moreinfo="none"><sfu | rfc2307 ></parameter>
- When Samba is running in security = ads and your Active Directory
Domain Controller does support the Microsoft "Services for Unix" (SFU)
LDAP schema, winbind can retrieve the login shell and the home
directory attributes directly from your Directory Server. Note that
- retrieving UID and GID from your ADS-Server requires to
- use <parameter moreinfo="non">idmap backend</parameter> = ad
- or <parameter moreinfo="non">idmap config DOMAIN:backend</parameter> = ad
+ retrieving UID and GID from your ADS-Server requires to
+ use <parameter moreinfo="none">idmap config DOMAIN:backend</parameter> = ad
as well.
</para>
</listitem>
-
</itemizedlist>
</para>
</description>
<value type="default">template</value>
-<value type="example">template sfu</value>
+<value type="example">sfu</value>
</samba:parameter>
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 76a6ac1..ae5fdbd 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -176,6 +176,13 @@ int tevent_common_context_destructor(struct tevent_context *ev)
sn = se->next;
se->event_ctx = NULL;
DLIST_REMOVE(ev->signal_events, se);
+ /*
+ * This is important, Otherwise signals
+ * are handled twice in child. eg, SIGHUP.
+ * one added in parent, and another one in
+ * the child. -- BoYang
+ */
+ tevent_cleanup_pending_signal_handlers(se);
}
return 0;
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index aa7c34a..0c15e35 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -299,6 +299,7 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
const char *handler_name,
const char *location);
int tevent_common_check_signal(struct tevent_context *ev);
+void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se);
bool tevent_standard_init(void);
bool tevent_select_init(void);
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index ab170a6..f3e22db 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -133,7 +133,9 @@ static void tevent_common_signal_handler_info(int signum, siginfo_t *info,
static int tevent_common_signal_list_destructor(struct tevent_common_signal_list *sl)
{
- DLIST_REMOVE(sig_state->sig_handlers[sl->se->signum], sl);
+ if (sig_state->sig_handlers[sl->se->signum]) {
+ DLIST_REMOVE(sig_state->sig_handlers[sl->se->signum], sl);
+ }
return 0;
}
@@ -154,12 +156,16 @@ static int tevent_signal_destructor(struct tevent_signal *se)
if (sig_state->sig_handlers[se->signum] == NULL) {
/* restore old handler, if any */
- sigaction(se->signum, sig_state->oldact[se->signum], NULL);
- sig_state->oldact[se->signum] = NULL;
+ if (sig_state->oldact[se->signum]) {
+ sigaction(se->signum, sig_state->oldact[se->signum], NULL);
+ sig_state->oldact[se->signum] = NULL;
+ }
#ifdef SA_SIGINFO
if (se->sa_flags & SA_SIGINFO) {
- talloc_free(sig_state->sig_info[se->signum]);
- sig_state->sig_info[se->signum] = NULL;
+ if (sig_state->sig_info[se->signum]) {
+ talloc_free(sig_state->sig_info[se->signum]);
+ sig_state->sig_info[se->signum] = NULL;
+ }
}
#endif
}
@@ -396,3 +402,20 @@ int tevent_common_check_signal(struct tevent_context *ev)
return 1;
}
+
+void tevent_cleanup_pending_signal_handlers(struct tevent_signal *se)
+{
+ struct tevent_common_signal_list *sl;
+ sl = talloc_get_type(se->additional_data,
+ struct tevent_common_signal_list);
+
+ tevent_common_signal_list_destructor(sl);
+
+ if (sig_state->sig_handlers[se->signum] == NULL) {
+ if (sig_state->oldact[se->signum]) {
+ sigaction(se->signum, sig_state->oldact[se->signum], NULL);
+ sig_state->oldact[se->signum] = NULL;
+ }
+ }
+ return;
+}
diff --git a/lib/util/time.c b/lib/util/time.c
index eadafe4..571219b 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -27,11 +27,6 @@
* @brief time handling functions
*/
-#ifndef TIME_T_MIN
-/* we use 0 here, because (time_t)-1 means error */
-#define TIME_T_MIN 0
-#endif
-
#if (SIZEOF_LONG == 8)
#define TIME_FIXUP_CONSTANT_INT 11644473600L
#elif (SIZEOF_LONG_LONG == 8)
@@ -40,15 +35,6 @@
-/*
- * we use the INT32_MAX here as on 64 bit systems,
- * gmtime() fails with INT64_MAX
- */
-
-#ifndef TIME_T_MAX
-#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t))
-#endif
-
/**
External access to time_t_min and time_t_max.
**/
diff --git a/lib/util/time.h b/lib/util/time.h
index e40de2d..cf6dc1c 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -23,6 +23,20 @@
#define _PUBLIC_
#endif
+#ifndef TIME_T_MIN
+/* we use 0 here, because (time_t)-1 means error */
+#define TIME_T_MIN 0
+#endif
+
+/*
+ * we use the INT32_MAX here as on 64 bit systems,
+ * gmtime() fails with INT64_MAX
+ */
+#ifndef TIME_T_MAX
+#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t))
+#endif
+
+
/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
typedef uint64_t NTTIME;
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 10dd8b4..8820971 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -1301,9 +1301,9 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
- uint32_t offered /* [in] */,
enum winreg_Type *type /* [out] [ref] */,
- union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
{
@@ -1339,7 +1339,7 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
/* Return variables */
*type = *r.out.type;
- *data = *r.out.data;
+ memcpy(data, r.out.data, (r.in.offered) * sizeof(*data));
*needed = *r.out.needed;
/* Return result */
@@ -1355,8 +1355,8 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
WERROR *werror)
{
struct spoolss_SetPrinterData r;
@@ -1367,7 +1367,7 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
r.in.value_name = value_name;
r.in.type = type;
r.in.data = data;
- r.in._offered = _offered;
+ r.in.offered = offered;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(spoolss_SetPrinterData, &r);
@@ -3652,7 +3652,7 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- uint8_t *buffer /* [in] [ref,size_is(offered)] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
uint32_t offered /* [in] */,
WERROR *werror)
{
@@ -3664,7 +3664,7 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
r.in.key_name = key_name;
r.in.value_name = value_name;
r.in.type = type;
- r.in.buffer = buffer;
+ r.in.data = data;
r.in.offered = offered;
if (DEBUGLEVEL >= 10) {
@@ -3705,7 +3705,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type *type /* [out] [ref] */,
- uint8_t *buffer /* [out] [ref,size_is(offered)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror)
@@ -3743,7 +3743,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
/* Return variables */
*type = *r.out.type;
- memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
+ memcpy(data, r.out.data, (r.in.offered) * sizeof(*data));
*needed = *r.out.needed;
/* Return result */
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index eb1e8dd..0ee28e5 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -190,9 +190,9 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
- uint32_t offered /* [in] */,
enum winreg_Type *type /* [out] [ref] */,
- union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
@@ -200,8 +200,8 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
struct policy_handle *handle /* [in] [ref] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
- uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
+ uint32_t offered /* [in] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_WaitForPrinterChange(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
@@ -471,7 +471,7 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type type /* [in] */,
- uint8_t *buffer /* [in] [ref,size_is(offered)] */,
+ uint8_t *data /* [in] [ref,size_is(offered)] */,
uint32_t offered /* [in] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
@@ -480,7 +480,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
const char *key_name /* [in] [charset(UTF16)] */,
const char *value_name /* [in] [charset(UTF16)] */,
enum winreg_Type *type /* [out] [ref] */,
- uint8_t *buffer /* [out] [ref,size_is(offered)] */,
+ uint8_t *data /* [out] [ref,size_is(offered)] */,
uint32_t offered /* [in] */,
uint32_t *needed /* [out] [ref] */,
WERROR *werror);
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index cca1b12..ef3fd3d 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -6146,12 +6146,12 @@ static enum ndr_err_code ndr_push_spoolss_SetPrinterInfo2(struct ndr_push *ndr,
NDR_CHECK(ndr_push_unique_ptr(ndr, r->drivername));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->location));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->devmode));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->devmode_ptr));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->sepfile));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->printprocessor));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->datatype));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->parameters));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->secdesc));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->secdesc_ptr));
NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->defaultpriority));
@@ -6204,14 +6204,6 @@ static enum ndr_err_code ndr_push_spoolss_SetPrinterInfo2(struct ndr_push *ndr,
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->location, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->location, ndr_charset_length(r->location, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
- if (r->devmode) {
- {
- struct ndr_push *_ndr_devmode;
- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1));
- NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1));
- }
- }
if (r->sepfile) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->sepfile, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -6236,14 +6228,6 @@ static enum ndr_err_code ndr_push_spoolss_SetPrinterInfo2(struct ndr_push *ndr,
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->parameters, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->parameters, ndr_charset_length(r->parameters, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
- if (r->secdesc) {
- {
- struct ndr_push *_ndr_secdesc;
- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
- NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1));
- }
- }
}
return NDR_ERR_SUCCESS;
}
@@ -6264,8 +6248,6 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo2(struct ndr_pull *ndr,
TALLOC_CTX *_mem_save_comment_0;
uint32_t _ptr_location;
TALLOC_CTX *_mem_save_location_0;
- uint32_t _ptr_devmode;
- TALLOC_CTX *_mem_save_devmode_0;
uint32_t _ptr_sepfile;
TALLOC_CTX *_mem_save_sepfile_0;
uint32_t _ptr_printprocessor;
@@ -6274,8 +6256,6 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo2(struct ndr_pull *ndr,
TALLOC_CTX *_mem_save_datatype_0;
uint32_t _ptr_parameters;
TALLOC_CTX *_mem_save_parameters_0;
- uint32_t _ptr_secdesc;
- TALLOC_CTX *_mem_save_secdesc_0;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_servername));
@@ -6320,12 +6300,7 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo2(struct ndr_pull *ndr,
} else {
r->location = NULL;
}
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
- if (_ptr_devmode) {
- NDR_PULL_ALLOC(ndr, r->devmode);
- } else {
- r->devmode = NULL;
- }
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->devmode_ptr));
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sepfile));
if (_ptr_sepfile) {
NDR_PULL_ALLOC(ndr, r->sepfile);
@@ -6350,12 +6325,7 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo2(struct ndr_pull *ndr,
} else {
r->parameters = NULL;
}
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
- if (_ptr_secdesc) {
- NDR_PULL_ALLOC(ndr, r->secdesc);
- } else {
- r->secdesc = NULL;
- }
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->secdesc_ptr));
NDR_CHECK(ndr_pull_spoolss_PrinterAttributes(ndr, NDR_SCALARS, &r->attributes));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority));
if (r->priority > 99) {
@@ -6453,17 +6423,6 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo2(struct ndr_pull *ndr,
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->location, ndr_get_array_length(ndr, &r->location), sizeof(uint16_t), CH_UTF16));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_location_0, 0);
}
- if (r->devmode) {
- _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
- {
- struct ndr_pull *_ndr_devmode;
- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
- NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
- }
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
- }
if (r->sepfile) {
_mem_save_sepfile_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->sepfile, 0);
@@ -6512,17 +6471,6 @@ static enum ndr_err_code ndr_pull_spoolss_SetPrinterInfo2(struct ndr_pull *ndr,
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->parameters, ndr_get_array_length(ndr, &r->parameters), sizeof(uint16_t), CH_UTF16));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_parameters_0, 0);
}
- if (r->secdesc) {
- _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
- {
- struct ndr_pull *_ndr_secdesc;
- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
- NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
- }
--
Samba Shared Repository
More information about the samba-cvs
mailing list