[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9750eb7 libsmb: Make ip_service_compare static
from 04b8e19 tevent: version 0.9.23
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9750eb7bab12825b3937985ffbcafa1b46ef4626
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 25 21:17:57 2015 +
libsmb: Make ip_service_compare static
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Fri Feb 27 06:20:58 CET 2015 on sn-devel-104
---
Summary of changes:
source3/include/proto.h| 1 -
source3/libsmb/namequery.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 82b2fb5..64bce03 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -821,7 +821,6 @@ bool name_status_find(const char *q_name,
int type,
const struct sockaddr_storage *to_ss,
fstring name);
-int ip_service_compare(struct ip_service *ss1, struct ip_service *ss2);
int remove_duplicate_addrs2(struct ip_service *iplist, int count );
struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 85af6ed..977c4ce 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1055,7 +1055,7 @@ static int addr_compare(const struct sockaddr_storage
*ss1,
compare 2 ldap IPs by nearness to our interfaces - used in qsort
***/
-int ip_service_compare(struct ip_service *ss1, struct ip_service *ss2)
+static int ip_service_compare(struct ip_service *ss1, struct ip_service *ss2)
{
int result;
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2015-02-27-0703/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-02-27-0703/samba.stderr http://git.samba.org/autobuild.flakey/2015-02-27-0703/samba.stdout The top commit at the time of the failure was: commit 04b8e19e1708c5670d180f5cd86d8ed139e9e5a4 Author: Michael Adam ob...@samba.org Date: Fri Feb 27 00:27:29 2015 +0100 tevent: version 0.9.23 * Add Solaris ports as tevent backend. * Improvements to the tevent_data tutorial. * Remove use of the 'staticforward' macro. Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Fri Feb 27 03:48:57 CET 2015 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 079c301 ntdb: always return int from tdb_store_flag_to_ntdb() from 3e9e5e6 registry: Fix an aligment increase warning https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 079c301c013478597852491882ab27ef6870900a Author: David Disseldorp dd...@samba.org Date: Wed Feb 25 11:33:25 2015 +0100 ntdb: always return int from tdb_store_flag_to_ntdb() Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Thu Feb 26 13:49:05 CET 2015 on sn-devel-104 --- Summary of changes: lib/dbwrap/dbwrap_ntdb.c | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/lib/dbwrap/dbwrap_ntdb.c b/lib/dbwrap/dbwrap_ntdb.c index 5a8ce4b..1f34ef8 100644 --- a/lib/dbwrap/dbwrap_ntdb.c +++ b/lib/dbwrap/dbwrap_ntdb.c @@ -49,6 +49,7 @@ static int tdb_store_flag_to_ntdb(int tdb_flag) default: smb_panic(unknown tdb_flag); } + return -1; /* NOTREACHED */ } static NTSTATUS db_ntdb_store(struct db_record *rec, NTDB_DATA data, int flag) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1237b00 lib: Simplify pidfile.c
via bd6bc30 Fix whitespace
from 079c301 ntdb: always return int from tdb_store_flag_to_ntdb()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1237b006d5fad9523fb7e7bf9ecb09df66afb7f6
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 19 10:52:11 2015 +0100
lib: Simplify pidfile.c
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Thu Feb 26 18:28:31 CET 2015 on sn-devel-104
commit bd6bc30693ce989588d8ebebeb717f4e82d590c4
Author: Volker Lendecke v...@samba.org
Date: Wed Jan 14 17:11:12 2015 +0100
Fix whitespace
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
---
Summary of changes:
lib/util/pidfile.c| 41 +
libcli/security/display_sec.c | 14 +++---
librpc/idl/smb_acl.idl| 20 ++--
3 files changed, 34 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/pidfile.c b/lib/util/pidfile.c
index 1b382d1..5590780 100644
--- a/lib/util/pidfile.c
+++ b/lib/util/pidfile.c
@@ -1,20 +1,20 @@
/* this code is broken - there is a race condition with the unlink (tridge) */
-/*
+/*
Unix SMB/CIFS implementation.
pidfile handling
Copyright (C) Andrew Tridgell 1998
-
+
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/.
*/
@@ -30,23 +30,21 @@
/**
* return the pid in a pidfile. return 0 if the process (or pidfile)
- * does not exist
+ * does not exist
*/
pid_t pidfile_pid(const char *piddir, const char *name)
{
+ size_t len = strlen(piddir) + strlen(name) + 6;
+ char pidFile[len];
int fd;
char pidstr[20];
pid_t ret = -1;
- char *pidFile;
- if (asprintf(pidFile, %s/%s.pid, piddir, name) 0) {
- return 0;
- }
+ snprintf(pidFile, sizeof(pidFile), %s/%s.pid, piddir, name);
fd = open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
if (fd == -1) {
- SAFE_FREE(pidFile);
return 0;
}
@@ -62,7 +60,7 @@ pid_t pidfile_pid(const char *piddir, const char *name)
pidFile));
goto noproc;
}
-
+
if (!process_exists_by_pid(ret)) {
DEBUG(10, (Process with PID=%d does not exist.\n, (int)ret));
goto noproc;
@@ -76,7 +74,6 @@ pid_t pidfile_pid(const char *piddir, const char *name)
}
close(fd);
- SAFE_FREE(pidFile);
DEBUG(10, (Process with PID=%d is running.\n, (int)ret));
return ret;
@@ -85,35 +82,32 @@ pid_t pidfile_pid(const char *piddir, const char *name)
DEBUG(10, (Deleting %s, since %d is not a Samba process.\n, pidFile,
(int)ret));
unlink(pidFile);
- SAFE_FREE(pidFile);
return 0;
}
/**
- * create a pid file in the pid directory. open it and leave it locked
+ * create a pid file in the pid directory. open it and leave it locked
*/
void pidfile_create(const char *piddir, const char *name)
{
+ size_t len = strlen(piddir) + strlen(name) + 6;
+ char pidFile[len];
int fd;
charbuf[20];
- char *pidFile;
pid_t pid;
- if (asprintf(pidFile, %s/%s.pid, piddir, name) 0) {
- DEBUG(0,(ERROR: Out of memory\n));
- exit(1);
- }
+ snprintf(pidFile, sizeof(pidFile), %s/%s.pid, piddir, name);
pid = pidfile_pid(piddir, name);
if (pid != 0) {
- DEBUG(0,(ERROR: %s is already running. File %s exists and
process id %d is running.\n,
+ DEBUG(0,(ERROR: %s is already running. File %s exists and
process id %d is running.\n,
name, pidFile, (int)pid));
exit(1);
}
fd = open(pidFile, O_NONBLOCK | O_CREAT | O_WRONLY | O_EXCL, 0644);
if (fd == -1) {
- DEBUG(0,(ERROR: can't open %s: Error was %s\n, pidFile,
+
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2015-02-26-1838/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-02-26-1838/samba.stderr http://git.samba.org/autobuild.flakey/2015-02-26-1838/samba.stdout The top commit at the time of the failure was: commit 079c301c013478597852491882ab27ef6870900a Author: David Disseldorp dd...@samba.org Date: Wed Feb 25 11:33:25 2015 +0100 ntdb: always return int from tdb_store_flag_to_ntdb() Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Thu Feb 26 13:49:05 CET 2015 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3ec0645 vfs_catia: Simplify init_mappings()
via f2f9acc smbd: Simplify ReadDirName
via 4cdbf81 smbd: ZERO_STRUCT - struct init
via 6ed53d4 smbd: ZERO_STRUCT - struct assignment
via 09c0092 smbd: ZERO_STRUCT - struct assignment
via 9e810b2 smbd: ZERO_STRUCTP - talloc_zero()
via 9455344 param: Remove lib/param/generic.c
via e4bded6 libsmb: Use tevent_req_poll_ntstatus
from 1237b00 lib: Simplify pidfile.c
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3ec06454e106e83ae7e72412202b3efcd4e6285b
Author: Volker Lendecke v...@samba.org
Date: Tue Feb 24 14:03:11 2015 +
vfs_catia: Simplify init_mappings()
No else required after return
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Feb 26 21:22:30 CET 2015 on sn-devel-104
commit f2f9acc113e7c1dd9bca0c4cba8e503d18286d13
Author: Volker Lendecke v...@samba.org
Date: Tue Feb 24 13:46:09 2015 +
smbd: Simplify ReadDirName
In the if-branches we return, so no else necessary
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 4cdbf81243c03834fc534ce264c18d743c22f727
Author: Volker Lendecke v...@samba.org
Date: Mon Feb 23 11:17:59 2015 +
smbd: ZERO_STRUCT - struct init
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 6ed53d4967465f57cafa0b465744b30eec40a34e
Author: Volker Lendecke v...@samba.org
Date: Mon Feb 23 11:08:30 2015 +
smbd: ZERO_STRUCT - struct assignment
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 09c00923bafe1eb78ec45f33a5c3076dff44787a
Author: Volker Lendecke v...@samba.org
Date: Mon Feb 23 11:07:32 2015 +
smbd: ZERO_STRUCT - struct assignment
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 9e810b2fbe27b26c1ae5859b08d3159882c0f5bb
Author: Volker Lendecke v...@samba.org
Date: Mon Feb 23 11:04:58 2015 +
smbd: ZERO_STRUCTP - talloc_zero()
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 9455344e6689533097cd7c689d84aa90a937c1e9
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 11:46:28 2015 +0100
param: Remove lib/param/generic.c
This seems completely unused.
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit e4bded6551864979804d8c1e14196fe8e12cee2e
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 25 20:42:33 2015 +
libsmb: Use tevent_req_poll_ntstatus
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
---
Summary of changes:
lib/param/generic.c | 276
lib/param/param.h | 21
lib/param/wscript_build | 2 +-
libcli/smb/smb1cli_trans.c | 3 +-
libcli/smb/smbXcli_base.c | 6 +-
source3/modules/vfs_catia.c | 3 +-
source3/smbd/dir.c | 23 ++--
source3/smbd/trans2.c | 10 +-
8 files changed, 21 insertions(+), 323 deletions(-)
delete mode 100644 lib/param/generic.c
Changeset truncated at 500 lines:
diff --git a/lib/param/generic.c b/lib/param/generic.c
deleted file mode 100644
index 8becffb..000
--- a/lib/param/generic.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Copyright (C) Jelmer Vernooij 2005
- *
- * 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/.
- */
-
-#include includes.h
-#include ../lib/util/dlinklist.h
-#include ../lib/util/parmlist.h
-#include param/param.h
-#include param/loadparm.h
-#include system/filesys.h
-
-struct param_section *param_get_section(struct param_context *ctx, const char
*name)
-{
- struct param_section *sect;
-
- if (name == NULL)
- name = GLOBAL_NAME;
-
- for (sect = ctx-sections; sect; sect =
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated via d2c9373 Merge tag 'samba-4.1.17' into v4-1-test via 492c673 VERSION: Disable git snapshots for the 4.1.17 release. via 8f38d4b WHATSNEW: Add release notes for Samba 4.1.17. via a9a513c s3-netlogon: Make sure we do not deference a NULL pointer. via 1996b18 CVE-2015-0240: s3: netlogon: Ensure we don't call talloc_free on an uninitialized pointer. via 5a59b1a VERSION: Re-enable git snapshots. via e001101 VERSION: Bump version up to 4.1.17. from 3bc159d doc:man:vfs_glusterfs: improve the configuration section. https://git.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log - commit d2c9373cd1d211935650d46175feeb156ea71523 Merge: 3bc159d 492c673 Author: Stefan Metzmacher me...@samba.org Date: Thu Feb 26 11:27:33 2015 +0100 Merge tag 'samba-4.1.17' into v4-1-test samba: tag release samba-4.1.17 --- Summary of changes: Changeset truncated at 500 lines: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 2722ad6 Merge tag 'samba-4.0.25' into v4-0-test via 4395552 VERSION: Disable git snapshots for the 3.0.25 release. via 28babc0 WHATSNEW: Add release notes for Samba 3.0.25. via 5b833f0 auth: Make sure that creds_out is initialized with NULL. via 1981e7a s3-netlogon: Make sure we do not deference a NULL pointer. via 6ae0a8a CVE-2015-0240: s3: netlogon: Ensure we don't call talloc_free on an uninitialized pointer. via 4060da4 VERSION: Re-enable git snapshots. via 3865c60 VERSION: Bump version up to 4.0.25. from 1a13242 VERSION: Bump version up to 4.0.26. https://git.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 2722ad6ccbba52d0ea0a556017eba09a719797ff Merge: 1a13242 4395552 Author: Stefan Metzmacher me...@samba.org Date: Thu Feb 26 11:18:38 2015 +0100 Merge tag 'samba-4.0.25' into v4-0-test samba: tag release samba-4.0.25 --- Summary of changes: Changeset truncated at 500 lines: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1cb753a winbind: Simplify winbindd_dsgetdcname_recv
from 3ec0645 vfs_catia: Simplify init_mappings()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1cb753ae4e371df8555b82139d43a010b69bc3e8
Author: Volker Lendecke v...@samba.org
Date: Fri Dec 12 23:00:41 2014 +0100
winbind: Simplify winbindd_dsgetdcname_recv
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Fri Feb 27 01:16:10 CET 2015 on sn-devel-104
---
Summary of changes:
source3/winbindd/winbindd_dsgetdcname.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_dsgetdcname.c
b/source3/winbindd/winbindd_dsgetdcname.c
index c447b3a..8eb1de7 100644
--- a/source3/winbindd/winbindd_dsgetdcname.c
+++ b/source3/winbindd/winbindd_dsgetdcname.c
@@ -101,6 +101,7 @@ NTSTATUS winbindd_dsgetdcname_recv(struct tevent_req *req,
{
struct winbindd_dsgetdcname_state *state = tevent_req_data(
req, struct winbindd_dsgetdcname_state);
+ struct GUID_txt_buf guid_str_buf;
char *guid_str;
NTSTATUS status;
@@ -109,10 +110,6 @@ NTSTATUS winbindd_dsgetdcname_recv(struct tevent_req *req,
return status;
}
- guid_str = GUID_string(talloc_tos(), state-dc_info-domain_guid);
- if (guid_str == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
fstrcpy(response-data.dsgetdcname.dc_unc,
state-dc_info-dc_unc);
@@ -120,8 +117,11 @@ NTSTATUS winbindd_dsgetdcname_recv(struct tevent_req *req,
state-dc_info-dc_address);
response-data.dsgetdcname.dc_address_type =
state-dc_info-dc_address_type;
+
+ guid_str = GUID_buf_string(state-dc_info-domain_guid,
+ guid_str_buf);
fstrcpy(response-data.dsgetdcname.domain_guid, guid_str);
- TALLOC_FREE(guid_str);
+
fstrcpy(response-data.dsgetdcname.domain_name,
state-dc_info-domain_name);
fstrcpy(response-data.dsgetdcname.forest_name,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 04b8e19 tevent: version 0.9.23
from 1cb753a winbind: Simplify winbindd_dsgetdcname_recv
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 04b8e19e1708c5670d180f5cd86d8ed139e9e5a4
Author: Michael Adam ob...@samba.org
Date: Fri Feb 27 00:27:29 2015 +0100
tevent: version 0.9.23
* Add Solaris ports as tevent backend.
* Improvements to the tevent_data tutorial.
* Remove use of the 'staticforward' macro.
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Fri Feb 27 03:48:57 CET 2015 on sn-devel-104
---
Summary of changes:
lib/tevent/ABI/{tevent-0.9.21.sigs = tevent-0.9.23.sigs} | 0
lib/tevent/wscript| 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
copy lib/tevent/ABI/{tevent-0.9.21.sigs = tevent-0.9.23.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/ABI/tevent-0.9.21.sigs
b/lib/tevent/ABI/tevent-0.9.23.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.21.sigs
copy to lib/tevent/ABI/tevent-0.9.23.sigs
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 45f602c..489ce31 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.9.22'
+VERSION = '0.9.23'
blddir = 'bin'
--
Samba Shared Repository
