[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  ac3f8d8 fix in_screen so that it works on os that don't chdir to $PWD
       via  c378835 tsocket: fill in sa.sa_len if the system supports it
      from  90b3bf8 ldb:ldb.h - reorder extended operations list

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ac3f8d859d1ab8b1bb9d41c465dd10499151a8c4
Author: Matthieu Patou <mat at matws.net>
Date:   Tue Nov 2 00:55:25 2010 +1100

    fix in_screen so that it works on os that don't chdir to $PWD
    
    That's the case on freebsd 7.2
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Nov  5 09:27:19 UTC 2010 on sn-devel-104

commit c378835cb6d660bcd2e0bc6524fc7da5b29963ea
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Oct 21 07:00:34 2010 +0200

    tsocket: fill in sa.sa_len if the system supports it
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/tsocket/tsocket_bsd.c |   12 ++++++++++++
 selftest/in_screen        |    1 +
 2 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 019bf42..9e80065 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -263,6 +263,9 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
 	memcpy(&bsda->u.ss, sa, sa_socklen);
 
 	bsda->sa_socklen = sa_socklen;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+	bsda->u.sa.sa_len = bsda->sa_socklen;
+#endif
 
 	*_addr = addr;
 	return 0;
@@ -291,6 +294,9 @@ ssize_t tsocket_address_bsd_sockaddr(const struct tsocket_address *addr,
 	}
 
 	memcpy(sa, &bsda->u.ss, sa_socklen);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+	sa->sa_len = sa_socklen;
+#endif
 	return sa_socklen;
 }
 
@@ -900,6 +906,9 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
 
 	ZERO_STRUCTP(bsda);
 	bsda->sa_socklen = sizeof(bsda->u.ss);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+	bsda->u.sa.sa_len = bsda->sa_socklen;
+#endif
 
 	ret = recvfrom(bsds->fd, state->buf, state->len, 0,
 		       &bsda->u.sa, &bsda->sa_socklen);
@@ -2095,6 +2104,9 @@ static struct tevent_req *tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
 
 		ZERO_STRUCTP(lrbsda);
 		lrbsda->sa_socklen = sizeof(lrbsda->u.ss);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+		lrbsda->u.sa.sa_len = lrbsda->sa_socklen;
+#endif
 	}
 
 	state->fd = socket(sa_fam, SOCK_STREAM, 0);
diff --git a/selftest/in_screen b/selftest/in_screen
index 927d831..8bfbc01 100755
--- a/selftest/in_screen
+++ b/selftest/in_screen
@@ -39,6 +39,7 @@ printenv |
   sed "s/\(^[^=]*=\)\(.*\)/export \1'\2'/g" > $basedir/$SERVERNAME.vars
 
 cat <<EOF > $basedir/$SERVERNAME.launch
+cd $PWD
  echo \$\$ > $basedir/$SERVERNAME.pid
  . $basedir/$SERVERNAME.vars
  echo "\$(date) starting $SERVERNAME" >> $basedir/$SERVERNAME.log


-- 
Samba Shared Repository