[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via 4659595 s4:lib/messaging: terminate the irpc_servers_byname()
result with server_id_set_disconnected() (bug #9540)
via af61dad smbd: Fix bug 9549 -- Memleak in the async echo handler
from 0d5e2f4 docs: Fix typo in vfs_tsmsm.8.xml.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 465959594a4e033878740f9dfe559525e4559094
Author: Stefan Metzmacher
Date: Fri Jan 4 13:27:26 2013 +0100
s4:lib/messaging: terminate the irpc_servers_byname() result with
server_id_set_disconnected() (bug #9540)
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andrew Bartlett
(cherry picked from commit 8d9a77f8646cd26371dc2ec1d3ed52730ac19eb9)
Autobuild-User(v4-0-test): Karolin Seeger
Autobuild-Date(v4-0-test): Thu Jan 10 11:46:05 CET 2013 on sn-devel-104
commit af61dad97203ff1a44093f1cf864c75c2558cd46
Author: Volker Lendecke
Date: Tue Jan 8 15:34:19 2013 +0100
smbd: Fix bug 9549 -- Memleak in the async echo handler
Reviewed by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Tue Jan 8 23:30:41 CET 2013 on sn-devel-104
(cherry picked from commit 3d5c534f0cc7c6e3eead7462eef4a178c7035857)
---
Summary of changes:
source3/smbd/process.c |2 +-
source4/lib/messaging/messaging.c |4 ++--
source4/lib/messaging/pymessaging.c |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index eeda6f9..e934eaa 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3022,7 +3022,7 @@ static void smbd_echo_got_packet(struct tevent_req *req)
}
iov = &state->pending[num_pending];
- iov->iov_base = buf;
+ iov->iov_base = talloc_move(state->pending, &buf);
iov->iov_len = buflen;
DEBUG(10,("echo_handler[%d]: forward to main\n",
diff --git a/source4/lib/messaging/messaging.c
b/source4/lib/messaging/messaging.c
index 6618897..29ba388 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -977,7 +977,7 @@ struct server_id *irpc_servers_byname(struct
imessaging_context *msg_ctx,
for (i=0;itdb, name);
talloc_free(t);
@@ -1414,7 +1414,7 @@ struct dcerpc_binding_handle
*irpc_binding_handle_by_name(TALLOC_CTX *mem_ctx,
errno = EADDRNOTAVAIL;
return NULL;
}
- if (sids[0].pid == 0) {
+ if (server_id_is_disconnected(&sids[0])) {
talloc_free(sids);
errno = EADDRNOTAVAIL;
return NULL;
diff --git a/source4/lib/messaging/pymessaging.c
b/source4/lib/messaging/pymessaging.c
index fca46e6..cb79d72 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -247,7 +247,7 @@ static PyObject *py_irpc_servers_byname(PyObject *self,
PyObject *args, PyObject
return NULL;
}
- for (i = 0; ids[i].pid != 0; i++) {
+ for (i = 0; !server_id_is_disconnected(&ids[i]); i++) {
/* Do nothing */
}
@@ -257,7 +257,7 @@ static PyObject *py_irpc_servers_byname(PyObject *self,
PyObject *args, PyObject
PyErr_NoMemory();
return NULL;
}
- for (i = 0; ids[i].pid; i++) {
+ for (i = 0; !server_id_is_disconnected(&ids[i]); i++) {
PyObject *py_server_id;
struct server_id *p_server_id = talloc(NULL, struct server_id);
if (!p_server_id) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 213e726 build: Set LD_LIBRARY_PATH in install_with_python.sh
via 5a1deec build: Make install_with_python.sh more portable
via 8e84c33 build: In install_with_python.sh force using the python
from the install we just made
via 7acacdf build: Make install_with_python.sh executable
via 489ad49 swat: move russian swat files alongside ja and tr
via b9fbce2 passdb: Add discard_const_p() to pdb_samba_dsdb
via 26bae89 vfs: Fix compilation of solaris ACL module
via 9dfd0a0 build: Remove bashism from SAMBAMANPAGES rule
from 313da9d smb.conf(5): update list of available protocols (bug #9552)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 213e7260a83d4349132e8c159798b476cec3f814
Author: Andrew Bartlett
Date: Thu Jan 10 12:00:03 2013 +1100
build: Set LD_LIBRARY_PATH in install_with_python.sh
This ensures that the python install finishes correctly.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Thu Jan 10 14:00:13 CET 2013 on sn-devel-104
commit 5a1deec38a7ff7287b31a47ae61769c66e10de17
Author: Andrew Bartlett
Date: Thu Jan 10 09:00:37 2013 +1100
build: Make install_with_python.sh more portable
Reviewed-by: Stefan Metzmacher
commit 8e84c33a6094288ec2c8964588c679a71742e855
Author: Andrew Bartlett
Date: Thu Jan 10 08:51:34 2013 +1100
build: In install_with_python.sh force using the python from the install we
just made
Reviewed-by: Stefan Metzmacher
commit 7acacdfc05d3162b2879b6ac80d0809b5af96f1e
Author: Andrew Bartlett
Date: Thu Jan 10 08:50:53 2013 +1100
build: Make install_with_python.sh executable
Reviewed-by: Stefan Metzmacher
commit 489ad498ab14340eb99f35a8814418db9db788a5
Author: Andrew Bartlett
Date: Thu Dec 20 18:36:40 2012 +1100
swat: move russian swat files alongside ja and tr
Reviewed-by: Stefan Metzmacher
commit b9fbce20613952ead92dde3981a57f6d825c0584
Author: Andrew Bartlett
Date: Thu Dec 13 10:33:04 2012 +1100
passdb: Add discard_const_p() to pdb_samba_dsdb
Reviewed-by: Stefan Metzmacher
commit 26bae894f2ae898c51535dda14060ecf4786c6ec
Author: Andrew Bartlett
Date: Sat Jan 5 14:53:13 2013 +1100
vfs: Fix compilation of solaris ACL module
Andrew Bartlett
Reviewed-by: Stefan Metzmacher
commit 9dfd0a0dc980b521905399e0b409cb81fbbe6b37
Author: Andrew Bartlett
Date: Wed Jan 9 09:39:59 2013 +1100
build: Remove bashism from SAMBAMANPAGES rule
In sh, you must assign the variable, then export it.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher
---
Summary of changes:
buildtools/wafsamba/wafsamba.py|3 ++-
install_with_python.sh |7 ++-
source3/modules/vfs_solarisacl.c |2 +-
source3/passdb/pdb_samba_dsdb.c|4 ++--
.../lang}/ru/help/welcome-no-samba-doc.html|0
{source3/po => swat/lang}/ru/help/welcome.html |0
{source3/po => swat/lang}/ru/images/globals.gif| Bin 2041 -> 2041 bytes
{source3/po => swat/lang}/ru/images/home.gif | Bin 2190 -> 2190 bytes
{source3/po => swat/lang}/ru/images/passwd.gif | Bin 1936 -> 1936 bytes
{source3/po => swat/lang}/ru/images/printers.gif | Bin 2139 -> 2139 bytes
{source3/po => swat/lang}/ru/images/shares.gif | Bin 2081 -> 2081 bytes
{source3/po => swat/lang}/ru/images/status.gif | Bin 2305 -> 2305 bytes
{source3/po => swat/lang}/ru/images/viewconfig.gif | Bin 2096 -> 2096 bytes
{source3/po => swat/lang}/ru/images/wizard.gif | Bin 2605 -> 2605 bytes
{source3/po => swat/lang}/ru/include/header.html |0
15 files changed, 11 insertions(+), 5 deletions(-)
mode change 100644 => 100755 install_with_python.sh
rename {source3/po => swat/lang}/ru/help/welcome-no-samba-doc.html (100%)
rename {source3/po => swat/lang}/ru/help/welcome.html (100%)
rename {source3/po => swat/lang}/ru/images/globals.gif (100%)
rename {source3/po => swat/lang}/ru/images/home.gif (100%)
rename {source3/po => swat/lang}/ru/images/passwd.gif (100%)
rename {source3/po => swat/lang}/ru/images/printers.gif (100%)
rename {source3/po => swat/lang}/ru/images/shares.gif (100%)
rename {source3/po => swat/lang}/ru/images/status.gif (100%)
rename {source3/po => swat/lang}/ru/images/viewconfig.gif (100%)
rename {source3/po => swat/lang}/ru/images/wizard.gif (100%)
rename {source3/po => swat/lang}/ru/include/header.html (100%)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 9409669..6ef0b57 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/bu
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 051a1a9 samba-tool classicupgrade: Do not print the admin password during upgrade via 5e0fcb0 s4-idmap: Remove requirement that posixAccount or posixGroup be set for rfc2307 via c9d2ca5 selftest: Add test for rfc2307 mapping handling via 5812eb3 dsdb-acl: give error string if we can not obtain the schema via 99d872e s4-dbcheck: Allow forcing an override of an old @MODULES record from 213e726 build: Set LD_LIBRARY_PATH in install_with_python.sh http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 051a1a9c6417c2cbffa7d091ae477a6c7922d363 Author: Andrew Bartlett Date: Sat Dec 22 09:28:05 2012 +1100 samba-tool classicupgrade: Do not print the admin password during upgrade This changes the code to only set and show a new password if no admin user is found during the upgrade. Andrew Bartlett Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Jan 10 16:55:23 CET 2013 on sn-devel-104 commit 5e0fcb04a48d96669ed4376bfa17f679e3582236 Author: Andrew Bartlett Date: Wed Dec 26 20:48:12 2012 +1100 s4-idmap: Remove requirement that posixAccount or posixGroup be set for rfc2307 This change matches the source3/idmap/idmap_ad.c code, and allows this feature to work with only the setting of the UID/GID in Active Directory Users and Computers. Andrew Bartlett Reviewed-by: Stefan Metzmacher commit c9d2ca585e198b1006bbf7f1a3c988c1188b66cb Author: Andrew Bartlett Date: Fri Dec 28 12:36:06 2012 +1100 selftest: Add test for rfc2307 mapping handling Reviewed-by: Stefan Metzmacher commit 5812eb3c1deac51891f01338b4771b1e397dc24d Author: Andrew Bartlett Date: Thu Jan 3 21:31:22 2013 +1100 dsdb-acl: give error string if we can not obtain the schema Reviewed-by: Stefan Metzmacher commit 99d872ee9261a299add4718c38234dfe9f7658fc Author: Andrew Bartlett Date: Thu Aug 23 15:18:13 2012 +1000 s4-dbcheck: Allow forcing an override of an old @MODULES record Reviewed-by: Stefan Metzmacher --- Summary of changes: nsswitch/tests/test_rfc2307_mapping.sh | 181 ++ selftest/selftest.pl |5 +- selftest/target/Samba4.pm|8 +- source4/dsdb/samdb/ldb_modules/acl.c |5 +- source4/scripting/python/samba/dbchecker.py |9 + source4/scripting/python/samba/netcmd/dbcheck.py | 24 +++- source4/scripting/python/samba/upgrade.py| 11 ++- source4/selftest/tests.py|1 + source4/winbind/idmap.c |9 +- testprogs/blackbox/dbcheck.sh|5 + 10 files changed, 243 insertions(+), 15 deletions(-) create mode 100755 nsswitch/tests/test_rfc2307_mapping.sh Changeset truncated at 500 lines: diff --git a/nsswitch/tests/test_rfc2307_mapping.sh b/nsswitch/tests/test_rfc2307_mapping.sh new file mode 100755 index 000..f1e3ea9 --- /dev/null +++ b/nsswitch/tests/test_rfc2307_mapping.sh @@ -0,0 +1,181 @@ +#!/bin/sh +# Blackbox test for wbinfo and rfc2307 mappings +if [ $# -lt 4 ]; then +cat < name) +echo "test: wbinfo -s check for sane mapping" +if test x$user_name != x$tested_name; then + echo "$user_name does not match $tested_name" + echo "failure: wbinfo -s check for sane mapping" + failed=`expr $failed + 1` +else + echo "success: wbinfo -s check for sane mapping" +fi + +testit "wbinfo -n on the returned name against $TARGET" $wbinfo -n $user_name || failed=`expr $failed + 1` +test_sid=`$wbinfo -n $tested_name | cut -d " " -f1` + +echo "test: wbinfo -n check for sane mapping" +if test x$user_sid != x$test_sid; then + echo "$user_sid does not match $test_sid" + echo "failure: wbinfo -n check for sane mapping" + failed=`expr $failed + 1` +else + echo "success: wbinfo -n check for sane mapping" +fi + +testit "wbinfo -n against $TARGET" $wbinfo -n "$DOMAIN/rfc2307_test_group" || failed=`expr $failed + 1` +group_sid=`$wbinfo -n "$DOMAIN/rfc2307_test_group" | cut -d " " -f1` +echo "$DOMAIN/rfc2307_test_group resolved to $group_sid" + +# Then add a uidNumber to the group record using ldbmodify +cat > $PREFIX/tmpldbmodify < +changetype: modify +add: uidNumber +uidNumber: $UID_RFC2307TEST +EOF + +testit "modify gidNumber on group" $VALGRIND $ldbmodify -H ldap://$SERVER $PREFIX/tmpldbmodify -U$DOMAIN/$USERNAME%$PASSWORD $@ || failed=`expr $failed + 1` + +# Then add a gidNumber to the group record using ldbmodify +cat > $PREFIX/tmpldbmodify < +changetype: modify +add: gidNumber +gidNumber: $GID_RFC2307TEST +EOF + +testit "modify gidNumber on group" $VALGRIND $ldbmodify -H ldap://$SERV
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via edbc26b scripting/samba_upgradedns: Only look for IPv4/IPv6
addresses if we actually them
from 051a1a9 samba-tool classicupgrade: Do not print the admin password
during upgrade
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit edbc26bca84ee77b5a9571ba8dc9416c0db25906
Author: Andrew Bartlett
Date: Fri Dec 28 10:05:40 2012 +1100
scripting/samba_upgradedns: Only look for IPv4/IPv6 addresses if we
actually them
This allows the script to be used to create/remove the samba-specific
dns-SERVER account
when we do not need to create the in-directory partition.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Thu Jan 10 20:56:50 CET 2013 on sn-devel-104
---
Summary of changes:
source4/scripting/bin/samba_upgradedns | 43 ---
1 files changed, 22 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/bin/samba_upgradedns
b/source4/scripting/bin/samba_upgradedns
index ba597cf..f389ef7 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -278,27 +278,6 @@ if __name__ == '__main__':
logger.error("Cannot create AD based DNS for OS level < 2003")
sys.exit(1)
-logger.info("Looking up IPv4 addresses")
-hostip = interface_ips_v4(lp)
-try:
-hostip.remove('127.0.0.1')
-except ValueError:
-pass
-if not hostip:
-logger.error("No IPv4 addresses found")
-sys.exit(1)
-else:
-hostip = hostip[0]
-logger.debug("IPv4 addresses: %s" % hostip)
-
-logger.info("Looking up IPv6 addresses")
-hostip6 = interface_ips_v6(lp, linklocal=False)
-if not hostip6:
-hostip6 = None
-else:
-hostip6 = hostip6[0]
-logger.debug("IPv6 addresses: %s" % hostip6)
-
domaindn = names.domaindn
forestdn = names.rootdn
@@ -351,6 +330,28 @@ if __name__ == '__main__':
ncname = msg[0]['nCName'][0]
except Exception, e:
logger.info("Creating DNS partitions")
+
+logger.info("Looking up IPv4 addresses")
+hostip = interface_ips_v4(lp)
+try:
+hostip.remove('127.0.0.1')
+except ValueError:
+pass
+if not hostip:
+logger.error("No IPv4 addresses found")
+sys.exit(1)
+else:
+hostip = hostip[0]
+logger.debug("IPv4 addresses: %s" % hostip)
+
+logger.info("Looking up IPv6 addresses")
+hostip6 = interface_ips_v6(lp, linklocal=False)
+if not hostip6:
+hostip6 = None
+else:
+hostip6 = hostip6[0]
+logger.debug("IPv6 addresses: %s" % hostip6)
+
create_dns_partitions(ldbs.sam, domainsid, names, domaindn, forestdn,
dnsadmins_sid)
--
Samba Shared Repository
[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.56-1-g9fbd13e
The branch, 1.2.40 has been updated via 9fbd13ea7d3da5e297827e7763f336f484262f47 (commit) from 143ec438d9281a11fc7800921c2859a242037775 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40 - Log - commit 9fbd13ea7d3da5e297827e7763f336f484262f47 Author: Amitay Isaacs Date: Wed Jan 9 11:03:18 2013 +1100 scripts: Fix the variable name for sed expressions Signed-off-by: Amitay Isaacs --- Summary of changes: config/debug_locks.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/config/debug_locks.sh b/config/debug_locks.sh index 5b9efed..91cb405 100755 --- a/config/debug_locks.sh +++ b/config/debug_locks.sh @@ -13,7 +13,7 @@ out=$( cat /proc/locks | while read pid rest ; do pname=$(readlink /proc/$pid/exe) echo $pid $pname $rest -done | sed -e "$sed_fu" | grep "\.tdb" ) +done | sed -e "$sed_cmd" | grep "\.tdb" ) if [ -n "$out" ]; then # Log information about locks -- CTDB repository
