Re: [Samba] ddns in samba4
On 02/16/2012 09:27 PM, fe...@epepm.cupet.cu wrote: I followed this http://linuxcostablanca.blogspot.com/2012/01/samba-4-ubuntu.html and got dynamic dns updates working in forward zone. any ideas to get it working in the reverse zone too? By the way, nice article Steve. Best regards, Felix. Hi Felix. Not tried. Maybe Kai and the dns gurus can confirm if the s4 internal dns server will get you there: ./provision --realm= YOUR.REALM --domain=grupodetrabajo --adminpass=Abc@1234 --server-role='domain controller' --dns-backend=SAMBA_INTERNAL Salu2, Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 internal dns server cannot find ldap
Interfaces= 192.168.1.3 --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: steve [mailto:st...@steve-ss.com] Gesendet: Freitag, 17. Februar 2012 08:46 An: muel...@tropenklinik.de Cc: samba@lists.samba.org Betreff: Re: AW: [Samba] Samba4 internal dns server cannot find ldap On 02/17/2012 08:05 AM, Daniel Müller wrote: [global] server role = domain controller workgroup = CACTUS realm = hh3.site netbios name = HH3 passdb backend = samba4 template shell = /bin/bash interfaces= xxx.yyy.zzz # I think this is missing, in my case I need to set this for the internal dns to work. --- EDV Daniel Müller ./provision --realm= hh3.site --domain=CACTUS --adminpass=Abc@1234 --server-role='domain controller' --dns-backend=SAMBA_INTERNAL Hi Daniel What's the syntax of the xxx.yyy.zzz? my fqdn is hh3.hh3.site with IP 192.168.1.3 I'm on Ubuntu with bind9.9.0 beta at the moment. It's a test setup but to save fiddling around, can we keep what we already have? I thought of: tar /private /somewhere mv samba.conf smb.conf.steve provision --dns-backind=SAMBA_INTERNAL cp smb.conf.steve back to smb.conf add your interfaces=??? to it and hope for the best. Or are we talking about a clean install from nothing? Thanks, Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] How to Force Domain Clients to use new PDC
All systems are joined to the same domain and have the same SID,confirmed. I'm using the NT4 Server manager to look at status of all domain members, it displays the hierarchy of the domain, (I figure if an XP workstation (domain member,logged in as the domain admin) is picking up the change (it does indicate the change usually within 15 minutes of the BDC to PDC and vice versa). Workstations still report the old PDC when issuing an echo %logonserver% at the command line,which I understand from the old NT4 Server days,the BDC usually handles logon requests, but since I'm trying to make the shift to a TLS communication with the LDAP backend I stop the samba service on the non-TLS BDC and promote the BDC to PDC using the OS level and a couple other parameters. When it comes to the WINS servers,what I'm asking is IF I can make a change on them to recognize the new PDC faster by changing a parameter on them so that WINS leases (for lack of the parameter name at the moment) are refreshed and the new PDC recognize by all members of the domain faster? The two seem to be connected so if I can get WINS to distribute the new PDC to the rest of the domain faster. The Domain wide recognition of the new PDC takes too long the Hosts (LMHOSTS) file is not a good option in this case Date: Thu, 16 Feb 2012 11:59:00 -0500 From: gaiseric.van...@gmail.com To: samba@lists.samba.org Subject: Re: [Samba] How to Force Domain Clients to use new PDC Are all DC's truly in the same domain? (net getdomainsid command should show the same domain sid on all DC's.)Were the new servers joined to the existing domain when setting up or did you just configure the same domain name. What exactly are you using the NT4 server manager tool for? Presumably all samba DC's and clients are pointing to the same WINS server.Windows machines by default will prefer to authenticate against a BDC. You can try to change this by increasing the announce version and os level parameters in the smb.conf file.The only way to really force it is to NOT use wins and configure the client to use an lmhosts file to find the DC. On 02/16/12 09:37, Wikked One wrote: Good Morning Samba Team, We’ve been using Samba 3.4.8 and OpenLdap as an NT domain PDC for a number of years, running on CentOS 5.7 64 bit. In the meantime I’ve been configuring other systems to use a multimaster OpenLdap backend and implement TLS. Obviously the first system does not communicate with the other 2 systems (now registered as BDC system on the same domain). I have imported the user,group and computer groups into the newer systems so that all password and user information is synchronized. We are also use Samba4Wins as our WINS server….. Now my question: I can “promote” the target system I want to as the PDC by making a few changes to the smb.conf as well as the config file on the current PDC. When I use the old NT4 server manager tool the domain change seems to take a few minutes to register, however many of the domain member client systems (almost exclusively Windows XP Pro) are failing to recognize the change and still use the old PDC to login. How can I force the client systems to recognize the new PDC ?Is this dependent on the WINS servers? Thanks! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] How to Force Domain Clients to use new PDC
You could try stopping the wins service, backing up and deleting the wins.tdb and wins.dat file, then starting the wins server again. (this is for the wins service from samba 3- I don't know how samba4wins handles this.) This should make sure that only the new PDC registers itself in the WINS db. Before you do so, you may want to look at the existing wins db. I don't remember if the wins.dat file is created from the wins.tdb file or the other way around. You can use the tdbdump command on a TDB file. The wins database should list whether a machine is a logon server or browser. I suspect your existing wins database still has entries for the old DC's. I don't know how lonh the WINS database will keep old entries- it could be for days or weeks. There is also a tdbedit command that you could use to try to edit the wins TBD file (if applicable.) the only reason you might want to use lmhosts on a machine is to verify, with a single machine, that the new PDC really can handle the authentication/login from a client PC. Can you use the NT4 Wins Manager tool to query your WINS server? On 02/17/12 08:17, Wikked One wrote: All systems are joined to the same domain and have the same SID,confirmed. I'm using the NT4 Server manager to look at status of all domain members, it displays the hierarchy of the domain, (I figure if an XP workstation (domain member,logged in as the domain admin) is picking up the change (it does indicate the change usually within 15 minutes of the BDC to PDC and vice versa). Workstations still report the old PDC when issuing an echo %logonserver% at the command line,which I understand from the old NT4 Server days,the BDC usually handles logon requests, but since I'm trying to make the shift to a TLS communication with the LDAP backend I stop the samba service on the non-TLS BDC and promote the BDC to PDC using the OS level and a couple other parameters. When it comes to the WINS servers,what I'm asking is IF I can make a change on them to recognize the new PDC faster by changing a parameter on them so that WINS leases (for lack of the parameter name at the moment) are refreshed and the new PDC recognize by all members of the domain faster? The two seem to be connected so if I can get WINS to distribute the new PDC to the rest of the domain faster. The Domain wide recognition of the new PDC takes too long the Hosts (LMHOSTS) file is not a good option in this case Date: Thu, 16 Feb 2012 11:59:00 -0500 From: gaiseric.van...@gmail.com To: samba@lists.samba.org Subject: Re: [Samba] How to Force Domain Clients to use new PDC Are all DC's truly in the same domain? (net getdomainsid command should show the same domain sid on all DC's.) Were the new servers joined to the existing domain when setting up or did you just configure the same domain name. What exactly are you using the NT4 server manager tool for? Presumably all samba DC's and clients are pointing to the same WINS server. Windows machines by default will prefer to authenticate against a BDC. You can try to change this by increasing the announce version and os level parameters in the smb.conf file. The only way to really force it is to NOT use wins and configure the client to use an lmhosts file to find the DC. On 02/16/12 09:37, Wikked One wrote: Good Morning Samba Team, We’ve been using Samba 3.4.8 and OpenLdap as an NT domain PDC for a number of years, running on CentOS 5.7 64 bit. In the meantime I’ve been configuring other systems to use a multimaster OpenLdap backend and implement TLS. Obviously the first system does not communicate with the other 2 systems (now registered as BDC system on the same domain). I have imported the user,group and computer groups into the newer systems so that all password and user information is synchronized. We are also use Samba4Wins as our WINS server….. Now my question: I can “promote” the target system I want to as the PDC by making a few changes to the smb.conf as well as the config file on the current PDC. When I use the old NT4 server manager tool the domain change seems to take a few minutes to register, however many of the domain member client systems (almost exclusively Windows XP Pro) are failing to recognize the change and still use the old PDC to login. How can I force the client systems to recognize the new PDC ?Is this dependent on the WINS servers? Thanks! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] How to Force Domain Clients to use new PDC
Thanks for the response I appreciate it! I haven't had any exposure to the NT4 Wins manager tool,I'll hunt around for it as far as querying the Wins servers I usually use NSLookup and I've look at the output of tdbdump. I'll be researching the samba4wins available parameters around midweek next week, (just in case there are any further developments or replies on this) during the weekend. I've got a 4 day weekend .and I may not get to those config life parameters for Samba4wins till then. Date: Fri, 17 Feb 2012 10:14:26 -0500 From: gaiseric.van...@gmail.com To: wikk...@hotmail.com CC: samba@lists.samba.org Subject: Re: [Samba] How to Force Domain Clients to use new PDC You could try stopping the wins service, backing up and deleting the wins.tdb and wins.dat file, then starting the wins server again. (this is for the wins service from samba 3- I don't know how samba4wins handles this.) This should make sure that only the new PDC registers itself in the WINS db. Before you do so, you may want to look at the existing wins db. I don't remember if the wins.dat file is created from the wins.tdb file or the other way around. You can use the tdbdump command on a TDB file. The wins database should list whether a machine is a logon server or browser. I suspect your existing wins database still has entries for the old DC's. I don't know how lonh the WINS database will keep old entries- it could be for days or weeks. There is also a tdbedit command that you could use to try to edit the wins TBD file (if applicable.) the only reason you might want to use lmhosts on a machine is to verify, with a single machine, that the new PDC really can handle the authentication/login from a client PC. Can you use the NT4 Wins Manager tool to query your WINS server? On 02/17/12 08:17, Wikked One wrote: All systems are joined to the same domain and have the same SID,confirmed. I'm using the NT4 Server manager to look at status of all domain members, it displays the hierarchy of the domain, (I figure if an XP workstation (domain member,logged in as the domain admin) is picking up the change (it does indicate the change usually within 15 minutes of the BDC to PDC and vice versa). Workstations still report the old PDC when issuing an echo %logonserver% at the command line,which I understand from the old NT4 Server days,the BDC usually handles logon requests, but since I'm trying to make the shift to a TLS communication with the LDAP backend I stop the samba service on the non-TLS BDC and promote the BDC to PDC using the OS level and a couple other parameters. When it comes to the WINS servers,what I'm asking is IF I can make a change on them to recognize the new PDC faster by changing a parameter on them so that WINS leases (for lack of the parameter name at the moment) are refreshed and the new PDC recognize by all members of the domain faster? The two seem to be connected so if I can get WINS to distribute the new PDC to the rest of the domain faster. The Domain wide recognition of the new PDC takes too long the Hosts (LMHOSTS) file is not a good option in this case Date: Thu, 16 Feb 2012 11:59:00 -0500 From: gaiseric.van...@gmail.com To: samba@lists.samba.org Subject: Re: [Samba] How to Force Domain Clients to use new PDC Are all DC's truly in the same domain? (net getdomainsid command should show the same domain sid on all DC's.) Were the new servers joined to the existing domain when setting up or did you just configure the same domain name. What exactly are you using the NT4 server manager tool for? Presumably all samba DC's and clients are pointing to the same WINS server. Windows machines by default will prefer to authenticate against a BDC. You can try to change this by increasing the announce version and os level parameters in the smb.conf file. The only way to really force it is to NOT use wins and configure the client to use an lmhosts file to find the DC. On 02/16/12 09:37, Wikked One wrote: Good Morning Samba Team, We’ve been using Samba 3.4.8 and OpenLdap as an NT domain PDC for a number of
Re: [Samba] acl's, Samba4 and rw shares
Hi Aaron, hi everyone We gave it a go. And yes, we had a little chuckle wrt your references as to the output of samba-tool ntacl. We still have not sorted it 100% but at least it's workable. One of the conclusions we came to was that we don't think Samba4 is taking the acl from the disk. Here are our findings which of course, include the output from ntacl (worth a click just to see that!): http://linuxcostablanca.blogspot.com/2012/02/samba4-shares.html If anyone can help plz post. Thanks for your patience, Steve On 16/02/12 19:39, Aaron E. wrote: Setting the Permissions in windows is easy, browse to your server like so..start run \\server right click share properties, security tab -- if your unfamiliar with windows permissions I would read up on those.. being doable in linux,, hmm I'm sure it is but as I said I would create a share change windows permissions and look at them through linux, do that and you'll get the idea of what I'm talking about... Someone can correct me here if I step out of bounds but I don't think the samba team has gotten this far yet to make the samba-tool ntacl tree practical to use.. as far as how the perms are shared is relative to file-system support, that's what the user_xattr support on the mount point is for.. so it adds the support for the Linux mount to store the NTACLS , Hi Thanks for taking the time to explain this. Just thinking out loud, but since windows will be storing stuff on an ext4 filesystem, whatever the ntacl does must be doable in Linux too no? Or am I missing the point here? Anyway, the next stage is to find where to set the ntacl from the windows side. Is it a case of searching or is it buried deep inside the registry somewhere? BTW, we have setup the S4 users with posix attrs and files are stored correctly on both Linux and windows. We map via nss-pam-ldapd on Linux. Not set any ntacls there, so far that is since we've only just started to experiment with rw shares.. Cheers, Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Group membership updates
On Thu, Feb 16, 2012 at 10:38:05AM +0100, Luis Marqueta wrote: Hi, list. I'm running samba-3.5.4 + winbind on a RHEL 5 server. I'm trying to allow ssh logins to users in a particular Active Directory group in the TESTDOMAIN domain. My problem is that group membership seems to be updated when the user logs in. So, if a remove a user from the allowed group, the first login attempt is successful. H. I see. Is this a generic pam issue ? Doesn't pam get the group list for the user after a successful authentication (would seem like no sense doing it before) ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f758706 build: Add exceptions for callcatcher unused function
detection
via fb54ba1 wintest: Update Win2003 VM
via 674278d auth/kerberos: Move gse_get_session_key() to common code
and use in gensec_gssapi
via a315350 s3-gse: Allow kerberos key type OID to be optional
via 6088f44 s3-gse: Fix OID to read for kerberos key type
via 05cf2d4 s3-librpc: Remove backup declaration of GSS_C_DCE_STYLE
via 9eb8f07 s3-gse: Remove unused OID declaration
via 071f3c1 wintest: give host longer to register the SRV record
via a7569b6 wintest: use net rpc to put authenticated users into
TelentClients if we need to
via 111f8f4 wintest: Allow Windows VM to have no default route
from ed85e9f Replace smbd_server_connection_loop_once() with
tevent_loop_once() directly.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f758706bd93c88f1bd2510b5552260e8fdce5d96
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 15:42:25 2012 +1100
build: Add exceptions for callcatcher unused function detection
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Fri Feb 17 09:12:47 CET 2012 on sn-devel-104
commit fb54ba193bbeca6abee5c07e1626da2e1ad7773c
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 13:43:12 2012 +1100
wintest: Update Win2003 VM
commit 674278d5b0d68e96d68f7beab2289a502efa6bc4
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 13:36:35 2012 +1100
auth/kerberos: Move gse_get_session_key() to common code and use in
gensec_gssapi
Thie ensures that both code bases use the same logic to determine the use
of NEW_SPNEGO.
Andrew Bartlett
commit a315350341d7090402fe8fe2991d18fa530d2398
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 12:35:14 2012 +1100
s3-gse: Allow kerberos key type OID to be optional
commit 6088f44ed7830691c75846caccf63fcd810436c4
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 12:30:55 2012 +1100
s3-gse: Fix OID to read for kerberos key type
commit 05cf2d41cc16cf0ebd3605028a1723102449ccc3
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 12:04:19 2012 +1100
s3-librpc: Remove backup declaration of GSS_C_DCE_STYLE
All our supported krb5 libs provide this.
Andrew Bartlett
commit 9eb8f07fc42f7f4ee8685ce020b34838ace078b1
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 12:00:56 2012 +1100
s3-gse: Remove unused OID declaration
commit 071f3c15f265aba43b2bd4ec3c06766f2891530d
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 11:27:29 2012 +1100
wintest: give host longer to register the SRV record
commit a7569b68f96ca6f70e9e580e7067a31a411a3de3
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 11:27:02 2012 +1100
wintest: use net rpc to put authenticated users into TelentClients if we
need to
commit 111f8f4a7c86951c49dbc0f4c030d3a83d82b060
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 11:26:23 2012 +1100
wintest: Allow Windows VM to have no default route
---
Summary of changes:
auth/kerberos/gssapi_pac.c | 113
callcatcher-exceptions.grep | 22 ++
libcli/auth/krb5_wrap.h | 17 +
source3/include/smb_krb5.h | 12
source3/librpc/crypto/gse.c | 122 +--
source4/auth/gensec/gensec_gssapi.c | 55 ++-
wintest/conf/abartlet.conf |8 +-
wintest/wintest.py | 22 +-
8 files changed, 199 insertions(+), 172 deletions(-)
create mode 100644 callcatcher-exceptions.grep
Changeset truncated at 500 lines:
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index 70bc9e5..d0de11e 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -22,6 +22,7 @@
#ifdef HAVE_KRB5
#include libcli/auth/krb5_wrap.h
+#include lib/util/asn1.h
#if 0
/* FIXME - need proper configure/waf test
@@ -47,6 +48,26 @@ const gss_OID_desc * const gss_mech_krb5_old =
krb5_gss_oid_array+1;
const gss_OID_desc * const gss_mech_krb5_wrong= krb5_gss_oid_array+2;
#endif
+#ifndef GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
+#define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH 11
+#define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05
+#endif
+
+gss_OID_desc gse_sesskey_inq_oid = {
+ GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH,
+ (void *)GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
+};
+
+#ifndef GSS_KRB5_SESSION_KEY_ENCTYPE_OID
+#define GSS_KRB5_SESSION_KEY_ENCTYPE_OID_LENGTH 10
+#define GSS_KRB5_SESSION_KEY_ENCTYPE_OID
\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x04
+#endif
+
+gss_OID_desc
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 2be44d5 the lcov version has changed, as has the output format
from 909b72b Revive lcov reporting
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 2be44d5bd6d4370ebe81a28b10f224d958f920c8
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 19:45:43 2012 +1100
the lcov version has changed, as has the output format
---
Summary of changes:
buildfarm/__init__.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 380b47b..3708dc2 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -43,7 +43,7 @@ def read_trees_from_conf(path):
def lcov_extract_percentage(f):
Extract the coverage percentage from the lcov file.
-m = re.search('\td
class=headerItem.*?\Code\nbsp\;covered\:\\/td\.*?\n.*?\td
class=headerValue.*?\([0-9.]+) \%', f.read())
+m = re.search('\td class=headerCovTableEntryLo.*?\([0-9.]+) \%',
f.read())
if m:
return m.group(1)
else:
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via dad635c output callcatcher for non-samba builds as well
from 2be44d5 the lcov version has changed, as has the output format
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit dad635c9104962897942c0b7ec1f094ef0182547
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 21:01:16 2012 +1100
output callcatcher for non-samba builds as well
---
Summary of changes:
build_test.fns |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index d0299c5..173ba08 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -344,6 +344,9 @@ action_lcovreport() {
action_callcatcherreport() {
if [ $CALLCATCHER_REPORT = yes ]; then
case $tree in
+ tdb|talloc|ldb)
+ callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
+ ;;
samba_3_master*)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
;;
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 1e94282 add missing format string from dad635c output callcatcher for non-samba builds as well http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 1e94282a29a9528b7a2337d1b7c815a919e07c4c Author: Amitay Isaacs ami...@gmail.com Date: Fri Feb 17 17:55:08 2012 +1100 add missing format string --- Summary of changes: mail-dead-hosts.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py index 1499912..fada47e 100755 --- a/mail-dead-hosts.py +++ b/mail-dead-hosts.py @@ -53,7 +53,7 @@ why we have not heard from your host? If you no longer wish your host to participate in the Samba Build Farm, then please let us know so we can remove its records. -You can see the summary for your host at: +You can see the summary for your host at: %s Thanks, -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via b194d41 fix VACUUM to run on correct db from 1e94282 add missing format string http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit b194d41a998327c4cd3116088414bf5eb358ca28 Author: Andrew Bartlett abart...@samba.org Date: Fri Feb 17 21:25:59 2012 +1100 fix VACUUM to run on correct db --- Summary of changes: daily.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/daily.sh b/daily.sh index 8bc5304..9441b38 100755 --- a/daily.sh +++ b/daily.sh @@ -6,7 +6,7 @@ set -x ( date set -x -sqlite3 `dirname $0`/hostdb.sqlite 'VACUUM;' +sqlite3 `dirname $0`/db/hostdb.sqlite 'VACUUM;' cd `dirname $0` ./mail-dead-hosts.py echo deleting old file that are not used any more -- build.samba.org
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c35a7e8 auth: Allow the netbios name and domain to be set from winbindd in ntlm_auth3 via f433baa auth: Make more of the ntlmssp code private or static via 6b573e7 s3-auth: Use common gensec_ntlmssp via 27fb6f8 s3-auth: Use common gensec_ntlmssp_server_start via 3767fd4 s3-auth: Use the gensec-supplied DNS domain name and hostname. via 55c6304 auth: Provide a way to specify the NTLMSSP server name to GENSEC via c616ab0 s3-auth: Allow NTLMSSP features to be disabled with smb.conf options for testing via 8b8d1c3 auth: Rearrange ntlmssp code for clarity via 93fed62 s3-auth: Use the lpcfg_ wrapper calls to set some variables via db1ea56 s3-auth: Remove a layer of indirection and reorder to match gensec_ntlmssp_server_start() via 725d551 auth: Set NTLMSSP_NEGOTIATE_SIGN when session key support is required via 98992b5 s3-auth: Only allow LM_KEY cryptography when extra options are set via 82e3098 s3-auth: Inline ntlmssp_server_start() into gensec_ntlmssp3_server_start() via 9b147ce s3-auth Use the common gensec_ntlmssp_update in gensec_ntlmssp3_server via 9c5b26f s3-auth: Use common gensec_ntlmssp server functions for more of gensec_ntlmssp3_server via 2f74f2f s3-auth: Add extra error messages on authentication or authorization failure via b0aa49e auth: Cope with NO_USER_SESSION_KEY from security=server via 52ac479 auth: Move the rest of the source4 gensec_ntlmssp code to the top level via 8adde1b s3-auth Hook checking passwords and generating session_info via the auth4_context via a68d4cc s3-build: Use credentials_ntlm.c in the autoconf build as well from f758706 build: Add exceptions for callcatcher unused function detection http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c35a7e8c478062de0d5d6771b59e0430cd9706c3 Author: Andrew Bartlett abart...@samba.org Date: Mon Feb 6 18:02:11 2012 +1100 auth: Allow the netbios name and domain to be set from winbindd in ntlm_auth3 Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Fri Feb 17 12:18:51 CET 2012 on sn-devel-104 commit f433baa3c8a995cbbeecdcbc75f8ae503a5ae4b6 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 21:20:34 2012 +1100 auth: Make more of the ntlmssp code private or static Now that there is only one gensec_ntlmssp server, some of these functions can be static For the rest, put the implemtnation of the gensec_ntlmssp code into ntlmssp_private.h Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit 6b573e73fc5d2787ed4165024957501a7c37c27a Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 16:29:02 2012 +1100 s3-auth: Use common gensec_ntlmssp There is no longer any samba3-specific code left here. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit 27fb6f85e7f796cafff5900d3428cc5c2c89e87d Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 16:19:32 2012 +1100 s3-auth: Use common gensec_ntlmssp_server_start This is now identical code, so there is no need to duplicate it. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit 3767fd42556d2f6bdee07d2ba20e7a78065e0346 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 16:17:48 2012 +1100 s3-auth: Use the gensec-supplied DNS domain name and hostname. Also have a reasonable fallback for when it is not set. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit 55c630404a999180e3bd9dd697d526fc3e21cd3b Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 16:17:04 2012 +1100 auth: Provide a way to specify the NTLMSSP server name to GENSEC This avoids us needing to assume lp_netbios_name().lp_dnsdomain() if the caller knows better. This will allow preservation of current s3 behaviour. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit c616ab09655611e560f98f3c949a06c389b87767 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 16:01:45 2012 +1100 s3-auth: Allow NTLMSSP features to be disabled with smb.conf options for testing Signed-off-by: Stefan Metzmacher me...@samba.org commit 8b8d1c3a63e336d3d872bb3ea10331e5496a82e9 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 15:57:06 2012 +1100 auth: Rearrange ntlmssp code for clarity Signed-off-by: Stefan Metzmacher me...@samba.org commit 93fed62543ae6cee5ec26fda532c4ed8a650f74f Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 31 15:52:17 2012 +1100 s3-auth: Use the lpcfg_ wrapper
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 476d503 lib/util: Remove unused sys_sendto()
via 245d47f lib/util: Remove unused sys_recv()
via 057b87d lib/util: Remove unused sys_inet_makeaddr()
via c8c3f0c lib/util: Remove unused sys_gethostbyname()
via b190e3c s3-lib: Remove unused standard_sub_conn()
via 846a697 s3-lib Remove unused sys_fcntl_long()
via 59d1faa s3-lib Remove unused sys_fseek()
via 3b5326e s3-registry Remove unused dup_registry_value() and
free_registry_value()
from c35a7e8 auth: Allow the netbios name and domain to be set from
winbindd in ntlm_auth3
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 476d503d246a563c552a3ba8d7fe3230bec5914e
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:58:27 2012 +1100
lib/util: Remove unused sys_sendto()
Found by callcatcher.
Andrew Bartlett
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Fri Feb 17 13:48:05 CET 2012 on sn-devel-104
commit 245d47f233fcc53aa93503cd876aaf487d89d6e7
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:57:21 2012 +1100
lib/util: Remove unused sys_recv()
Found by callcatcher.
Andrew Bartlett
commit 057b87d0bd4dec88f414dd0dffd0c3481d26faa4
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:55:10 2012 +1100
lib/util: Remove unused sys_inet_makeaddr()
Found by callcatcher.
Andrew Bartlett
commit c8c3f0c608aa1b11717f1da6793ac9ca0d38a14f
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:54:24 2012 +1100
lib/util: Remove unused sys_gethostbyname()
Found by callcatcher.
Andrew Bartlett
commit b190e3cd79a7de79c62ad58fdc9d768ae96dc5e9
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:51:22 2012 +1100
s3-lib: Remove unused standard_sub_conn()
commit 846a697e20478798288afb43cdb7a9f389a15c69
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:05:58 2012 +1100
s3-lib Remove unused sys_fcntl_long()
commit 59d1faa1a30abd2a4e3cdaf0db1aa736283f822c
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 12:04:23 2012 +1100
s3-lib Remove unused sys_fseek()
commit 3b5326e987e3fe1f57502cbfd9d25b14cdf2b434
Author: Andrew Bartlett abart...@samba.org
Date: Thu Feb 9 11:06:13 2012 +1100
s3-registry Remove unused dup_registry_value() and free_registry_value()
---
Summary of changes:
lib/util/samba_util.h |8 -
lib/util/system.c | 51 --
source3/include/proto.h|5 ---
source3/lib/substitute.c | 19 ---
source3/lib/system.c | 67
source3/registry/reg_objects.c | 54
source3/registry/reg_objects.h |2 -
7 files changed, 0 insertions(+), 206 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 8e8e7c1..a0989d5 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -117,14 +117,6 @@ void CatchChildLeaveStatus(void);
void *sys_memalign( size_t align, size_t size );
-/**
-A wrapper for gethostbyname() that tries avoids looking up hostnames
-in the root domain, which can cause dial-on-demand links to come up for no
-apparent reason.
-/
-_PUBLIC_ struct hostent *sys_gethostbyname(const char *name);
-_PUBLIC_ struct in_addr sys_inet_makeaddr(int net, int host);
-
/**
* Wrapper for fork used to invalid pid cache.
**/
diff --git a/lib/util/system.c b/lib/util/system.c
index 1e80f1a..8625229 100644
--- a/lib/util/system.c
+++ b/lib/util/system.c
@@ -76,57 +76,6 @@ void *sys_memalign( size_t align, size_t size )
}
/**
-A wrapper for gethostbyname() that tries avoids looking up hostnames
-in the root domain, which can cause dial-on-demand links to come up for no
-apparent reason.
-/
-
-_PUBLIC_ struct hostent *sys_gethostbyname(const char *name)
-{
-#ifdef REDUCE_ROOT_DNS_LOOKUPS
- char query[256], hostname[256];
- char *domain;
-
- /* Does this name have any dots in it? If so, make no change */
-
- if (strchr(name, '.'))
- return(gethostbyname(name));
-
- /* Get my hostname, which should have domain name
- attached. If not, just do the gethostname on the
- original string.
- */
-
- gethostname(hostname, sizeof(hostname) - 1);
- hostname[sizeof(hostname) - 1] =
Re: Replace smbd_server_connection_loop_once() with tevent_loop_once() directly.
On Fri, Feb 17, 2012 at 08:11:06AM +0100, Stefan (metze) Metzmacher wrote: Hi Jeremy, - Log - commit ed85e9fe6a10d3c34b74788e6f862ea23dce4f2b Author: Jeremy Allison j...@samba.org Date: Thu Feb 16 16:14:14 2012 -0800 Replace smbd_server_connection_loop_once() with tevent_loop_once() directly. We no longer need to call poll() directly inside smbd ! Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Fri Feb 17 02:49:13 CET 2012 on sn-devel-104 Are you sure you want to remove the START_PROFILE(smbd_idle); part? Yes, I thought about that and decided I did. Is it worth duplicating that entire function just to keep that ? It isn't widely used. Jeremy
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 32c82fe s4:lib/tls - include GNUTLS headers consistently using ...
via fa89f27 s4:samba-tool fsmo * - fix missing takes_optiongroups
from 476d503 lib/util: Remove unused sys_sendto()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 32c82fe69b588fe18674c0bda49cd7fc0f73f50a
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Fri Feb 17 22:58:07 2012 +0100
s4:lib/tls - include GNUTLS headers consistently using ...
These are system-specific.
Reviewed-by: Jelmer
Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Sat Feb 18 00:43:58 CET 2012 on sn-devel-104
commit fa89f2756f2d56ff83a5a6646ccff759b03f900d
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Fri Feb 17 21:24:48 2012 +0100
s4:samba-tool fsmo * - fix missing takes_optiongroups
This has been reported in bug #8755.
Reviewed-by: Jelmer
---
Summary of changes:
source4/lib/tls/tls.c |2 +-
source4/lib/tls/tls_tstream.c |2 +-
source4/lib/tls/tlscert.c |4 ++--
source4/scripting/python/samba/netcmd/fsmo.py | 12
source4/utils/tests/test_samba_tool.sh|2 ++
5 files changed, 18 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 82cf260..7bf2ff8 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -28,7 +28,7 @@
#include param/param.h
#if ENABLE_GNUTLS
-#include gnutls/gnutls.h
+#include gnutls/gnutls.h
#define DH_BITS 1024
diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index eb4a6d9..6bb68fb 100644
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -25,7 +25,7 @@
#include lib/tls/tls.h
#if ENABLE_GNUTLS
-#include gnutls/gnutls.h
+#include gnutls/gnutls.h
#define DH_BITS 1024
diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
index bef6348..0c780ea 100644
--- a/source4/lib/tls/tlscert.c
+++ b/source4/lib/tls/tlscert.c
@@ -22,8 +22,8 @@
#include includes.h
#if ENABLE_GNUTLS
-#include gnutls/gnutls.h
-#include gnutls/x509.h
+#include gnutls/gnutls.h
+#include gnutls/x509.h
#if HAVE_GCRYPT_H
#include gcrypt.h
#endif
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py
b/source4/scripting/python/samba/netcmd/fsmo.py
index 958e5b8..f4e03b2 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -125,6 +125,12 @@ class cmd_fsmo_show(Command):
synopsis = %prog [options]
+takes_optiongroups = {
+sambaopts: options.SambaOptions,
+credopts: options.CredentialsOptions,
+versionopts: options.VersionOptions,
+}
+
takes_options = [
Option(-H, --URL, help=LDB URL for database or target server,
type=str,
metavar=URL, dest=H),
@@ -182,6 +188,12 @@ class cmd_fsmo_transfer(Command):
synopsis = %prog [options]
+takes_optiongroups = {
+sambaopts: options.SambaOptions,
+credopts: options.CredentialsOptions,
+versionopts: options.VersionOptions,
+}
+
takes_options = [
Option(-H, --URL, help=LDB URL for database or target server,
type=str,
metavar=URL, dest=H),
diff --git a/source4/utils/tests/test_samba_tool.sh
b/source4/utils/tests/test_samba_tool.sh
index 0e03ee4..7057312 100755
--- a/source4/utils/tests/test_samba_tool.sh
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -40,4 +40,6 @@ testit domain level.show $VALGRIND $samba_tool domain level
show
testit domain info $VALGRIND $samba_tool domain info $SERVER_IP
+testit fsmo show $VALGRIND $samba_tool fsmo show
+
exit $failed
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e786e8f auth: Reorder arguments to generate_session_info
via dd479bd selftest: Fix selftest to check ADS functionalty again
from 32c82fe s4:lib/tls - include GNUTLS headers consistently using ...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e786e8fef9960aadf1e94c70c0fb7ec18c1ed237
Author: Andrew Bartlett abart...@samba.org
Date: Sat Feb 4 17:49:49 2012 +1100
auth: Reorder arguments to generate_session_info
This matches check_ntlm_password() and generate_session_info_pac()
Andrew Bartlett
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Sat Feb 18 02:19:35 CET 2012 on sn-devel-104
commit dd479bd2927a6b470e2b6c6b89ef0e4fdd457d55
Author: Andrew Bartlett abart...@samba.org
Date: Sat Feb 18 10:35:24 2012 +1100
selftest: Fix selftest to check ADS functionalty again
This was found by looking over the lcov output on build.samba.org
The new have_ads() check also now dies if it cannot run smbd, to avoid
this in future.
Andrew Bartlett
---
Summary of changes:
auth/common_auth.h |4 ++--
auth/ntlmssp/gensec_ntlmssp_server.c |2 +-
selftest/target/Samba3.pm| 18 ++
source3/auth/auth_ntlmssp.c |4 ++--
source3/auth/proto.h |4 ++--
source4/auth/ntlm/auth.c | 14 +++---
source4/auth/ntlm/auth_simple.c |3 ++-
source4/smb_server/smb/sesssetup.c |8
8 files changed, 30 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/common_auth.h b/auth/common_auth.h
index d9996e1..c0fd6b6 100644
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -117,8 +117,8 @@ struct auth4_context {
NTSTATUS (*set_challenge)(struct auth4_context *auth_ctx, const uint8_t
chal[8], const char *set_by);
- NTSTATUS (*generate_session_info)(TALLOC_CTX *mem_ctx,
- struct auth4_context *auth_context,
+ NTSTATUS (*generate_session_info)(struct auth4_context *auth_context,
+ TALLOC_CTX *mem_ctx,
void *server_returned_info,
const char *original_user_name,
uint32_t session_info_flags,
diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c
b/auth/ntlmssp/gensec_ntlmssp_server.c
index 8f45c2c..a1d43e6 100644
--- a/auth/ntlmssp/gensec_ntlmssp_server.c
+++ b/auth/ntlmssp/gensec_ntlmssp_server.c
@@ -235,7 +235,7 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security
*gensec_security,
session_info_flags |= AUTH_SESSION_INFO_DEFAULT_GROUPS;
if (gensec_security-auth_context
gensec_security-auth_context-generate_session_info) {
- nt_status =
gensec_security-auth_context-generate_session_info(mem_ctx,
gensec_security-auth_context,
+ nt_status =
gensec_security-auth_context-generate_session_info(gensec_security-auth_context,
mem_ctx,
gensec_ntlmssp-server_returned_info,
gensec_ntlmssp-ntlmssp_state-user,
session_info_flags,
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e8a03e7..2696014 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -12,15 +12,17 @@ use POSIX;
use target::Samba;
sub have_ads($) {
-my ($self);
+my ($self) = @_;
my $found_ads = 0;
- my $smbd_build_options = Samba::bindir_path($self, smbd) . -b;
- my @build_options = `$smbd_build_options`;
- foreach my $option (@build_options) {
- if ($option =~ WITH_ADS) {
- $found_ads = 1;
- }
- }
+my $smbd_build_options = Samba::bindir_path($self, smbd) . -b|;
+open(IN, $smbd_build_options) or die(Unable to run
$smbd_build_options: $!);
+
+while (IN) {
+if (/WITH_ADS/) {
+ $found_ads = 1;
+}
+}
+ close IN;
# If we were not built with ADS support, pretend we were never even
available
return $found_ads;
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 7b632fd..582c8dc 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -24,8 +24,8 @@
#include includes.h
#include auth.h
-NTSTATUS auth3_generate_session_info(TALLOC_CTX *mem_ctx,
-struct auth4_context *auth_context,
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/2012-02-18-0258/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-18-0258/samba3.stderr http://git.samba.org/autobuild.flakey/2012-02-18-0258/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-18-0258/samba4.stderr http://git.samba.org/autobuild.flakey/2012-02-18-0258/samba4.stdout The top commit at the time of the failure was: commit 32c82fe69b588fe18674c0bda49cd7fc0f73f50a Author: Matthias Dieter Wallnöfer m...@samba.org Date: Fri Feb 17 22:58:07 2012 +0100 s4:lib/tls - include GNUTLS headers consistently using ... These are system-specific. Reviewed-by: Jelmer Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org Autobuild-Date: Sat Feb 18 00:43:58 CET 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 21528da Fix a bunch of unused variable warnings.
from e786e8f auth: Reorder arguments to generate_session_info
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 21528da9cd12a4f5c3792a482a5d18fe946a6f7a
Author: Jeremy Allison j...@samba.org
Date: Fri Feb 17 14:12:40 2012 -0800
Fix a bunch of unused variable warnings.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Feb 18 06:22:40 CET 2012 on sn-devel-104
---
Summary of changes:
source3/lib/charcnv.c | 74 ---
source3/librpc/crypto/gse.c | 12 +++---
source3/libsmb/clisymlink.c |7 +--
source3/printing/print_iprint.c |5 --
source3/smbd/process.c |3 -
source3/smbd/reply.c|2 -
source3/smbd/smb2_close.c |2 -
source3/smbd/smb2_create.c |4 --
source3/smbd/smb2_find.c|4 --
source3/smbd/smb2_getinfo.c |4 --
source3/smbd/smb2_ioctl.c |3 -
source3/smbd/smb2_notify.c |3 -
source3/smbd/smb2_read.c|4 --
source3/smbd/smb2_server.c |2 -
source3/smbd/smb2_write.c |4 --
source3/smbd/trans2.c |2 -
source3/winbindd/wb_group_members.c |4 +-
source3/winbindd/winbindd_cache.c |3 -
source3/winbindd/winbindd_rpc.c |2 -
19 files changed, 11 insertions(+), 133 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index ecf62e5..5863d72 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -297,80 +297,6 @@ static size_t push_ucs2(const void *base_ptr, void *dest,
const char *src, size_
return len;
}
-
-
-/**
- Copy a string from a ucs2 source to a unix char* destination.
- Flags can have:
- STR_TERMINATE means the string in src is null terminated.
- STR_NOALIGN means don't try to align.
- if STR_TERMINATE is set then src_len is ignored if it is -1.
- src_len is the length of the source area in bytes
- Return the number of bytes occupied by the string in src.
- The resulting string in dest is always null terminated.
-**/
-
-static size_t pull_ucs2(const void *base_ptr, char *dest, const void *src,
size_t dest_len, size_t src_len, int flags)
-{
- size_t size = 0;
- size_t ucs2_align_len = 0;
- bool ret;
-
- if (dest_len == (size_t)-1) {
- /* No longer allow dest_len of -1. */
- smb_panic(pull_ucs2 - invalid dest_len of -1);
- }
-
- if (!src_len) {
- if (dest dest_len 0) {
- dest[0] = '\0';
- }
- return 0;
- }
-
- if (ucs2_align(base_ptr, src, flags)) {
- src = (const void *)((const char *)src + 1);
- if (src_len != (size_t)-1)
- src_len--;
- ucs2_align_len = 1;
- }
-
- if (flags STR_TERMINATE) {
- /* src_len -1 is the default for null terminated strings. */
- if (src_len != (size_t)-1) {
- size_t len = strnlen_w((const smb_ucs2_t *)src,
- src_len/2);
- if (len src_len/2)
- len++;
- src_len = len*2;
- }
- }
-
- /* ucs2 is always a multiple of 2 bytes */
- if (src_len != (size_t)-1)
- src_len = ~1;
-
- ret = convert_string(CH_UTF16LE, CH_UNIX, src, src_len, dest, dest_len,
size);
- if (ret == false) {
- size = 0;
- dest_len = 0;
- }
-
- if (src_len == (size_t)-1)
- src_len = size*2;
-
- if (dest_len size) {
- /* Did we already process the terminating zero ? */
- if (dest[MIN(size-1, dest_len-1)] != 0) {
- dest[MIN(size, dest_len-1)] = 0;
- }
- } else {
- dest[0] = 0;
- }
-
- return src_len + ucs2_align_len;
-}
-
/**
Copy a string from a ucs2 source to a unix char* destination.
Talloc version with a base pointer.
diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 1ce3761..9c18443 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -78,7 +78,7 @@ static bool gss_oid_equal(const gss_OID o1, const gss_OID o2)
static int gse_context_destructor(void *ptr)
{
struct gse_context *gse_ctx;
- OM_uint32 gss_min, gss_maj;
+ OM_uint32 gss_min;
gse_ctx = talloc_get_type_abort(ptr, struct gse_context);
if (gse_ctx-k5ctx) {
@@ -94,24 +94,24 @@ static int gse_context_destructor(void *ptr)
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via f4cf0c5 also return unfiltered callanalyse output
from b194d41 fix VACUUM to run on correct db
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit f4cf0c5976dcdd23d7ef9f2089d2bf00e8b62832
Author: Andrew Bartlett abart...@samba.org
Date: Sat Feb 18 17:15:52 2012 +1100
also return unfiltered callanalyse output
---
Summary of changes:
build_test.fns |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 173ba08..50ab43c 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -347,11 +347,9 @@ action_callcatcherreport() {
tdb|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
;;
- samba_3_master*)
- callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
- ;;
- samba_4*)
- callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
+ samba_3_master|samba_4*)
+ callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/all-unused-fns.txt
+ grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/all-unused-fns.txt $builddir/coverage/unused-fns.txt
;;
esac
rc=$?
--
build.samba.org
