[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-484-g83cf98f
The branch, master has been updated
via 83cf98f113541acca5a9b4d6ad084d401b64706f (commit)
from 7435b877c7969a72b6b17d3ce4df87c5629882b8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 83cf98f113541acca5a9b4d6ad084d401b64706f
Author: Aravind Srinivasan
Date: Wed Feb 4 16:05:36 2009 -0800
Have nmbd check all available interfaces for WINS before failing
When nmbd is acting as WINS, it picks the first interface's IP as WINS
server's IP. If the first interface's IP is zero, we will just quit
(even though we might have other interfaces with valid IPs).
This patch makes nmbd look at all interfaces and pick the first interface
with a valid IP as the WINS server's IP.
---
Summary of changes:
source3/lib/interface.c|7 +--
source3/nmbd/nmbd_become_dmb.c |3 ++-
source3/nmbd/nmbd_subnetdb.c |3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 48fa4d3..b32ccb9 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -151,7 +151,8 @@ int iface_count_v4_nl(void)
}
/
- Return a pointer to the in_addr of the first IPv4 interface.
+ Return a pointer to the in_addr of the first IPv4 interface that's
+ not 0.0.0.0.
**/
const struct in_addr *first_ipv4_iface(void)
@@ -159,7 +160,9 @@ const struct in_addr *first_ipv4_iface(void)
struct interface *i;
for (i=local_interfaces;i ;i=i->next) {
- if (i->ip.ss_family == AF_INET) {
+ if ((i->ip.ss_family == AF_INET) &&
+ (!is_zero_ip_v4(((struct sockaddr_in *)&i->ip)->sin_addr)))
+ {
break;
}
}
diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c
index a0b2ef1..827d56c 100644
--- a/source3/nmbd/nmbd_become_dmb.c
+++ b/source3/nmbd/nmbd_become_dmb.c
@@ -128,7 +128,8 @@ in workgroup %s on subnet %s\n",
work->dmb_name = nmbname;
- /* Pick the first interface IPv4 address as the domain master
browser ip. */
+ /* Pick the first interface IPv4 address as the domain master
+* browser ip. */
nip = first_ipv4_iface();
if (!nip) {
DEBUG(0,("become_domain_master_stage2: "
diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
index 61af0bb..13bc931 100644
--- a/source3/nmbd/nmbd_subnetdb.c
+++ b/source3/nmbd/nmbd_subnetdb.c
@@ -287,7 +287,8 @@ bool create_subnets(void)
}
if (lp_we_are_a_wins_server()) {
- /* Pick the first interface IPv4 address as the WINS server ip.
*/
+ /* Pick the first interface IPv4 address as the WINS server
+* ip. */
const struct in_addr *nip = first_ipv4_iface();
if (!nip) {
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.70b-25-gdfb16ce
The branch, master has been updated
via dfb16ce9ed65048d30109851737a9075d071ecdb (commit)
from a6cdf9106074890b76d2eabe496af244e0134d31 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit dfb16ce9ed65048d30109851737a9075d071ecdb
Author: root
Date: Thu Feb 5 14:44:46 2009 +1100
use netstat to check first and only fall back to netcat if netstat is
unavailable
---
Summary of changes:
config/functions | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/functions b/config/functions
index ee48dd2..1073055 100644
--- a/config/functions
+++ b/config/functions
@@ -209,7 +209,11 @@ ctdb_check_tcp_ports() {
# check availability of netcat or netstat first
NETCAT=""
NETSTAT=""
- if [ -x /usr/bin/netcat ]; then
+ if [ -x /usr/bin/netstat ]; then
+ NETSTAT=/usr/bin/netstat
+ elif [ -x /bin/netstat ]; then
+ NETSTAT=/bin/netstat
+ elif [ -x /usr/bin/netcat ]; then
NETCAT=/usr/bin/netcat
elif [ -x /bin/netcat ]; then
NETCAT=/bin/netcat
@@ -217,10 +221,6 @@ ctdb_check_tcp_ports() {
NETCAT=/usr/bin/nc
elif [ -x /bin/nc ]; then
NETCAT=/bin/nc
- elif [ -x /usr/bin/netstat ]; then
- NETSTAT=/usr/bin/netstat
- elif [ -x /bin/netstat ]; then
- NETSTAT=/bin/netstat
fi
for p in $wait_ports; do
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-483-g7435b87
The branch, master has been updated via 7435b877c7969a72b6b17d3ce4df87c5629882b8 (commit) from e7c09d8b105d8182e7ae3948a664169dc13198e9 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7435b877c7969a72b6b17d3ce4df87c5629882b8 Author: Günther Deschner Date: Thu Feb 5 02:53:39 2009 +0100 s3-lsa: fix the build. Guenther --- Summary of changes: librpc/gen_ndr/lsa.h |2 +- librpc/idl/lsa.idl |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h index 00fa123..03a0464 100644 --- a/librpc/gen_ndr/lsa.h +++ b/librpc/gen_ndr/lsa.h @@ -9,7 +9,7 @@ #define LSA_POLICY_ALL_ACCESS ( (STANDARD_RIGHTS_REQUIRED_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_VIEW_AUDIT_INFORMATION|LSA_POLICY_GET_PRIVATE_INFORMATION|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN|LSA_POLICY_LOOKUP_NAMES) ) #define LSA_POLICY_READ( (STANDARD_RIGHTS_READ_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_VIEW_AUDIT_INFORMATION|LSA_POLICY_GET_PRIVATE_INFORMATION) ) -#define LSA_POLICY_WRITE ( (STD_RIGHT_READ_CONTROL_ACCESS|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN) ) +#define LSA_POLICY_WRITE ( (STANDARD_RIGHTS_READ_ACCESS|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN) ) #define LSA_POLICY_EXECUTE ( (STANDARD_RIGHTS_EXECUTE_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_LOOKUP_NAMES) ) #define LSA_ENUM_TRUST_DOMAIN_MULTIPLIER ( 60 ) #define LSA_REF_DOMAIN_LIST_MULTIPLIER ( 32 ) diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl index afe613d..ea787b2 100644 --- a/librpc/idl/lsa.idl +++ b/librpc/idl/lsa.idl @@ -165,7 +165,7 @@ import "misc.idl", "security.idl"; LSA_POLICY_GET_PRIVATE_INFORMATION); const int LSA_POLICY_WRITE = - (STD_RIGHT_READ_CONTROL_ACCESS | + (STANDARD_RIGHTS_READ_ACCESS| LSA_POLICY_TRUST_ADMIN | LSA_POLICY_CREATE_ACCOUNT | LSA_POLICY_CREATE_SECRET| -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-482-ge7c09d8
The branch, master has been updated
via e7c09d8b105d8182e7ae3948a664169dc13198e9 (commit)
from ef098bd621b544a651636db4b7d6cdd777c83d18 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e7c09d8b105d8182e7ae3948a664169dc13198e9
Author: Jeremy Allison
Date: Wed Feb 4 16:33:52 2009 -0800
Fix bug #Bug 6090 renaming or deleting a "not matching/resolving" symlink
is failing.
Reported by Kukks. Make sure we correctly use LSTAT in all cases where
POSIX pathnames are being used. This matters when dealing with symlinks
pointing to invalid paths being renamed or deleted not all deletes and
renames are done via an nt_create open.
Jeremy.
---
Summary of changes:
source3/smbd/filename.c | 30 ++---
source3/smbd/open.c | 54 +-
source3/smbd/reply.c| 34 -
3 files changed, 88 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index d240ecf..003cb0f 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -126,7 +126,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
char *stream = NULL;
bool component_was_mangled = False;
bool name_has_wildcard = False;
+ bool posix_pathnames = false;
NTSTATUS result;
+ int ret = -1;
SET_STAT_INVALID(*pst);
*pp_conv_path = NULL;
@@ -225,7 +227,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
}
}
- if (!lp_posix_pathnames()) {
+ posix_pathnames = lp_posix_pathnames();
+
+ if (!posix_pathnames) {
stream = strchr_m(name, ':');
if (stream != NULL) {
@@ -268,7 +272,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
* stat the name - if it exists then we are all done!
*/
- if (SMB_VFS_STAT(conn,name,&st) == 0) {
+ if (posix_pathnames) {
+ ret = SMB_VFS_LSTAT(conn,name,&st);
+ } else {
+ ret = SMB_VFS_STAT(conn,name,&st);
+ }
+
+ if (ret == 0) {
/* Ensure we catch all names with in "/."
this is disallowed under Windows. */
const char *p = strstr(name, "/."); /* mb safe. */
@@ -380,7 +390,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
* Check if the name exists up to this point.
*/
- if (SMB_VFS_STAT(conn,name, &st) == 0) {
+ if (posix_pathnames) {
+ ret = SMB_VFS_LSTAT(conn,name, &st);
+ } else {
+ ret = SMB_VFS_STAT(conn,name, &st);
+ }
+
+ if (ret == 0) {
/*
* It exists. it must either be a directory or this must
* be the last part of the path for it to be OK.
@@ -598,7 +614,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
* if it exists. JRA.
*/
- if (SMB_VFS_STAT(conn,name, &st) == 0) {
+ if (posix_pathnames) {
+ ret = SMB_VFS_LSTAT(conn,name, &st);
+ } else {
+ ret = SMB_VFS_STAT(conn,name, &st);
+ }
+
+ if (ret == 0) {
*pst = st;
} else {
SET_STAT_INVALID(st);
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index bc51074..f7a52d7 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -432,28 +432,42 @@ static NTSTATUS open_file(files_struct *fsp,
access_mask,
&access_granted);
if (!NT_STATUS_IS_OK(status)) {
-
- /* Were we trying to do a stat open
-* for delete and didn't get DELETE
-* access (only) ? Check if the
-* directory allows DELETE_CHILD.
-* See here:
-*
http://blogs.msdn.com/oldnewthing/archive/2004/06/04/148426.aspx
-* for details. */
-
- if (!(NT_STATUS_EQUAL(status,
NT_STATUS_ACCESS_DENIED) &&
- (access_mask & DELETE_ACCESS) &&
- (access_granted ==
DELETE_ACCESS) &&
-
can_delete_file_in_directory(conn, path))) {
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-481-gef098bd
The branch, master has been updated via ef098bd621b544a651636db4b7d6cdd777c83d18 (commit) from e28a806a6b65320e5727a4237da57f879c509d26 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ef098bd621b544a651636db4b7d6cdd777c83d18 Author: Günther Deschner Date: Thu Feb 5 01:05:09 2009 +0100 s3-lsa: move remaining lsa policy access_mask defines to idl. Guenther --- Summary of changes: librpc/gen_ndr/lsa.h |4 +++ librpc/idl/lsa.idl | 37 +++ source3/include/includes.h |1 - source3/include/rpc_lsa.h | 60 4 files changed, 41 insertions(+), 61 deletions(-) delete mode 100644 source3/include/rpc_lsa.h Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h index ee8a311..00fa123 100644 --- a/librpc/gen_ndr/lsa.h +++ b/librpc/gen_ndr/lsa.h @@ -7,6 +7,10 @@ #ifndef _HEADER_lsarpc #define _HEADER_lsarpc +#define LSA_POLICY_ALL_ACCESS ( (STANDARD_RIGHTS_REQUIRED_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_VIEW_AUDIT_INFORMATION|LSA_POLICY_GET_PRIVATE_INFORMATION|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN|LSA_POLICY_LOOKUP_NAMES) ) +#define LSA_POLICY_READ( (STANDARD_RIGHTS_READ_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_VIEW_AUDIT_INFORMATION|LSA_POLICY_GET_PRIVATE_INFORMATION) ) +#define LSA_POLICY_WRITE ( (STD_RIGHT_READ_CONTROL_ACCESS|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN) ) +#define LSA_POLICY_EXECUTE ( (STANDARD_RIGHTS_EXECUTE_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_LOOKUP_NAMES) ) #define LSA_ENUM_TRUST_DOMAIN_MULTIPLIER ( 60 ) #define LSA_REF_DOMAIN_LIST_MULTIPLIER ( 32 ) #define LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER( 82 ) diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl index db5ca31..afe613d 100644 --- a/librpc/idl/lsa.idl +++ b/librpc/idl/lsa.idl @@ -143,6 +143,43 @@ import "misc.idl", "security.idl"; LSA_POLICY_LOOKUP_NAMES = 0x0800 } lsa_PolicyAccessMask; + const int LSA_POLICY_ALL_ACCESS = + (STANDARD_RIGHTS_REQUIRED_ACCESS| + LSA_POLICY_VIEW_LOCAL_INFORMATION | + LSA_POLICY_VIEW_AUDIT_INFORMATION | + LSA_POLICY_GET_PRIVATE_INFORMATION | + LSA_POLICY_TRUST_ADMIN | + LSA_POLICY_CREATE_ACCOUNT | + LSA_POLICY_CREATE_SECRET| + LSA_POLICY_CREATE_PRIVILEGE | + LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS | + LSA_POLICY_SET_AUDIT_REQUIREMENTS | + LSA_POLICY_AUDIT_LOG_ADMIN | + LSA_POLICY_SERVER_ADMIN | + LSA_POLICY_LOOKUP_NAMES); + + const int LSA_POLICY_READ = + (STANDARD_RIGHTS_READ_ACCESS| + LSA_POLICY_VIEW_LOCAL_INFORMATION | + LSA_POLICY_VIEW_AUDIT_INFORMATION | + LSA_POLICY_GET_PRIVATE_INFORMATION); + + const int LSA_POLICY_WRITE = + (STD_RIGHT_READ_CONTROL_ACCESS | + LSA_POLICY_TRUST_ADMIN | + LSA_POLICY_CREATE_ACCOUNT | + LSA_POLICY_CREATE_SECRET| + LSA_POLICY_CREATE_PRIVILEGE | + LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS | + LSA_POLICY_SET_AUDIT_REQUIREMENTS | + LSA_POLICY_AUDIT_LOG_ADMIN | + LSA_POLICY_SERVER_ADMIN); + + const int LSA_POLICY_EXECUTE = + (STANDARD_RIGHTS_EXECUTE_ACCESS | + LSA_POLICY_VIEW_LOCAL_INFORMATION | + LSA_POLICY_LOOKUP_NAMES); + /* notice the screwup with the system_name - thats why MS created OpenPolicy2 */ [public] NTSTATUS lsa_OpenPolicy ( diff --git a/source3/include/includes.h b/source3/include/includes.h index a20a17c..4aa3c07 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -619,7 +619,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "ntlmssp.h" #include "auth.h" #include "ntdomain.h" -#include "rpc_lsa.h" #include "reg_objects.h" #include "reg_db.h" #include "rpc_spoolss.h" diff --git a/source3/include/rpc_lsa.h b/sou
Build status as of Thu Feb 5 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-02-04 00:00:09.0 + +++ /home/build/master/cache/broken_results.txt 2009-02-05 00:01:04.0 + @@ -1,23 +1,23 @@ -Build status as of Wed Feb 4 00:00:02 2009 +Build status as of Thu Feb 5 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 27 6 0 +ccache 29 6 0 ctdb 0 0 0 distcc 1 0 0 -ldb 28 28 0 -libreplace 27 10 0 -lorikeet-heimdal 25 15 0 -pidl 17 2 0 -ppp 10 0 0 -rsync27 9 0 +ldb 29 29 0 +libreplace 28 11 0 +lorikeet-heimdal 26 15 0 +pidl 18 2 0 +ppp 11 0 0 +rsync29 9 0 samba-docs 0 0 0 -samba-gtk4 4 0 -samba_3_X_devel 26 23 0 -samba_3_X_test 26 22 0 -samba_4_0_test 28 25 1 -smb-build26 5 0 -talloc 28 28 0 -tdb 26 8 0 +samba-gtk5 5 0 +samba_3_X_devel 27 24 0 +samba_3_X_test 27 23 0 +samba_4_0_test 29 26 1 +smb-build27 5 0 +talloc 29 29 0 +tdb 27 9 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-480-ge28a806
The branch, master has been updated via e28a806a6b65320e5727a4237da57f879c509d26 (commit) from 542251f7ae56ea7ac54ff8807d5f04b3598b96f2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e28a806a6b65320e5727a4237da57f879c509d26 Author: Günther Deschner Date: Wed Feb 4 23:49:43 2009 +0100 s3-parsing: remove a lot of unused structures and their hand marshalling. Guenther --- Summary of changes: source3/include/proto.h| 62 --- source3/include/rpc_misc.h | 201 --- source3/rpc_parse/parse_misc.c | 1137 source3/rpc_parse/parse_prs.c | 50 -- 4 files changed, 0 insertions(+), 1450 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 88742c4..5378156 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5679,86 +5679,25 @@ uint32 size_of_relative_string(UNISTR *string); bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth); bool smb_io_nttime(const char *desc, prs_struct *ps, int depth, NTTIME *nttime); -uint32 get_enum_hnd(ENUM_HND *enh); -void init_enum_hnd(ENUM_HND *enh, uint32 hnd); -bool smb_io_enum_hnd(const char *desc, ENUM_HND *hnd, prs_struct *ps, int depth); bool smb_io_dom_sid(const char *desc, DOM_SID *sid, prs_struct *ps, int depth); -void init_dom_sid2(DOM_SID2 *sid2, const DOM_SID *sid); -bool smb_io_dom_sid2_p(const char *desc, prs_struct *ps, int depth, DOM_SID2 **sid2); -bool smb_io_dom_sid2(const char *desc, DOM_SID2 *sid, prs_struct *ps, int depth); bool smb_io_uuid(const char *desc, struct GUID *uuid, prs_struct *ps, int depth); -void init_str_hdr(STRHDR *hdr, int max_len, int len, uint32 buffer); -bool smb_io_strhdr(const char *desc, STRHDR *hdr, prs_struct *ps, int depth); -void init_uni_hdr(UNIHDR *hdr, UNISTR2 *str2); -bool smb_io_unihdr(const char *desc, UNIHDR *hdr, prs_struct *ps, int depth); -void init_buf_hdr(BUFHDR *hdr, int max_len, int len); -bool smb_io_hdrbuf_pre(const char *desc, BUFHDR *hdr, prs_struct *ps, int depth, uint32 *offset); -bool smb_io_hdrbuf_post(const char *desc, BUFHDR *hdr, prs_struct *ps, int depth, - uint32 ptr_hdrbuf, uint32 max_len, uint32 len); -bool smb_io_hdrbuf(const char *desc, BUFHDR *hdr, prs_struct *ps, int depth); void init_unistr(UNISTR *str, const char *buf); bool smb_io_unistr(const char *desc, UNISTR *uni, prs_struct *ps, int depth); -void init_rpc_blob_uint32(RPC_DATA_BLOB *str, uint32 val); -void init_rpc_blob_str(RPC_DATA_BLOB *str, const char *buf, int len); -void init_rpc_blob_hex(RPC_DATA_BLOB *str, const char *buf); -void init_rpc_blob_bytes(RPC_DATA_BLOB *str, uint8 *buf, size_t len); bool smb_io_buffer5(const char *desc, BUFFER5 *buf5, prs_struct *ps, int depth); void init_buf_unistr2(UNISTR2 *str, uint32 *ptr, const char *buf); void copy_unistr2(UNISTR2 *str, const UNISTR2 *from); -void init_string2(STRING2 *str, const char *buf, size_t max_len, size_t str_len); -bool smb_io_string2(const char *desc, STRING2 *str2, uint32 buffer, prs_struct *ps, int depth); void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes flags); -void init_unistr4(UNISTR4 *uni4, const char *buf, enum unistr2_term_codes flags); -void init_unistr4_w( TALLOC_CTX *ctx, UNISTR4 *uni4, const smb_ucs2_t *buf ); void init_unistr2_w(TALLOC_CTX *ctx, UNISTR2 *str, const smb_ucs2_t *buf); void init_unistr2_from_unistr(TALLOC_CTX *ctx, UNISTR2 *to, const UNISTR *from); void init_unistr2_from_datablob(UNISTR2 *str, DATA_BLOB *blob) ; bool prs_io_unistr2_p(const char *desc, prs_struct *ps, int depth, UNISTR2 **uni2); bool prs_io_unistr2(const char *desc, prs_struct *ps, int depth, UNISTR2 *uni2 ); bool smb_io_unistr2(const char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *ps, int depth); -bool prs_unistr4(const char *desc, prs_struct *ps, int depth, UNISTR4 *uni4); -bool prs_unistr4_hdr(const char *desc, prs_struct *ps, int depth, UNISTR4 *uni4); -bool prs_unistr4_str(const char *desc, prs_struct *ps, int depth, UNISTR4 *uni4); -bool prs_unistr4_array(const char *desc, prs_struct *ps, int depth, UNISTR4_ARRAY *array ); -bool init_unistr4_array( UNISTR4_ARRAY *array, uint32 count, const char **strings ); -void init_dom_rid(DOM_RID *prid, uint32 rid, uint16 type, uint32 idx); -bool smb_io_dom_rid(const char *desc, DOM_RID *rid, prs_struct *ps, int depth); -bool smb_io_dom_rid2(const char *desc, DOM_RID2 *rid, prs_struct *ps, int depth); -void init_dom_rid3(DOM_RID3 *rid3, uint32 rid, uint8 type); -bool smb_io_dom_rid3(const char *desc, DOM_RID3 *rid3, prs_struct *ps, int depth); -void init_dom_rid4(DOM_RID4 *rid4, uint16 unknown, uint16 attr, uint32 rid); -void init_clnt_srv(DOM_CLNT_SRV *logcln, const
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-479-g542251f
The branch, master has been updated
via 542251f7ae56ea7ac54ff8807d5f04b3598b96f2 (commit)
from 7c3ba347883bbe83184d8420484badbd9f0c8178 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 542251f7ae56ea7ac54ff8807d5f04b3598b96f2
Author: Günther Deschner
Date: Thu Feb 5 00:12:51 2009 +0100
s3: use struct netr_Credential in cred_step().
Guenther
---
Summary of changes:
source3/libsmb/credentials.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/credentials.c b/source3/libsmb/credentials.c
index 9d33e6d..9ba460f 100644
--- a/source3/libsmb/credentials.c
+++ b/source3/libsmb/credentials.c
@@ -146,7 +146,7 @@ static void creds_init_64(struct dcinfo *dc,
static void creds_step(struct dcinfo *dc)
{
- DOM_CHAL time_chal;
+ struct netr_Credential time_chal;
DEBUG(5,("\tsequence = 0x%x\n", (unsigned int)dc->sequence ));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-478-g7c3ba34
The branch, master has been updated
via 7c3ba347883bbe83184d8420484badbd9f0c8178 (commit)
from 0016c57ca147566b93d8233adfae2060331e0527 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7c3ba347883bbe83184d8420484badbd9f0c8178
Author: Günther Deschner
Date: Thu Feb 5 00:19:39 2009 +0100
s3: use samr_RidWithAttribute instead of DOM_GID.
Guenther
---
Summary of changes:
source3/rpc_client/init_netlogon.c | 18 ++
source3/utils/net_rpc.c|2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_client/init_netlogon.c
b/source3/rpc_client/init_netlogon.c
index 6f7a541..793b9c7 100644
--- a/source3/rpc_client/init_netlogon.c
+++ b/source3/rpc_client/init_netlogon.c
@@ -144,7 +144,8 @@ static NTSTATUS nt_token_to_group_list(TALLOC_CTX *mem_ctx,
const DOM_SID *domain_sid,
size_t num_sids,
const DOM_SID *sids,
- int *numgroups, DOM_GID **pgids)
+ int *numgroups,
+ struct samr_RidWithAttribute **pgids)
{
int i;
@@ -152,13 +153,14 @@ static NTSTATUS nt_token_to_group_list(TALLOC_CTX
*mem_ctx,
*pgids = NULL;
for (i=0; i
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3427-g52e48c1
The branch, v3-2-test has been updated
via 52e48c12cf2a56d31a2404ab142d6678b430a85a (commit)
from 16e9f1e2d4a1d391efdf8348fa7f57b2640a6bdb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 52e48c12cf2a56d31a2404ab142d6678b430a85a
Author: Günther Deschner
Date: Wed Feb 4 23:55:54 2009 +0100
s3-net: remove unused ENUM_HND.
Guenther
(cherry picked from commit a713060a6e36706cfd5b997aa4cbfabf4e180c84)
---
Summary of changes:
source/utils/net_rpc.c |3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index d4d11de..0476394 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -4606,7 +4606,6 @@ static NTSTATUS rpc_share_allowedusers_internals(const
DOM_SID *domain_sid,
{
int ret;
bool r;
- ENUM_HND hnd;
uint32 i;
FILE *f;
@@ -4644,8 +4643,6 @@ static NTSTATUS rpc_share_allowedusers_internals(const
DOM_SID *domain_sid,
for (i=0; i
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4906-ga713060
The branch, v3-3-test has been updated
via a713060a6e36706cfd5b997aa4cbfabf4e180c84 (commit)
from 249dab1abbf49b0ca45360eb9aedb20d51a80e5f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit a713060a6e36706cfd5b997aa4cbfabf4e180c84
Author: Günther Deschner
Date: Wed Feb 4 23:55:54 2009 +0100
s3-net: remove unused ENUM_HND.
Guenther
---
Summary of changes:
source/utils/net_rpc.c |3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 3f572f0..2679d04 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -4378,7 +4378,6 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
{
int ret;
bool r;
- ENUM_HND hnd;
uint32 i;
FILE *f;
@@ -4411,8 +4410,6 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
for (i=0; i
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-477-g0016c57
The branch, master has been updated
via 0016c57ca147566b93d8233adfae2060331e0527 (commit)
from 8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0016c57ca147566b93d8233adfae2060331e0527
Author: Günther Deschner
Date: Wed Feb 4 23:55:54 2009 +0100
s3-net: remove unused ENUM_HND.
Guenther
---
Summary of changes:
source3/utils/net_rpc.c |3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 714d794..e6b46ce 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4377,7 +4377,6 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
{
int ret;
bool r;
- ENUM_HND hnd;
uint32 i;
FILE *f;
@@ -4410,8 +4409,6 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
for (i=0; i
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4905-g249dab1
The branch, v3-3-test has been updated
via 249dab1abbf49b0ca45360eb9aedb20d51a80e5f (commit)
from 2937519665be41237ee0f2c3374bea716bf95e8a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 249dab1abbf49b0ca45360eb9aedb20d51a80e5f
Author: Jeremy Allison
Date: Wed Feb 4 15:35:02 2009 -0800
Fix bug #Bug 6090 renaming or deleting a "not matching/resolving" symlink
is failing.
Reported by Kukks. Make sure we correctly use LSTAT in all cases where
POSIX pathnames are being used. This matters when dealing with symlinks
pointing to invalid paths being renamed or deleted not all deletes and
renames are done via an nt_create open.
Jeremy.
---
Summary of changes:
source/smbd/filename.c | 30 --
source/smbd/open.c | 54 +
source/smbd/reply.c| 76 +++
3 files changed, 116 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/filename.c b/source/smbd/filename.c
index d240ecf..003cb0f 100644
--- a/source/smbd/filename.c
+++ b/source/smbd/filename.c
@@ -126,7 +126,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
char *stream = NULL;
bool component_was_mangled = False;
bool name_has_wildcard = False;
+ bool posix_pathnames = false;
NTSTATUS result;
+ int ret = -1;
SET_STAT_INVALID(*pst);
*pp_conv_path = NULL;
@@ -225,7 +227,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
}
}
- if (!lp_posix_pathnames()) {
+ posix_pathnames = lp_posix_pathnames();
+
+ if (!posix_pathnames) {
stream = strchr_m(name, ':');
if (stream != NULL) {
@@ -268,7 +272,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
* stat the name - if it exists then we are all done!
*/
- if (SMB_VFS_STAT(conn,name,&st) == 0) {
+ if (posix_pathnames) {
+ ret = SMB_VFS_LSTAT(conn,name,&st);
+ } else {
+ ret = SMB_VFS_STAT(conn,name,&st);
+ }
+
+ if (ret == 0) {
/* Ensure we catch all names with in "/."
this is disallowed under Windows. */
const char *p = strstr(name, "/."); /* mb safe. */
@@ -380,7 +390,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
* Check if the name exists up to this point.
*/
- if (SMB_VFS_STAT(conn,name, &st) == 0) {
+ if (posix_pathnames) {
+ ret = SMB_VFS_LSTAT(conn,name, &st);
+ } else {
+ ret = SMB_VFS_STAT(conn,name, &st);
+ }
+
+ if (ret == 0) {
/*
* It exists. it must either be a directory or this must
* be the last part of the path for it to be OK.
@@ -598,7 +614,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
* if it exists. JRA.
*/
- if (SMB_VFS_STAT(conn,name, &st) == 0) {
+ if (posix_pathnames) {
+ ret = SMB_VFS_LSTAT(conn,name, &st);
+ } else {
+ ret = SMB_VFS_STAT(conn,name, &st);
+ }
+
+ if (ret == 0) {
*pst = st;
} else {
SET_STAT_INVALID(st);
diff --git a/source/smbd/open.c b/source/smbd/open.c
index 7e127ea..716b9ff 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -415,28 +415,42 @@ static NTSTATUS open_file(files_struct *fsp,
access_mask,
&access_granted);
if (!NT_STATUS_IS_OK(status)) {
-
- /* Were we trying to do a stat open
-* for delete and didn't get DELETE
-* access (only) ? Check if the
-* directory allows DELETE_CHILD.
-* See here:
-*
http://blogs.msdn.com/oldnewthing/archive/2004/06/04/148426.aspx
-* for details. */
-
- if (!(NT_STATUS_EQUAL(status,
NT_STATUS_ACCESS_DENIED) &&
- (access_mask & DELETE_ACCESS) &&
- (access_granted ==
DELETE_ACCESS) &&
-
can_delete_file_in_directory(conn, path))) {
-
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-476-g8450e66
The branch, master has been updated via 8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1 (commit) via a63d4c5ed1d6fc6dd253d5bf99edbef7d9d0341b (commit) via d7e2384dba448753580c698cb3b460ba8849ccb9 (commit) via 8b126e942d5251cc7be08634dd73a598f8a834eb (commit) via abb4faf813dcc70435d4b47c94c50e0da004fa4f (commit) via 96fd6b5a01cbc9f91ea818943e28036fba7cd248 (commit) via 58ded409abe336b9bcf048912c884f0deec281dc (commit) via 7ade5cf776a4aa04ae578cfeb46a54bfde53700f (commit) from 858116d54e61f2d86757aecce3afba147434c7fc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1 Author: Günther Deschner Date: Wed Feb 4 21:50:51 2009 +0100 s3-eventlog: w00t! remove last traces of old eventlog rpc marshalling. spoolss, I'm coming! Guenther commit a63d4c5ed1d6fc6dd253d5bf99edbef7d9d0341b Author: Günther Deschner Date: Wed Feb 4 21:49:06 2009 +0100 s3-eventlog: remove old eventlog server. Guenther commit d7e2384dba448753580c698cb3b460ba8849ccb9 Author: Günther Deschner Date: Wed Feb 4 21:42:32 2009 +0100 s3-eventlog: remove fixup_eventlog_entry. Guenther commit 8b126e942d5251cc7be08634dd73a598f8a834eb Author: Günther Deschner Date: Tue Feb 3 14:14:39 2009 +0100 s3-eventlog: remove write_eventlog_tdb. Guenther commit abb4faf813dcc70435d4b47c94c50e0da004fa4f Author: Günther Deschner Date: Wed Feb 4 21:35:29 2009 +0100 s3-eventlog: remove add_record_to_resp. Guenther commit 96fd6b5a01cbc9f91ea818943e28036fba7cd248 Author: Günther Deschner Date: Wed Feb 4 21:34:35 2009 +0100 s3-eventlog: remove read_package_entry. Guenther commit 58ded409abe336b9bcf048912c884f0deec281dc Author: Günther Deschner Date: Wed Feb 4 21:33:58 2009 +0100 s3-eventlog: remove get_eventlog_record. Guenther commit 7ade5cf776a4aa04ae578cfeb46a54bfde53700f Author: Günther Deschner Date: Wed Feb 4 21:32:20 2009 +0100 s3-eventlog: remove old hand marshalling for eventlog read call. Guenther --- Summary of changes: source3/Makefile.in |4 +- source3/configure.in |4 +- source3/include/includes.h|1 - source3/include/proto.h | 21 --- source3/include/rpc_eventlog.h| 100 - source3/rpc_parse/parse_eventlog.c| 210 --- source3/rpc_server/srv_eventlog.c | 99 - source3/rpc_server/srv_eventlog_lib.c | 142 -- source3/rpc_server/srv_eventlog_nt.c | 252 - 9 files changed, 4 insertions(+), 829 deletions(-) delete mode 100644 source3/include/rpc_eventlog.h delete mode 100644 source3/rpc_parse/parse_eventlog.c delete mode 100644 source3/rpc_server/srv_eventlog.c Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index c4a6317..c1b51db 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -566,7 +566,7 @@ RPC_DFS_OBJ = ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o -RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \ +RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \ $(LIB_EVENTLOG_OBJ) ../librpc/gen_ndr/srv_eventlog.o RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \ @@ -578,7 +578,7 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \ rpc_parse/parse_spoolss.o \ - rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o + rpc_parse/parse_buffer.o RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o \ rpc_client/rpc_transport_sock.o rpc_client/rpc_transport_smbd.o diff --git a/source3/configure.in b/source3/configure.in index 1a25de8..306566f 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -414,7 +414,7 @@ AC_SUBST(DYNEXP) dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template" +default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template" dnl These are prefe
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-468-g858116d
The branch, master has been updated
via 858116d54e61f2d86757aecce3afba147434c7fc (commit)
via 64e3a90530e4231fc9725652535a4881b149228a (commit)
via c464b5ebc07a27d7ab01629f87fc053dd90882ed (commit)
from 94d1dbbaf01acff05dc0237470268ec85d02fdbb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 858116d54e61f2d86757aecce3afba147434c7fc
Author: Günther Deschner
Date: Fri Jan 16 18:04:11 2009 +0100
s4-smbtorture: in eventlog readlog test, print all records in a buffer.
Guenther
commit 64e3a90530e4231fc9725652535a4881b149228a
Author: Günther Deschner
Date: Tue Feb 3 20:48:43 2009 +0100
s3-eventlog: make can_write_to_eventlog static.
Guenther
commit c464b5ebc07a27d7ab01629f87fc053dd90882ed
Author: Günther Deschner
Date: Fri Jan 16 12:18:21 2009 +0100
s3-rpcclient: fix eventlog read client to read an array of entries.
Guenther
---
Summary of changes:
source3/include/proto.h |1 -
source3/rpc_server/srv_eventlog_lib.c |2 +-
source3/rpcclient/cmd_eventlog.c | 67
source4/torture/rpc/eventlog.c| 35 +
4 files changed, 77 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 68c4c8b..5cef54f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6257,7 +6257,6 @@ TDB_CONTEXT *elog_init_tdb( char *tdbfilename );
char *elog_tdbname(TALLOC_CTX *ctx, const char *name );
int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention );
bool prune_eventlog( TDB_CONTEXT * tdb );
-bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32 needed );
ELOG_TDB *elog_open_tdb( const char *logname, bool force_clear, bool read_only
);
int elog_close_tdb( ELOG_TDB *etdb, bool force_close );
int write_eventlog_tdb( TDB_CONTEXT * the_tdb, Eventlog_entry * ee );
diff --git a/source3/rpc_server/srv_eventlog_lib.c
b/source3/rpc_server/srv_eventlog_lib.c
index d894ab0..c5d2ad7 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -270,7 +270,7 @@ bool prune_eventlog( TDB_CONTEXT * tdb )
/
/
-bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32_t needed )
+static bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32_t needed )
{
int calcd_size;
int MaxSize, Retention;
diff --git a/source3/rpcclient/cmd_eventlog.c b/source3/rpcclient/cmd_eventlog.c
index 905b147..e212452 100644
--- a/source3/rpcclient/cmd_eventlog.c
+++ b/source3/rpcclient/cmd_eventlog.c
@@ -55,7 +55,7 @@ static NTSTATUS cmd_eventlog_readlog(struct rpc_pipe_client
*cli,
int argc,
const char **argv)
{
- NTSTATUS status;
+ NTSTATUS status = NT_STATUS_OK;
struct policy_handle handle;
uint32_t flags = EVENTLOG_BACKWARDS_READ |
@@ -67,7 +67,7 @@ static NTSTATUS cmd_eventlog_readlog(struct rpc_pipe_client
*cli,
uint32_t real_size = 0;
if (argc < 2 || argc > 4) {
- printf("Usage: %s logname [offset]\n", argv[0]);
+ printf("Usage: %s logname [offset] [number_of_bytes]\n",
argv[0]);
return NT_STATUS_OK;
}
@@ -75,12 +75,27 @@ static NTSTATUS cmd_eventlog_readlog(struct rpc_pipe_client
*cli,
offset = atoi(argv[2]);
}
+ if (argc >= 4) {
+ number_of_bytes = atoi(argv[3]);
+ data = talloc_array(mem_ctx, uint8_t, number_of_bytes);
+ if (!data) {
+ goto done;
+ }
+ }
+
status = get_eventlog_handle(cli, mem_ctx, argv[1], &handle);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- while (1) {
+ do {
+
+ enum ndr_err_code ndr_err;
+ DATA_BLOB blob;
+ struct EVENTLOGRECORD r;
+ uint32_t size = 0;
+ uint32_t pos = 0;
+
status = rpccli_eventlog_ReadEventLogW(cli, mem_ctx,
&handle,
flags,
@@ -93,35 +108,53 @@ static NTSTATUS cmd_eventlog_readlog(struct
rpc_pipe_client *cli,
real_size > 0 ) {
number_of_bytes = real_size;
data = talloc_array(mem_ctx, uint8_t, real_size);
- continue;
+ if (!data) {
+ goto done;
+ }
+ status = rpccli_eventlog
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-465-g94d1dbb
The branch, master has been updated
via 94d1dbbaf01acff05dc0237470268ec85d02fdbb (commit)
from f24eecffde12937103dfce9bf91a69742eb75b29 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 94d1dbbaf01acff05dc0237470268ec85d02fdbb
Author: Volker Lendecke
Date: Wed Feb 4 22:35:23 2009 +0100
Restore correct handling of "is_data_available" for the socket transport
This fixes a valgrind error reading an uninitialized variable
---
Summary of changes:
source3/rpc_server/srv_pipe_hnd.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_pipe_hnd.c
b/source3/rpc_server/srv_pipe_hnd.c
index fa38176..30d0cf4 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1221,6 +1221,7 @@ NTSTATUS np_write_recv(struct async_req *req, ssize_t
*pnwritten)
struct np_read_state {
ssize_t nread;
bool is_data_outstanding;
+ int fd;
};
static void np_read_done(struct async_req *subreq);
@@ -1255,6 +1256,7 @@ struct async_req *np_read_send(TALLOC_CTX *mem_ctx,
struct event_context *ev,
handle->private_data, struct np_proxy_state);
state->nread = len;
+ state->fd = p->fd;
subreq = recvall_send(state, ev, p->fd, data, len, 0);
if (subreq == NULL) {
@@ -1279,13 +1281,24 @@ static void np_read_done(struct async_req *subreq)
{
struct async_req *req = talloc_get_type_abort(
subreq->async.priv, struct async_req);
+ struct np_read_state *state = talloc_get_type_abort(
+ req->private_data, struct np_read_state);
NTSTATUS status;
+ int available = 0;
status = recvall_recv(subreq);
if (!NT_STATUS_IS_OK(status)) {
async_req_nterror(req, status);
return;
}
+
+ /*
+* We don't look at the ioctl result. We don't really care if there is
+* data available, because this is racy anyway.
+*/
+ ioctl(state->fd, FIONREAD, &available);
+ state->is_data_outstanding = (available > 0);
+
async_req_done(req);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-464-gf24eecf
The branch, master has been updated
via f24eecffde12937103dfce9bf91a69742eb75b29 (commit)
via 456bd5ad08d754691706f955970cddba3846c3a7 (commit)
from 63a992168db48568c91fe622e81141ca00c9bc45 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f24eecffde12937103dfce9bf91a69742eb75b29
Author: Günther Deschner
Date: Fri Jan 16 12:48:11 2009 +0100
s3-eventlog: add my copyright.
Guenther
commit 456bd5ad08d754691706f955970cddba3846c3a7
Author: Günther Deschner
Date: Thu Jan 15 20:10:09 2009 +0100
s3-eventlog: use pidl for _eventlog_ReadEventLogW.
Guenther
---
Summary of changes:
source3/rpc_server/srv_eventlog.c | 22 +--
source3/rpc_server/srv_eventlog_lib.c |1 +
source3/rpc_server/srv_eventlog_nt.c | 124 ++---
3 files changed, 71 insertions(+), 76 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_eventlog.c
b/source3/rpc_server/srv_eventlog.c
index 39e3115..dd00a24 100644
--- a/source3/rpc_server/srv_eventlog.c
+++ b/source3/rpc_server/srv_eventlog.c
@@ -63,27 +63,7 @@ static bool api_eventlog_get_oldest_entry(pipes_struct *p)
static bool api_eventlog_read_eventlog(pipes_struct *p)
{
- EVENTLOG_Q_READ_EVENTLOG q_u;
- EVENTLOG_R_READ_EVENTLOG r_u;
- prs_struct *data = &p->in_data.data;
- prs_struct *rdata = &p->out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- if (!(eventlog_io_q_read_eventlog("", &q_u, data, 0))) {
- DEBUG(0, ("eventlog_io_q_read_eventlog: unable to unmarshall
EVENTLOG_Q_READ_EVENTLOG.\n"));
- return False;
- }
-
- r_u.status = _eventlog_read_eventlog(p, &q_u, &r_u);
-
- if (!(eventlog_io_r_read_eventlog("", &q_u, &r_u, rdata, 0))) {
- DEBUG(0, ("eventlog_io_r_read_eventlog: unable to marshall
EVENTLOG_R_READ_EVENTLOG.\n"));
- return False;
- }
-
- return True;
+ return proxy_eventlog_call(p, NDR_EVENTLOG_READEVENTLOGW);
}
static bool api_eventlog_clear_eventlog(pipes_struct *p)
diff --git a/source3/rpc_server/srv_eventlog_lib.c
b/source3/rpc_server/srv_eventlog_lib.c
index 2c70141..d894ab0 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -4,6 +4,7 @@
* Copyright (C) Marcin Krzysztof Porwit2005,
* Copyright (C) Brian Moran2005.
* Copyright (C) Gerald (Jerry) Carter 2005.
+ * Copyright (C) Guenther Deschner 2009.
*
* 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
diff --git a/source3/rpc_server/srv_eventlog_nt.c
b/source3/rpc_server/srv_eventlog_nt.c
index 990b03a..b4f7afc 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -4,6 +4,7 @@
* Copyright (C) Marcin Krzysztof Porwit2005,
* Copyright (C) Brian Moran2005,
* Copyright (C) Gerald (Jerry) Carter 2005.
+ * Copyright (C) Guenther Deschner 2009.
*
* 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
@@ -706,98 +707,117 @@ NTSTATUS _eventlog_CloseEventLog(pipes_struct * p,
}
/
+ _eventlog_ReadEventLogW
/
-NTSTATUS _eventlog_read_eventlog( pipes_struct * p,
- EVENTLOG_Q_READ_EVENTLOG * q_u,
- EVENTLOG_R_READ_EVENTLOG * r_u )
+NTSTATUS _eventlog_ReadEventLogW(pipes_struct *p,
+struct eventlog_ReadEventLogW *r)
{
- EVENTLOG_INFO *info = find_eventlog_info_by_hnd( p, &q_u->handle );
- Eventlog_entry *entry = NULL, *ee_new = NULL;
- uint32 num_records_read = 0;
+ EVENTLOG_INFO *info = find_eventlog_info_by_hnd( p, r->in.handle );
+ uint32_t num_records_read = 0;
int bytes_left, record_number;
- uint32 elog_read_type, elog_read_dir;
+ uint32_t elog_read_type, elog_read_dir;
- if (info == NULL) {
+ if (!info) {
return NT_STATUS_INVALID_HANDLE;
}
- info->flags = q_u->flags;
+ info->flags = r->in.flags;
+ bytes_left = r->in.number_of_bytes;
- bytes_left = q_u->max_read_size;
-
- if ( !info->etdb )
+ if (!info->etdb) {
return NT_STATUS_ACCESS_DENIED;
+ }
/* check for valid flags. Can't use the sequential and seek flags
together */
- elog_read_type = q_u->flags &
(EVENTLOG_SEQUENTIAL_READ|EVENTLOG_SEEK_READ);
-
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-462-g63a9921
The branch, master has been updated
via 63a992168db48568c91fe622e81141ca00c9bc45 (commit)
via 1b71fa5c59f3af4f096a640839c7d48b20b2266a (commit)
from 0126dba7efb6d8fea2565f21cffa1e85569da81e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 63a992168db48568c91fe622e81141ca00c9bc45
Author: Günther Deschner
Date: Tue Feb 3 13:08:44 2009 +0100
s3-eventlog: add evlog_push_record function.
Guenther
commit 1b71fa5c59f3af4f096a640839c7d48b20b2266a
Author: Günther Deschner
Date: Tue Feb 3 13:09:59 2009 +0100
s3-eventlog: add evlog_pull_record function.
Guenther
---
Summary of changes:
source3/include/proto.h |7
source3/rpc_server/srv_eventlog_lib.c | 61 +
2 files changed, 68 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3ae2448..68c4c8b 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6271,6 +6271,13 @@ NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx,
TDB_CONTEXT *tdb,
struct eventlog_Record_tdb *r,
uint32_t *record_number);
+NTSTATUS evlog_push_record(TALLOC_CTX *mem_ctx,
+ TDB_CONTEXT *tdb,
+ struct EVENTLOGRECORD *r,
+ uint32_t *record_number);
+struct EVENTLOGRECORD *evlog_pull_record(TALLOC_CTX *mem_ctx,
+TDB_CONTEXT *tdb,
+uint32_t record_number);
NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx,
const struct EVENTLOGRECORD *e,
struct eventlog_Record_tdb *t);
diff --git a/source3/rpc_server/srv_eventlog_lib.c
b/source3/rpc_server/srv_eventlog_lib.c
index fdd3db9..2c70141 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -832,6 +832,39 @@ struct eventlog_Record_tdb
*evlog_pull_record_tdb(TALLOC_CTX *mem_ctx,
}
/
+ /
+
+struct EVENTLOGRECORD *evlog_pull_record(TALLOC_CTX *mem_ctx,
+TDB_CONTEXT *tdb,
+uint32_t record_number)
+{
+ struct eventlog_Record_tdb *t;
+ struct EVENTLOGRECORD *r;
+ NTSTATUS status;
+
+ r = talloc_zero(mem_ctx, struct EVENTLOGRECORD);
+ if (!r) {
+ return NULL;
+ }
+
+ t = evlog_pull_record_tdb(r, tdb, record_number);
+ if (!t) {
+ talloc_free(r);
+ return NULL;
+ }
+
+ status = evlog_tdb_entry_to_evt_entry(r, t, r);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(r);
+ return NULL;
+ }
+
+ r->Length = r->Length2 = ndr_size_EVENTLOGRECORD(r, NULL, 0);
+
+ return r;
+}
+
+/
write an eventlog entry. Note that we have to lock, read next
eventlog, increment, write, write the record, unlock
@@ -908,6 +941,34 @@ NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx,
/
/
+NTSTATUS evlog_push_record(TALLOC_CTX *mem_ctx,
+ TDB_CONTEXT *tdb,
+ struct EVENTLOGRECORD *r,
+ uint32_t *record_number)
+{
+ struct eventlog_Record_tdb *t;
+ NTSTATUS status;
+
+ t = talloc_zero(mem_ctx, struct eventlog_Record_tdb);
+ if (!t) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ status = evlog_evt_entry_to_tdb_entry(t, r, t);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(t);
+ return status;
+ }
+
+ status = evlog_push_record_tdb(mem_ctx, tdb, t, record_number);
+ talloc_free(t);
+
+ return status;
+}
+
+/
+ /
+
NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx,
const struct EVENTLOGRECORD *e,
struct eventlog_Record_tdb *t)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-460-g0126dba
The branch, master has been updated
via 0126dba7efb6d8fea2565f21cffa1e85569da81e (commit)
via c0cf20a49e34eec76422e79d463eb780c5c53e96 (commit)
via 21d23bf7e893aa8afc128af419135f4d37b080f9 (commit)
from 65200328eea3ab2179796ecf88a7ef276f8e2c9c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0126dba7efb6d8fea2565f21cffa1e85569da81e
Author: Günther Deschner
Date: Thu Jan 29 15:33:20 2009 +0100
s3-net: add "net eventlog export".
This allows to export our tdb eventlog representation into a native
win32 *.evt eventlog file.
Guenther
commit c0cf20a49e34eec76422e79d463eb780c5c53e96
Author: Günther Deschner
Date: Mon Jan 26 16:41:46 2009 +0100
s3-net: add "net eventlog import".
This allows to import a native (non-wrapped) win32 *.evt eventlog file
into our tdb eventlog representation.
Guenther
commit 21d23bf7e893aa8afc128af419135f4d37b080f9
Author: Günther Deschner
Date: Fri Jan 23 15:00:17 2009 +0100
s3-net: add "net eventlog dump".
This allows to dump a native (non-wrapped) win32 *.evt eventlog file.
Guenther
---
Summary of changes:
source3/Makefile.in | 11 +-
source3/utils/net.c |8 +
source3/utils/net_eventlog.c | 313 ++
source3/utils/net_proto.h|3 +
4 files changed, 331 insertions(+), 4 deletions(-)
create mode 100644 source3/utils/net_eventlog.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 992df5e..c4a6317 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -530,6 +530,7 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
registry/reg_perfcount.o \
registry/reg_util_legacy.o
+LIB_EVENTLOG_OBJ = rpc_server/srv_eventlog_lib.o
RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o ../librpc/gen_ndr/srv_lsa.o
@@ -566,7 +567,7 @@ RPC_DFS_OBJ = ../librpc/gen_ndr/srv_dfs.o
rpc_server/srv_dfs_nt.o
RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \
- rpc_server/srv_eventlog_lib.o
../librpc/gen_ndr/srv_eventlog.o
+ $(LIB_EVENTLOG_OBJ) ../librpc/gen_ndr/srv_eventlog.o
RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \
rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o
@@ -896,7 +897,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
$(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
utils/net_conf.o utils/net_join.o utils/net_user.o \
utils/net_group.o utils/net_file.o utils/net_registry.o \
- auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_lua.o
+ auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_lua.o \
+ utils/net_eventlog.o
# these are not processed by make proto
NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
@@ -914,7 +916,8 @@ NET_OBJ = $(NET_OBJ1) \
$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
$(LIBSMBCONF_OBJ) \
@LIBWBCLIENT_STATIC@ \
- $(PRIVILEGES_BASIC_OBJ) @LIBLUA_STATIC@
+ $(PRIVILEGES_BASIC_OBJ) @LIBLUA_STATIC@ \
+ $(LIB_EVENTLOG_OBJ)
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
@@ -983,7 +986,7 @@ EVTLOGADM_OBJ0 = utils/eventlogadm.o
EVTLOGADM_OBJ = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSAMBA_OBJ) \
- registry/reg_eventlog.o rpc_server/srv_eventlog_lib.o \
+ registry/reg_eventlog.o $(LIB_EVENTLOG_OBJ) \
../librpc/gen_ndr/ndr_eventlog.o \
../librpc/gen_ndr/ndr_lsa.o
diff --git a/source3/utils/net.c b/source3/utils/net.c
index c9525ab..d483198 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -589,6 +589,14 @@ static struct functable net_func[] = {
" Use 'net help lua' to get more information about 'net "
"lua' commands."
},
+ { "eventlog",
+ net_eventlog,
+ NET_TRANSPORT_LOCAL,
+ "Dump Win32 *.evt eventlog files",
+ " Use 'net help eventlog' to get more information about 'net "
+ "eventlog' commands."
+ },
+
#ifdef WITH_FAKE_KASERVER
{ "afs",
net_afs,
diff --git a/source3/utils/net_eventlog.c b/source3/utils/net_eventlog.c
new file mode 100644
index 000..197a7cd
--- /dev/null
+++ b/source3/utils/net_eventlog.c
@@ -0,0 +1,313 @@
+/*
+ * Samba Unix/Linux SMB client library
+ * Distributed SMB/CIFS Server Management Utility
+ * Local win32 eventlog interface
+ *
+ * Copyright (C) Guenther Deschner
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-457-g6520032
The branch, master has been updated
via 65200328eea3ab2179796ecf88a7ef276f8e2c9c (commit)
via df5e231a6fad8c913881432294432e8feef6ea9f (commit)
from 9b3cce096ceca8b7d72456cbc6f0a725ad55d46c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 65200328eea3ab2179796ecf88a7ef276f8e2c9c
Author: Günther Deschner
Date: Wed Feb 4 18:31:04 2009 +0100
s3-eventlog: add evlog_tdb_entry_to_evt_entry.
Guenther
commit df5e231a6fad8c913881432294432e8feef6ea9f
Author: Günther Deschner
Date: Thu Jan 29 15:11:39 2009 +0100
s3-eventlog: add evlog_evt_entry_to_tdb_entry.
Guenther
---
Summary of changes:
source3/include/proto.h |6 ++
source3/rpc_server/srv_eventlog_lib.c | 126 +
2 files changed, 132 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9f0caa2..3ae2448 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6271,6 +6271,12 @@ NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx,
TDB_CONTEXT *tdb,
struct eventlog_Record_tdb *r,
uint32_t *record_number);
+NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx,
+ const struct EVENTLOGRECORD *e,
+ struct eventlog_Record_tdb *t);
+NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx,
+ const struct eventlog_Record_tdb *t,
+ struct EVENTLOGRECORD *e);
/* The following definitions come from rpc_server/srv_eventlog_nt.c */
diff --git a/source3/rpc_server/srv_eventlog_lib.c
b/source3/rpc_server/srv_eventlog_lib.c
index 85200d5..fdd3db9 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -904,3 +904,129 @@ NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
+
+/
+ /
+
+NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx,
+ const struct EVENTLOGRECORD *e,
+ struct eventlog_Record_tdb *t)
+{
+ uint32_t i;
+
+ ZERO_STRUCTP(t);
+
+ t->size = e->Length;
+ t->reserved = e->Reserved;
+ t->record_number= e->RecordNumber;
+ t->time_generated = e->TimeGenerated;
+ t->time_written = e->TimeWritten;
+ t->event_id = e->EventID;
+ t->event_type = e->EventType;
+ t->num_of_strings = e->NumStrings;
+ t->event_category = e->EventCategory;
+ t->reserved_flags = e->ReservedFlags;
+ t->closing_record_number= e->ClosingRecordNumber;
+
+ t->stringoffset = e->StringOffset;
+ t->sid_length = e->UserSidLength;
+ t->sid_offset = e->UserSidOffset;
+ t->data_length = e->DataLength;
+ t->data_offset = e->DataOffset;
+
+ t->source_name_len = 2 * strlen_m_term(e->SourceName);
+ t->source_name = talloc_strdup(mem_ctx, e->SourceName);
+ NT_STATUS_HAVE_NO_MEMORY(t->source_name);
+
+ t->computer_name_len= 2 * strlen_m_term(e->Computername);
+ t->computer_name= talloc_strdup(mem_ctx,
e->Computername);
+ NT_STATUS_HAVE_NO_MEMORY(t->computer_name);
+
+ /* t->sid_padding; */
+ if (e->UserSidLength > 0) {
+ const char *sid_str = NULL;
+ smb_ucs2_t *dummy = NULL;
+ sid_str = sid_string_talloc(mem_ctx, &e->UserSid);
+ t->sid_length = rpcstr_push_talloc(mem_ctx, &dummy, sid_str);
+ if (t->sid_length == -1) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ t->sid = data_blob_talloc(mem_ctx, (uint8_t *)dummy,
t->sid_length);
+ NT_STATUS_HAVE_NO_MEMORY(t->sid.data);
+ }
+
+ t->strings = talloc_array(mem_ctx, const char *,
e->NumStrings);
+ for (i=0; i < e->NumStrings; i++) {
+ t->strings[i] = talloc_strdup(t->strings,
e->Strings[i]);
+ NT_STATUS_HAVE_NO_MEMORY(t->strings[i]);
+ }
+
+ t->strings_len = 2 * ndr_size_string_array(t->strings,
t->num_of_strings, LIBNDR_FLAG_STR_NULLTERM);
+ t->data
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-455-g9b3cce09
The branch, master has been updated
via 9b3cce096ceca8b7d72456cbc6f0a725ad55d46c (commit)
via 8eb562a81db03bac3e4bb469eaa45e0969be924e (commit)
from de7f0a70c8293f1b87f9c821f16fd3c6f7b184b7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9b3cce096ceca8b7d72456cbc6f0a725ad55d46c
Author: Volker Lendecke
Date: Wed Feb 4 18:10:28 2009 +0100
Fix a valgrind error: rpc_bind talloc_move()s the auth struct
commit 8eb562a81db03bac3e4bb469eaa45e0969be924e
Author: Volker Lendecke
Date: Wed Feb 4 18:09:48 2009 +0100
Ensure null termination of the password in mymachinepw, remove a debug
---
Summary of changes:
source3/auth/auth_netlogond.c |6 +-
1 files changed, 1 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index a57f3b7..c39dd8c 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -134,8 +134,6 @@ static char *mymachinepw(TALLOC_CTX *mem_ctx)
return NULL;
}
- pwd[sizeof(pwd)-1] = '\0';
-
nread = read(fd, pwd, sizeof(pwd)-1);
close(fd);
@@ -144,7 +142,7 @@ static char *mymachinepw(TALLOC_CTX *mem_ctx)
return NULL;
}
- DEBUG(0, ("pwd: %d [%s]\n", (int)nread, pwd));
+ pwd[nread] = '\0';
if (pwd[nread-1] == '\n') {
pwd[nread-1] = '\0';
@@ -238,8 +236,6 @@ static NTSTATUS check_netlogond_security(const struct
auth_context *auth_context
goto done;
}
- TALLOC_FREE(auth);
-
plaintext_machinepw = mymachinepw(talloc_tos());
if (plaintext_machinepw == NULL) {
status = NT_STATUS_NO_MEMORY;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-453-gde7f0a7
The branch, master has been updated
via de7f0a70c8293f1b87f9c821f16fd3c6f7b184b7 (commit)
via 16f83ae75003107084c50b8e45d1922889158d80 (commit)
via dd306249f23cacc01d6e6ea375450714109ebaa7 (commit)
from 5e637e0afa01e227f2aa9e042da2f15b4d807083 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit de7f0a70c8293f1b87f9c821f16fd3c6f7b184b7
Author: Günther Deschner
Date: Mon Feb 2 17:24:28 2009 +0100
s3-eventlogadm: use struct eventlog_Record_tdb for storing entries in tdbs.
Guenther
commit 16f83ae75003107084c50b8e45d1922889158d80
Author: Günther Deschner
Date: Wed Feb 4 10:01:38 2009 +0100
s3-eventlog: add fixup_eventlog_record_tdb.
Guenther
commit dd306249f23cacc01d6e6ea375450714109ebaa7
Author: Günther Deschner
Date: Wed Jan 21 19:36:19 2009 +0100
s3-eventlog: add evlog_push_record_tdb function.
This is almost a copy of write_eventlog_tdb() and still needs to be modified
to use tdb transactions.
Guenther
---
Summary of changes:
source3/include/proto.h |7 +-
source3/rpc_server/srv_eventlog_lib.c | 207 -
source3/utils/eventlogadm.c | 23 +++--
3 files changed, 174 insertions(+), 63 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bf4976e..9f0caa2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6262,10 +6262,15 @@ ELOG_TDB *elog_open_tdb( const char *logname, bool
force_clear, bool read_only )
int elog_close_tdb( ELOG_TDB *etdb, bool force_close );
int write_eventlog_tdb( TDB_CONTEXT * the_tdb, Eventlog_entry * ee );
void fixup_eventlog_entry( Eventlog_entry * ee );
-bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, Eventlog_entry * entry,
bool * eor );
+bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, struct
eventlog_Record_tdb *entry, bool * eor );
+size_t fixup_eventlog_record_tdb(struct eventlog_Record_tdb *r);
struct eventlog_Record_tdb *evlog_pull_record_tdb(TALLOC_CTX *mem_ctx,
TDB_CONTEXT *tdb,
uint32_t record_number);
+NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx,
+ TDB_CONTEXT *tdb,
+ struct eventlog_Record_tdb *r,
+ uint32_t *record_number);
/* The following definitions come from rpc_server/srv_eventlog_nt.c */
diff --git a/source3/rpc_server/srv_eventlog_lib.c
b/source3/rpc_server/srv_eventlog_lib.c
index d6c4f1a..85200d5 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -594,7 +594,7 @@ void fixup_eventlog_entry( Eventlog_entry * ee )
going in.
/
-bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, Eventlog_entry * entry,
bool * eor )
+bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, struct
eventlog_Record_tdb *entry, bool * eor )
{
char *start = NULL, *stop = NULL;
@@ -615,32 +615,32 @@ bool parse_logentry( TALLOC_CTX *mem_ctx, char *line,
Eventlog_entry * entry, bo
if ( 0 == strncmp( start, "LEN", stop - start ) ) {
/* This will get recomputed later anyway -- probably not
necessary */
- entry->record.length = atoi( stop + 1 );
+ entry->size = atoi( stop + 1 );
} else if ( 0 == strncmp( start, "RS1", stop - start ) ) {
/* For now all these reserved entries seem to have the same
value,
which can be hardcoded to int(1699505740) for now */
- entry->record.reserved1 = atoi( stop + 1 );
+ entry->reserved = talloc_strdup(mem_ctx, "eLfL");
} else if ( 0 == strncmp( start, "RCN", stop - start ) ) {
- entry->record.record_number = atoi( stop + 1 );
+ entry->record_number = atoi( stop + 1 );
} else if ( 0 == strncmp( start, "TMG", stop - start ) ) {
- entry->record.time_generated = atoi( stop + 1 );
+ entry->time_generated = atoi( stop + 1 );
} else if ( 0 == strncmp( start, "TMW", stop - start ) ) {
- entry->record.time_written = atoi( stop + 1 );
+ entry->time_written = atoi( stop + 1 );
} else if ( 0 == strncmp( start, "EID", stop - start ) ) {
- entry->record.event_id = atoi( stop + 1 );
+ entry->event_id = atoi( stop + 1 );
} else if ( 0 == strncmp( start, "ETP", stop - start ) ) {
if ( strstr( start, "ERROR" ) ) {
- entry->record.event_type = EVENTLOG_ERROR_TYPE;
+ entry->event_type = EVENTLOG_ERROR_TY
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-450-g5e637e0
The branch, master has been updated
via 5e637e0afa01e227f2aa9e042da2f15b4d807083 (commit)
via 4974554de9c513973191d9a745009fe988ec0fcd (commit)
via a5597d75d218bff810928d618f4ea41277e554a9 (commit)
from a0c4fbdb3cf48f317ac5a3ca20ead31acb4c7611 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5e637e0afa01e227f2aa9e042da2f15b4d807083
Author: Günther Deschner
Date: Fri Jan 23 17:39:47 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 4974554de9c513973191d9a745009fe988ec0fcd
Author: Günther Deschner
Date: Wed Feb 4 12:59:47 2009 +0100
eventlog: calculate offsets in EVENTLOGRECORD struct.
We cannot use [relative] pointer properties here for various reasons.
Guenther
commit a5597d75d218bff810928d618f4ea41277e554a9
Author: Günther Deschner
Date: Fri Jan 23 14:58:27 2009 +0100
eventlog: add w32 on-disc EVENTLOG structures (*evt files).
Guenther
---
Summary of changes:
librpc/gen_ndr/eventlog.h | 77
librpc/gen_ndr/ndr_eventlog.c | 416 +
librpc/gen_ndr/ndr_eventlog.h | 14 ++
librpc/idl/eventlog.idl | 70 +++
4 files changed, 577 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h
index 0c998a8..94da688 100644
--- a/librpc/gen_ndr/eventlog.h
+++ b/librpc/gen_ndr/eventlog.h
@@ -94,6 +94,83 @@ struct eventlog_Record_tdb {
uint32_t padding;
}/* [public,flag(LIBNDR_FLAG_NOALIGN|LIBNDR_PRINT_ARRAY_HEX)] */;
+enum EVENTLOG_HEADER_FLAGS
+#ifndef USE_UINT_ENUMS
+ {
+ ELF_LOGFILE_HEADER_DIRTY=0x0001,
+ ELF_LOGFILE_HEADER_WRAP=0x0002,
+ ELF_LOGFILE_LOGFULL_WRITTEN=0x0004,
+ ELF_LOGFILE_ARCHIVE_SET=0x0008
+}
+#else
+ { __donnot_use_enum_EVENTLOG_HEADER_FLAGS=0x7FFF}
+#define ELF_LOGFILE_HEADER_DIRTY ( 0x0001 )
+#define ELF_LOGFILE_HEADER_WRAP ( 0x0002 )
+#define ELF_LOGFILE_LOGFULL_WRITTEN ( 0x0004 )
+#define ELF_LOGFILE_ARCHIVE_SET ( 0x0008 )
+#endif
+;
+
+struct EVENTLOGHEADER {
+ uint32_t HeaderSize;/* [value(0x30)] */
+ const char *Signature;/* [value("LfLe"),charset(DOS)] */
+ uint32_t MajorVersion;/* [value] */
+ uint32_t MinorVersion;/* [value] */
+ uint32_t StartOffset;
+ uint32_t EndOffset;
+ uint32_t CurrentRecordNumber;
+ uint32_t OldestRecordNumber;
+ uint32_t MaxSize;
+ enum EVENTLOG_HEADER_FLAGS Flags;
+ uint32_t Retention;
+ uint32_t EndHeaderSize;/* [value(0x30)] */
+}/* [public] */;
+
+struct EVENTLOGRECORD {
+ uint32_t Length;
+ const char *Reserved;/* [value("LfLe"),charset(DOS)] */
+ uint32_t RecordNumber;
+ time_t TimeGenerated;
+ time_t TimeWritten;
+ uint32_t EventID;
+ enum eventlogEventTypes EventType;
+ uint16_t NumStrings;
+ uint16_t EventCategory;
+ uint16_t ReservedFlags;
+ uint32_t ClosingRecordNumber;
+ uint32_t StringOffset;/*
[value(56+2*(strlen_m_term(SourceName)+strlen_m_term(Computername))+UserSidLength)]
*/
+ uint32_t UserSidLength;/*
[value(ndr_size_dom_sid0(&UserSid,ndr->flags))] */
+ uint32_t UserSidOffset;/*
[value(56+2*(strlen_m_term(SourceName)+strlen_m_term(Computername)))] */
+ uint32_t DataLength;
+ uint32_t DataOffset;/*
[value(56+2*(strlen_m_term(SourceName)+strlen_m_term(Computername))+UserSidLength+(2*ndr_size_string_array(Strings,NumStrings,LIBNDR_FLAG_STR_NULLTERM)))]
*/
+ const char * SourceName;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+ const char * Computername;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+ struct dom_sid0 UserSid;/*
[subcontext_size(UserSidLength),subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
+ const char * *Strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+ uint8_t *Data;/* [flag(LIBNDR_PRINT_ARRAY_HEX)] */
+ const char * Pad;/*
[flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
+ uint32_t Length2;/* [value(Length)] */
+}/* [gensize,public] */;
+
+struct EVENTLOGEOF {
+ uint32_t RecordSizeBeginning;/* [value(0x28)] */
+ uint32_t One;/* [value(0x)] */
+ uint32_t Two;/* [value(0x)] */
+ uint32_t Three;/* [value(0x)] */
+ uint32_t Four;/* [value(0x)] */
+ uint32_t BeginRecord;
+ uint32_t EndRecord;
+ uint32_t CurrentRecordNumber;
+ uint32_t OldestRecordNumber;
+ uint32_t RecordSizeEnd;/* [value(0x28)] */
+}/* [public] */;
+
+struct EVENTLOG_EVT_FILE {
+ struct EVENTLOGHEADER hdr;
+ struct EVENTLOGRECORD *records;
+ struct EVENTLOGEOF eof;
+}/* [public] */;
+
struct EVENTLOG_FULL_INFORMATION {
uint32_t full;
};
diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eve
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-447-ga0c4fbd
The branch, master has been updated
via a0c4fbdb3cf48f317ac5a3ca20ead31acb4c7611 (commit)
from 76db6f15dcc5338b1968f26287674cf0b3244e0f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a0c4fbdb3cf48f317ac5a3ca20ead31acb4c7611
Author: Günther Deschner
Date: Wed Feb 4 12:02:56 2009 +0100
librpc: add header file for drsblobs helper functions.
Guenther
---
Summary of changes:
librpc/gen_ndr/ndr_drsblobs.h |1 +
librpc/idl/drsblobs.idl |1 +
librpc/ndr/ndr_drsblobs.h | 27 +++
3 files changed, 29 insertions(+), 0 deletions(-)
create mode 100644 librpc/ndr/ndr_drsblobs.h
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_drsblobs.h b/librpc/gen_ndr/ndr_drsblobs.h
index 2f6cf99..27c13c8 100644
--- a/librpc/gen_ndr/ndr_drsblobs.h
+++ b/librpc/gen_ndr/ndr_drsblobs.h
@@ -6,6 +6,7 @@
#ifndef _HEADER_NDR_drsblobs
#define _HEADER_NDR_drsblobs
+#include "../librpc/ndr/ndr_drsblobs.h"
#define NDR_DRSBLOBS_UUID "12345778-1234-abcd-0001-0001"
#define NDR_DRSBLOBS_VERSION 0.0
#define NDR_DRSBLOBS_NAME "drsblobs"
diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index 7e9c2fe..fb37500 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -6,6 +6,7 @@ import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl";
uuid("12345778-1234-abcd-0001-0001"),
version(0.0),
pointer_default(unique),
+ helper("../librpc/ndr/ndr_drsblobs.h"),
helpstring("Active Directory Replication LDAP Blobs")
]
interface drsblobs {
diff --git a/librpc/ndr/ndr_drsblobs.h b/librpc/ndr/ndr_drsblobs.h
new file mode 100644
index 000..2753225
--- /dev/null
+++ b/librpc/ndr/ndr_drsblobs.h
@@ -0,0 +1,27 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Manually parsed structures found in the DRS protocol
+
+ Copyright (C) Andrew Bartlett 2008
+
+ 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
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-446-g76db6f1
The branch, master has been updated
via 76db6f15dcc5338b1968f26287674cf0b3244e0f (commit)
from a4c5054b5a92c08498f522b39472d64a32a3cebb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 76db6f15dcc5338b1968f26287674cf0b3244e0f
Author: Stefan Metzmacher
Date: Wed Feb 4 08:33:15 2009 +0100
selftest/Samba3: use the same logic for make test and make selftest
See also commit 484c4a5955d0365beb9587bb15c73fe3ed3301ce
metze
---
Summary of changes:
selftest/target/Samba3.pm |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index bb074b7..49984f1 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -551,11 +551,6 @@ sub wait_for_start($$)
system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L
$envvars->{SERVER_IP} -U% -p 139 | head -2");
system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L
$envvars->{SERVER_IP} -U% -p 139 | head -2");
- print "creating BUILTIN\\Administrators\n";
- $ENV{WINBINDD_SOCKET_DIR} = $envvars->{WINBINDD_SOCKET_DIR};
- system($self->binpath("net") ." $envvars->{CONFIGURATION} sam
createbuiltingroup Administrators");
- delete $ENV{WINBINDD_SOCKET_DIR};
-
print $self->getlog_env($envvars);
}
--
Samba Shared Repository
