From bef3fc8527114adbaecaf6a7bbf17d49e598bf60 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 17:05:33 +0200 Subject: tsocket: Pass the full port number to getaddrinfo(). The code stripped port numbers above 9999 down to 4 digits. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Mon Jul 1 21:10:53 CEST 2013 on sn-devel-104 Autobuild-User(v4-1-test): Karolin Seeger Autobuild-Date(v4-1-test): Tue Jul 2 13:07:35 CEST 2013 on sn-devel-104 --- lib/tsocket/tsocket_bsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index 4417f8e045..fe39dfd540 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -389,7 +389,7 @@ int _tsocket_address_inet_from_strings(TALLOC_CTX *mem_ctx, return -1; } - snprintf(port_str, sizeof(port_str) - 1, "%u", port); + snprintf(port_str, sizeof(port_str), "%u", port); ret = getaddrinfo(addr, port_str, &hints, &result); if (ret != 0) { -- cgit From 67c8f87c777d850cf9ec0080b4daa09adf40ec55 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 2 Jul 2013 15:24:40 +0200 Subject: torture: Fix comparsion of uninitalized bytes. As we compare string make sure we have the null terminator. Found by valgrind. Signed-off-by: Andreas Schneider Reviewed-by: Volker Lendecke (cherry picked from commit 474eee0df7893a3a4546e1c6ea47220700c5b99f) --- source4/torture/raw/session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c index 5b5b782a1c..fbfdced2f8 100644 --- a/source4/torture/raw/session.c +++ b/source4/torture/raw/session.c @@ -70,6 +70,8 @@ static bool test_session_reauth1(struct torture_context *tctx, torture_assert_ntstatus_ok_goto(tctx, status, ok, done, "setup2"); torture_assert_int_equal_goto(tctx, io.out.vuid, vuid1, ok, done, "setup2"); + buf[dlen] = '\0'; + num = smbcli_read(cli->tree, fnum, &buf, 0, dlen); torture_assert_int_equal_goto(tctx, num, dlen, ok, done, "read file"); torture_assert_str_equal_goto(tctx, buf, data, ok, done, "read file"); -- cgit From 096ff2e977694d1042567fb4b3bb97d9c8122eb7 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 13:02:43 +0200 Subject: torture: Don't segfault in raw.session on error. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison (cherry picked from commit d295e18409a2e18e52c5bb76fec0e0540b6199cf) --- source4/torture/raw/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c index fbfdced2f8..1937ef7a78 100644 --- a/source4/torture/raw/session.c +++ b/source4/torture/raw/session.c @@ -240,7 +240,7 @@ static bool test_session_expire1(struct torture_context *tctx) char fname[256]; union smb_fileinfo qfinfo; uint16_t vuid; - uint16_t fnum; + uint16_t fnum = 0; struct smb_composite_sesssetup io_sesssetup; size_t i; -- cgit From 99c800bbd8e20be51c4c6a70fa1d4e8324dc7a12 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 13:02:44 +0200 Subject: torture: Don't segfault in smb2.session on error. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison (cherry picked from commit bf5bc723da0605c7bc796f5e047e3f041db0b943) --- source4/torture/smb2/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c index 9592b5ef8d..6901f47300 100644 --- a/source4/torture/smb2/session.c +++ b/source4/torture/smb2/session.c @@ -863,7 +863,7 @@ static bool test_session_expire1(struct torture_context *tctx) const char *host = torture_setting_string(tctx, "host", NULL); const char *share = torture_setting_string(tctx, "share", NULL); struct cli_credentials *credentials = cmdline_credentials; - struct smb2_tree *tree; + struct smb2_tree *tree = NULL; enum credentials_use_kerberos use_kerberos; char fname[256]; struct smb2_handle _h1; -- cgit From 6a0cb7d47766128231e6f2db82f02bef559f7b6c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 13:02:45 +0200 Subject: selftest: Fix domain name of plugindc. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison (cherry picked from commit 7392985b2981cb82be5f99255faae1605972be53) --- selftest/target/Samba4.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 495cc23d5c..e279beb3ea 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1465,7 +1465,7 @@ sub provision_plugin_s4_dc($$) "domain controller", "plugindc", "PLUGINDOMAIN", - "plugin.samba.example.com", + "plugindc.samba.example.com", "2008", "locDCpass1", undef, $extra_smbconf_options, -- cgit From bb122b056ba47a3ac4a4ff6cdea410ca916ec0bf Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 13:02:46 +0200 Subject: selftest: Add a newline to root entries in the nss files. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison (cherry picked from commit d5511b125ccfd9c46cad63796aa49258bcc0ae38) --- selftest/target/Samba3.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 91a8133e71..26f5e92898 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1124,7 +1124,8 @@ $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false pdbtest:x:$uid_pdbtest:$gid_nogroup:pdbtest gecos:$prefix_abs:/bin/false "; if ($unix_uid != 0) { - print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false"; + print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false +"; } close(PASSWD); @@ -1139,7 +1140,8 @@ domusers:X:$gid_domusers: domadmins:X:$gid_domadmins: "; if ($unix_gids[0] != 0) { - print GROUP "root:x:$gid_root:"; + print GROUP "root:x:$gid_root: +"; } close(GROUP); -- cgit From c153e6c1d93b961df288778333ff906450080f24 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 13:02:47 +0200 Subject: selftest: Use higher ip numbers. 127.0.0.2 is used by some distributions to resolve the own hostname. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison (cherry picked from commit a4af4fa9db768dce2e009ba132cf88525a9b8314) --- selftest/target/Samba.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index fa18985433..ab3851f67e 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -150,11 +150,12 @@ sub get_interface($) $netbiosname = lc($netbiosname); my %interfaces = (); - $interfaces{"locals3dc2"} = 2; - $interfaces{"localmember3"} = 3; - $interfaces{"localshare4"} = 4; - $interfaces{"localktest6"} = 6; - $interfaces{"maptoguest"} = 7; + $interfaces{"locals3dc2"} = 3; + $interfaces{"localmember3"} = 4; + $interfaces{"localshare4"} = 5; + + $interfaces{"localktest6"} = 7; + $interfaces{"maptoguest"} = 8; # 11-16 used by selftest.pl for client interfaces -- cgit From 47bd903e780cc2c42f0003824f3ea0f67228986b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 1 Jul 2013 13:02:48 +0200 Subject: s3-winbind: Allow sec_initial_uid() to store creds. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Jul 2 23:26:24 CEST 2013 on sn-devel-104 (cherry picked from commit caf3af33deeea9bee61a741fcc991285006cc6f5) --- source3/winbindd/winbindd_ccache_access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c index 5557b959f0..7787b3e007 100644 --- a/source3/winbindd/winbindd_ccache_access.c +++ b/source3/winbindd/winbindd_ccache_access.c @@ -168,7 +168,7 @@ static bool check_client_uid(struct winbindd_cli_state *state, uid_t uid) return False; } - if (uid != ret_uid) { + if (uid != ret_uid && ret_uid != sec_initial_uid()) { DEBUG(1, ("check_client_uid: Client lied about its uid: said %u, " "actually was %u; denying access\n", (unsigned int)uid, (unsigned int)ret_uid)); -- cgit From d641469b3522c1fc0ebece262ed6eff66f5f99be Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sun, 30 Jun 2013 01:59:53 -0700 Subject: Make the output of the crackname script more readable Signed-off-by: Matthieu Patou Reviewed-by: Andreas Schneider Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Jul 3 23:17:57 CEST 2013 on sn-devel-104 (cherry picked from commit 2536ee8b640c1257dbe28a977ae0b48a62093d0c) Autobuild-User(v4-1-test): Karolin Seeger Autobuild-Date(v4-1-test): Thu Jul 4 11:47:53 CEST 2013 on sn-devel-104 --- source4/scripting/devel/crackname | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/scripting/devel/crackname b/source4/scripting/devel/crackname index b6a372ea96..2e1798511f 100755 --- a/source4/scripting/devel/crackname +++ b/source4/scripting/devel/crackname @@ -71,8 +71,8 @@ if __name__ == "__main__": req.names = [names] (result, ctr) = drs.DsCrackNames(drs_handle, 1, req) - print "# of result %d" %ctr.count + print "# of result = %d" %ctr.count if ctr.count: - print ctr.array[0].status - print ctr.array[0].result_name - print ctr.array[0].dns_domain_name + print "status = %d" % ctr.array[0].status + print "result name = %s" % ctr.array[0].result_name + print "domain = %s" % ctr.array[0].dns_domain_name -- cgit From 0025e9782d6a2d9df56556871566a3354996a999 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Fri, 5 Jul 2013 10:04:37 +0200 Subject: WHATSNEW: Start release notes for Samba 4.1.0rc1. Signed-off-by: Karolin Seeger --- WHATSNEW.txt | 290 ++++++++++------------------------------------------------- 1 file changed, 49 insertions(+), 241 deletions(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 25bd1ab4f6..4c1e769e78 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,289 +1,97 @@ Release Announcements ===================== -This is the second release candidate of Samba 4.0. This is *not* +This is the first release candidate of Samba 4.1. This is *not* intended for production environments and is designed for testing purposes only. Please report any defects via the Samba bug reporting system at https://bugzilla.samba.org/. -Samba 4.0 will be the next version of the Samba suite and incorporates -all the technology found in both the Samba4 series and the -stable 3.x series. The primary additional features over Samba 3.6 are +Samba 4.1 will be the next version of the Samba suite and includes +all the technology found in both the Samba4 series and the stable 3.x +series. The primary additional features over Samba 3.6 are support for the Active Directory logon protocols used by Windows 2000 and above. -This release contains the best of all of Samba's -technology parts, both a file server (that you can reasonably expect -to upgrade existing Samba 3.x releases to) and the AD domain -controller work previously known as 'samba4'. - -If you are upgrading, or looking to develop, test or deploy Samba 4.0 +If you are upgrading, or looking to develop, test or deploy Samba 4.1 releases candidates, you should backup all configuration and data. UPGRADING ========= -Users upgrading from Samba 3.x domain controllers and wanting to use -Samba 4.0 as an AD DC should use the 'samba-tool domain -classicupgrade' command. See the wiki for more details: -https://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO. - -Users upgrading from Samba 4.0 alpha and beta releases since alpha15 -should run 'samba-tool dbcheck --cross-ncs --fix' before re-starting -Samba. Users upgrading from earlier alpha releases should contact the -team for advice. - -Users upgrading an AD DC from any previous release should run -'samba-tool ntacl sysvolreset' to re-sync ACLs on the sysvol share -with those matching the GPOs in LDAP and the defaults from an initial -provision. This will set an underlying POSIX ACL if required (eg not -using the NTVFS file server). - -If you used the BIND9_FLATFILE or BIND9_DLZ features, -you'll have to add '-dns' to the 'server services' option, -as the internal dns server (SAMBA_INTERNAL) is the default now. NEW FEATURES ============ -Samba 4.0 supports the server-side of the Active Directory logon -environment used by Windows 2000 and later, so we can do full domain -join and domain logon operations with these clients. - -Our Domain Controller (DC) implementation includes our own built-in -LDAP server and Kerberos Key Distribution Center (KDC) as well as the -Samba3-like logon services provided over CIFS. We correctly generate -the infamous Kerberos PAC, and include it with the Kerberos tickets we -issue. - -Samba 4.0.0rc2 ships with two distinct file servers. We now use the -file server from the Samba 3.x series 'smbd' for all file serving by -default. - -Samba 4.0 also ships with the 'NTVFS' file server. This file server -is what was used in all previous releases of Samba 4.0, and is -tuned to match the requirements of an AD domain controller. We -continue to support this, not only to provide continuity to -installations that have deployed it as part of an AD DC, but also as a -running example of the NT-FSA architecture we expect to move smbd to in -the longer term. - -For pure file server work, the binaries users would expect from that -series (nmbd, winbindd, smbpasswd) continue to be available. When -running an AD DC, you only need to run 'samba' (not -nmbd/smbd/winbind), as the required services are co-coordinated by this -master binary. - -As DNS is an integral part of Active Directory, we also provide two DNS -solutions, a simple internal DNS server for 'out of the box' configurations -and a more elaborate BIND plugin using the BIND DLZ mechanism in versions -9.8 and 9.9. During the provision, you can select which backend to use. -With the internal backend, your DNS server is good to go. -If you chose the BIND_DLZ backend, a configuration file will be generated -for bind to make it use this plugin, as well as a file explaining how to -set up bind. - -To provide accurate timestamps to Windows clients, we integrate with -the NTP project to provide secured NTP replies. To use you need to -start ntpd and configure it with the 'restrict ... ms-sntp' and -ntpsigndsocket options. - -Finally, a new scripting interface has been added to Samba 4, allowing -Python programs to interface to Samba's internals, and many tools and -internal workings of the DC code is now implemented in python. +Directory database replication (AD DC mode) +=========================================== +Directory replication has been reworked in order to improve the +correctness and efficiency. +As a net effect of it, replication with other domain controllers with +a heavily modified schema is now possible (ie. Windows 2012 DCs or +other Windows DC with exchange installed) and replication didn't fail +anymore in such environments. -###################################################################### -Changes -####### -smb.conf changes ----------------- - - Parameter Name Description Default - -------------- ----------- ------- - - allow dns updates New secure only - announce as Removed - announce version Removed - cldap port New 0 - client max protocol New - client min protocol New - client signing Changed default default - dcerpc endpoint servers New - dgram port New 0 - directory security mask Removed - display charset Removed - dns forwarder New - dns update command New - force security mode Removed - force directory security mode Removed - homedir map Changed default auto.home - kernel share modes New Yes - kpasswd port New 0 - krb5 port New 0 - max protocol Removed - min protocol Removed - nbt client socket address New 0.0.0.0 - nbt port New 0 - nsupdate command New - ntp signd socket directory New - ntvfs handler New - paranoid server security Removed - pid directory New - printer admin Removed - rndc command New - rpc big endian New No - samba kcc command New - security mask Removed - send spnego principal Removed - server max protocol New SMB3 - server min protocol New LANMAN1 - server role New auto - server services New - server signing Changed default default - share backend New - share modes Removed - smb2 max read Changed default 1048576 - smb2 max write Changed default 1048576 - smb2 max trans Changed default 1048576 - socket address Removed - spn update command New - time offset Removed - tls cafile New - tls certfile New - tls crlfile New - tls dh params file New - tls enabled New No - tls keyfile New - unicode New Yes - web port New 0 - winbindd privileged socket directory New - winbind sealed pipes New No - winbindd socket directory New - - -CHANGES SINCE 4.0.0rc1 -====================== - -o Michael Adam - * BUG 9173: Make the SMB2 compound request create/delete_on_close/ - close work as Windows. +Server-Side Copy Support +======================== +Samba 4.1.0 adds support for server-side copy operations via the SMB2 +FSCTL_SRV_COPYCHUNK request. Clients making use of server-side copy +support, such as Windows Server 2012, should experience considerable +performance improvements for file copy operations, as file data need not +traverse the network. +This feature is enabled by default on the smbd file server. -o Jeremy Allison - * BUG 9161: Re-add the vfs_Chdir() cache. - * BUG 9189: SMB2 Create doesn't return correct MAX ACCESS access mask in - blob. - * BUG 9213: Bad ASN.1 NegTokenInit packet can cause invalid free. +Btrfs Filesystem Integration +============================ -o Christian Ambach - * BUG 9162: Fix the build of the GPFS VFS module. - * BUG 9197: Only do 'printing_subsystem_update' when printing is enabled. +The Btrfs VFS module provided with Samba 4.1.0 further improves the +performance of server-side copy operations on shares backed by a Btrfs +filesystem. It does so by allowing multiple files to share the same +on-disk extents, avoiding the unnecessary duplication of source and +destination file data during a server-side copy operation. +This feature can be explicitly enabled on smbd shares backed by a Btrfs +filesystem with the smb.conf parameter: +vfs objects = btrfs -o Alexander Bokovoy - * BUG 9157: Cleanup idmap_ldap build dependencies. +REMOVED COMPONENTS +================== -o Ira Cooper - * BUG 9162: Fix build on Illumos/Solaris using '--with-acl'. - * BUG 9173: Compound requests should continue processing. +The Samba Web Administration Tool (SWAT) has been removed. -o Björn Jacke - * BUG 9162: Fix the build of the ACL VFS modules. - * BUG 9172: Fix reporting of gfs2 quotas. - - -o Volker Lendecke - * BUG 9217: CreateFile with FILE_DIRECTORY_FILE can create directories - on read-only shares. +###################################################################### +Changes +####### +smb.conf changes +---------------- -o Stefan Metzmacher - * BUG 9173: Make the SMB2 compound request create/delete_on_close/ - close work as Windows. - * BUG 9184: Fix receiving of UDP packets from 0 bytes. - * BUG 9191: Release the share mode lock before calling exit_server(). - * BUG 9193: Fix usage of invalid memory in smb2_signing_check_pdu(). - * BUG 9194: Disallow '--prefix=/usr' and '--prefix=/usr/local' without - '--enable-fhs'. - * BUG 9198: Fix RHEL-CTDB packaging. + Parameter Name Description Default + -------------- ----------- ------- + password level Removed + set directory Removed + use ntdb New No -o Matthieu Patou - * BUG 9199: Fix usage of "panic action". +CHANGES SINCE 4.0.7 +=================== -o Andreas Schneider - * BUG 8632: Fix builtin forms order to match Windows again. - * BUG 9159: Fix generating idmap manpages. - * BUG 9218: Don't segfault if user specified ports out for range. +o Michael Adam KNOWN ISSUES ============ -- 'samba-tool domain classicupgrade' will fail when setting ACLs on - the GPO folders with NT_STATUS_INVALID_ONWER in the default - configuration. This happens if, as is typical a 'domain admins' - group (-512) is mapped in the passdb backend being upgraded. This - is because the group mapping to a GID only prevents Samba from - allocating a uid for that group. The uid is needed so the 'domain - admins' group can own the GPO file objects. - - To work around this issue, remove the 'domain admins' group before - upgrade, as it will be re-created automatically. You will - of course need to fill in the group membership again. A future release - will make this automatic, or find some other workaround. - -- This release makes the s3fs file server the default, as this is the - file server combination we will use for the Samba 4.0 release. - -- For similar reasons, sites with ACLs stored by the ntvfs file server - may wish to continue to use that file server implementation, as a - posix ACL will similarly not be set in this case. - -- Replication of DNS data from one AD server to another may not work. - The DNS data used by the internal DNS server and bind9_dlz is stored - in an application partition in our directory. The replication of - this partition is not yet reliable. - -- Replication may fail on FreeBSD due to getaddrinfo() rejecting names - containing _. A workaround will be in a future release. - -- samba_upgradeprovision should not be run when upgrading to this release - from a recent release. No important database format changes have - been made since alpha16. - -- Installation on systems without a system iconv (and developer - headers at compile time) is known to cause errors when dealing with - non-ASCII characters. - -- Domain member support in the 'samba' binary is in its infancy, and - is not comparable to the support found in winbindd. As such, do not - use the 'samba' binary (provided for the AD server) on a member - server. - -- There is no NetBIOS browsing support (network neighbourhood) - available for the AD domain controller. (Support in nmbd and smbd - for classic domains and member/standalone servers is unchanged). - -- Clock Synchronisation is critical. Many 'wrong password' errors are - actually due to Kerberos objecting to a clock skew between client - and server. (The NTP work in the previous alphas are partly to assist - with this problem). - -- The DRS replication code may fail. Please contact the team if you - experience issues with DRS replication, as we have fixed many issues - here in response to feedback from our production users. - -RUNNING Samba 4.0 as an AD DC +RUNNING Samba 4.1 as an AD DC ============================= A short guide to setting up Samba 4 as an AD DC can be found on the wiki: @@ -300,7 +108,7 @@ joining the #samba-technical IRC channel on irc.freenode.net. If you do report problems then please try to send high quality feedback. If you don't provide vital information to help us track down the problem then you will probably be ignored. All bug reports should -be filed under the Samba 4.0 product in the project's Bugzilla +be filed under the Samba 4.1 product in the project's Bugzilla database (https://bugzilla.samba.org/). -- cgit From e56343f1bba603852afcb816f7b5ebdf680c182e Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Fri, 5 Jul 2013 10:05:19 +0200 Subject: VERSION: Set version to 4.1.0rc1-GITSNAPSHOT. Signed-off-by: Karolin Seeger Autobuild-User(v4-1-test): Karolin Seeger Autobuild-Date(v4-1-test): Fri Jul 5 11:56:40 CEST 2013 on sn-devel-104 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 766989c750..99f460347a 100644 --- a/VERSION +++ b/VERSION @@ -77,7 +77,7 @@ SAMBA_VERSION_BETA_RELEASE= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE= ######################################################## # For 'rc' releases the version will be # @@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=1 # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE= +SAMBA_VERSION_RC_RELEASE=1 ######################################################## # To mark SVN snapshots this should be set to 'yes' # -- cgit