[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Jun 19 10:57:06 MDT 2012
The branch, master has been updated
via e43b745 waf: Fix make etags
via 6c74d96 selftest/flapping: mark samba4.nss.test using winbind as flakey
via e891505 Revert "s3-lib Remove unused sys_fcntl_long()"
via 13cfe25 s3:rpc_server/lsasd: remove dependency to libgen.h and basename()
from 4f15b47 s3-auth: make_new_system_info_session() now does not query nss
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e43b745f2156c31c3101b39c327911c16c431c2f
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 19 16:33:39 2012 +0200
waf: Fix make etags
vlendec at host:~/git/s3> make etags
WAF_MAKE=1 ./buildtools/bin/waf etags
Running: etags $(find /home/vlendec/git/s3 -name "*.[ch]" | egrep -v \.inst\.)
sh: /usr/bin/etags: Argument list too long
'etags' finished successfully (0.368s)
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Jun 19 18:56:53 CEST 2012 on sn-devel-104
commit 6c74d960bc790bae0c58513594aa47af8ef8e615
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 19 15:19:44 2012 +0200
selftest/flapping: mark samba4.nss.test using winbind as flakey
[1427/1518 in 1h12m39s] samba4.nss.test using winbind(member)
UNEXPECTED(failure): samba4.nss.test using winbind(member).run nsstest(member)
REASON: _StringException: _StringException: ERROR setpwent: NSS_STATUS=-1 1 (nss_errno=0)
ERROR getpwent: NSS_STATUS=-1 1 (nss_errno=0)
ERROR endpwent: NSS_STATUS=-1 1 (nss_errno=0)
ERROR setgrent: NSS_STATUS=-1 1 (nss_errno=0)
ERROR getgrent: NSS_STATUS=-1 1 (nss_errno=0)
ERROR endgrent: NSS_STATUS=-1 1 (nss_errno=0)
ERROR Non existent user gave error -1
ERROR Non existent uid gave error -1
ERROR Non existent group gave error -1
ERROR Non existent gid gave error -1
total_errors=10
This seems to happen in all environments
metze
commit e89150597ac659f738f24fe06ef3a17559a81862
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 19 11:34:04 2012 +0200
Revert "s3-lib Remove unused sys_fcntl_long()"
This reverts commit 846a697e20478798288afb43cdb7a9f389a15c69.
This is still used in source3/smbd/oplock_irix.c
metze
commit 13cfe2504e17a3ab3c32d677e40ead5bd497432c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 19 11:33:12 2012 +0200
s3:rpc_server/lsasd: remove dependency to libgen.h and basename()
metze
-----------------------------------------------------------------------
Summary of changes:
selftest/flapping | 2 +-
source3/include/proto.h | 1 +
source3/lib/system.c | 14 ++++++++++++++
source3/rpc_server/lsasd.c | 19 +++++++++++--------
wscript | 2 +-
5 files changed, 28 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/flapping b/selftest/flapping
index 4f6c055..f0b1528 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -23,4 +23,4 @@
^samba3.raw.acls.inheritance\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba4.nss.test.*using.*winbind\(s3.*\).run.*nsstest # fails sometimes on sn-devel
+^samba4.nss.test.*using.*winbind # fails sometimes on sn-devel
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 463d980..a258bf3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -272,6 +272,7 @@ ssize_t sys_pwrite(int fd, const void *buf, size_t count, off_t off);
ssize_t sys_send(int s, const void *msg, size_t len, int flags);
ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
int sys_fcntl_ptr(int fd, int cmd, void *arg);
+int sys_fcntl_long(int fd, int cmd, long arg);
void update_stat_ex_mtime(struct stat_ex *dst, struct timespec write_ts);
void update_stat_ex_create_time(struct stat_ex *dst, struct timespec create_time);
int sys_stat(const char *fname, SMB_STRUCT_STAT *sbuf,
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 92596a8..3daa041 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -198,6 +198,20 @@ int sys_fcntl_ptr(int fd, int cmd, void *arg)
return ret;
}
+/*******************************************************************
+A fcntl wrapper that will deal with EINTR.
+********************************************************************/
+
+int sys_fcntl_long(int fd, int cmd, long arg)
+{
+ int ret;
+
+ do {
+ ret = fcntl(fd, cmd, arg);
+ } while (ret == -1 && errno == EINTR);
+ return ret;
+}
+
/****************************************************************************
Get/Set all the possible time fields from a stat struct as a timespec.
****************************************************************************/
diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 6608d6b..8be7098 100644
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -23,7 +23,6 @@
#include "serverid.h"
#include "messages.h"
#include "ntdomain.h"
-#include <libgen.h>
#include "lib/id_cache.h"
@@ -455,7 +454,8 @@ static void lsasd_handle_client(struct tevent_req *req)
sd,
NULL);
} else if (tsocket_address_is_unix(srv_addr)) {
- char *p;
+ const char *p;
+ const char *b;
p = tsocket_address_unix_path(srv_addr, tmp_ctx);
if (p == NULL) {
@@ -463,22 +463,25 @@ static void lsasd_handle_client(struct tevent_req *req)
return;
}
- if (strstr(p, "/np/")) {
- p = basename(p);
+ b = strrchr(p, '/');
+ if (b != NULL) {
+ b++;
+ } else {
+ b = p;
+ }
+ if (strstr(p, "/np/")) {
named_pipe_accept_function(data->ev_ctx,
data->msg_ctx,
- p,
+ b,
sd,
lsasd_client_terminated,
data);
} else {
- p = basename(p);
-
dcerpc_ncacn_accept(data->ev_ctx,
data->msg_ctx,
NCALRPC,
- p,
+ b,
cli_addr,
srv_addr,
sd,
diff --git a/wscript b/wscript
index bceace1..9caa673 100755
--- a/wscript
+++ b/wscript
@@ -173,7 +173,7 @@ def etags(ctx):
'''build TAGS file using etags'''
import Utils
source_root = os.path.dirname(Utils.g_module.root_path)
- cmd = 'etags $(find %s -name "*.[ch]" | egrep -v \.inst\.)' % source_root
+ cmd = 'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root)
print("Running: %s" % cmd)
os.system(cmd)
--
Samba Shared Repository
More information about the samba-cvs
mailing list