The branch, master has been updated via b20fb15 s4:libcli/smb2/write correct error checking via 4e91ccf smbXcli: add some includes to fix compiler warnings via 0dfc330 lib/socket_wrapper: writev returns ssize_t, not int via 18c152f lib/param: move enum dns_update_settings to lib/param from efe28b1 s4:libcli/pyerrors: add PyErr_NTSTATUS_NOT_OK_RAISE()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b20fb153e1f20a2c6bdbf71d91858e8d2b1c4712 Author: Christian Ambach <a...@samba.org> Date: Fri Jul 27 15:09:18 2012 +0200 s4:libcli/smb2/write correct error checking Server might return STATUS_BUFFER_OVERFLOW, which is not caught by NT_STATUS_IS_ERR Autobuild-User(master): Christian Ambach <a...@samba.org> Autobuild-Date(master): Mon Aug 6 20:01:01 CEST 2012 on sn-devel-104 commit 4e91ccf16de6db8fdfdec65717b95f0e072f42da Author: Christian Ambach <a...@samba.org> Date: Tue Jul 24 13:16:57 2012 +0200 smbXcli: add some includes to fix compiler warnings if smbXcli_base.h is included on its own, there are various compiler warnings about implicitly declared struct iovec and smb2_create_blobs commit 0dfc33026e1445327954b8822afe4e44e82185ef Author: Christian Ambach <a...@samba.org> Date: Fri Jul 27 15:08:05 2012 +0200 lib/socket_wrapper: writev returns ssize_t, not int commit 18c152f8aa5ab7b5463fa1f6daf72fbbe32eaddb Author: Christian Ambach <a...@samba.org> Date: Fri Aug 3 17:59:17 2012 +0200 lib/param: move enum dns_update_settings to lib/param ----------------------------------------------------------------------- Summary of changes: lib/param/loadparm.c | 1 - lib/param/loadparm.h | 3 +++ lib/socket_wrapper/socket_wrapper.c | 2 +- lib/socket_wrapper/socket_wrapper.h | 2 +- libcli/smb/smbXcli_base.h | 3 +++ source3/param/loadparm.c | 1 - source4/dns_server/dns_update.c | 2 +- source4/dns_server/dns_update.h | 25 ------------------------- source4/libcli/smb2/write.c | 2 +- 9 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 source4/dns_server/dns_update.h Changeset truncated at 500 lines: diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 80733b4..4751a06 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -66,7 +66,6 @@ #include "lib/param/s3_param.h" #include "lib/util/bitmap.h" #include "libcli/smb/smb_constants.h" -#include "source4/dns_server/dns_update.h" #define standard_sub_basic talloc_strdup diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 8c4a7b1..591e6e5 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -176,6 +176,9 @@ enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX, #define ADS_AUTH_SASL_FORCE 0x0080 #define ADS_AUTH_USER_CREDS 0x0100 +/* DNS update settings */ +enum dns_update_settings {DNS_UPDATE_OFF, DNS_UPDATE_ON, DNS_UPDATE_SIGNED}; + /* LDAP SSL options */ enum ldap_ssl_types {LDAP_SSL_OFF, LDAP_SSL_START_TLS}; diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index 44d21fb..3c9d0f1 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -2506,7 +2506,7 @@ int swrap_readv(int s, const struct iovec *vector, size_t count) return ret; } -int swrap_writev(int s, const struct iovec *vector, size_t count) +ssize_t swrap_writev(int s, const struct iovec *vector, size_t count) { struct msghdr msg; struct iovec tmp; diff --git a/lib/socket_wrapper/socket_wrapper.h b/lib/socket_wrapper/socket_wrapper.h index 32c9de6..bd8cdca 100644 --- a/lib/socket_wrapper/socket_wrapper.h +++ b/lib/socket_wrapper/socket_wrapper.h @@ -56,7 +56,7 @@ ssize_t swrap_recv(int s, void *buf, size_t len, int flags); ssize_t swrap_read(int s, void *buf, size_t len); ssize_t swrap_send(int s, const void *buf, size_t len, int flags); int swrap_readv(int s, const struct iovec *vector, size_t count); -int swrap_writev(int s, const struct iovec *vector, size_t count); +ssize_t swrap_writev(int s, const struct iovec *vector, size_t count); int swrap_close(int); int swrap_dup(int oldfd); int swrap_dup2(int oldfd, int newfd); diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 689369e..2c0410b 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -21,6 +21,9 @@ #ifndef _SMBXCLI_BASE_H_ #define _SMBXCLI_BASE_H_ +#include <sys/uio.h> +#include "libcli/smb/smb2_create_blob.h" + struct smbXcli_conn; struct smbXcli_session; struct smbXcli_tcon; diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index dc23868..1b766c3 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -68,7 +68,6 @@ #include "dbwrap/dbwrap.h" #include "dbwrap/dbwrap_rbt.h" #include "../lib/util/bitmap.h" -#include "../source4/dns_server/dns_update.h" #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c index a09818d..e7514ac 100644 --- a/source4/dns_server/dns_update.c +++ b/source4/dns_server/dns_update.c @@ -26,11 +26,11 @@ #include "librpc/gen_ndr/ndr_dnsp.h" #include <ldb.h> #include "param/param.h" +#include "param/loadparm.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" #include "smbd/service_task.h" #include "dns_server/dns_server.h" -#include "dns_server/dns_update.h" static WERROR dns_rr_to_dnsp(TALLOC_CTX *mem_ctx, const struct dns_res_rec *rrec, diff --git a/source4/dns_server/dns_update.h b/source4/dns_server/dns_update.h deleted file mode 100644 index 71ff85e..0000000 --- a/source4/dns_server/dns_update.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - DNS update settings - - Copyright (C) 2011 Kai Blin <k...@samba.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -enum dns_update_settings { - DNS_UPDATE_OFF=0, - DNS_UPDATE_ON=1, - DNS_UPDATE_SIGNED=2 -}; diff --git a/source4/libcli/smb2/write.c b/source4/libcli/smb2/write.c index bc28337..62ffe2e 100644 --- a/source4/libcli/smb2/write.c +++ b/source4/libcli/smb2/write.c @@ -58,7 +58,7 @@ struct smb2_request *smb2_write_send(struct smb2_tree *tree, struct smb2_write * NTSTATUS smb2_write_recv(struct smb2_request *req, struct smb2_write *io) { if (!smb2_request_receive(req) || - smb2_request_is_error(req)) { + !smb2_request_is_ok(req)) { return smb2_request_destroy(req); } -- Samba Shared Repository